Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update of CheckDone
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_QuadrangleParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
index aa04fa8c4278f4ec3f6a6ec0f6d30c7123ba5c4e..fc5dffeaf578ceb3a2eeba7c2cf38ec1aa9cf2d1 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-226,7
+226,7
@@
void StdMeshersGUI_QuadrangleParamCreator::retrieveParams() const
GEOM::ListOfGO_var shapes;
SMESH::nodes_array_var points;
h->GetEnforcedNodes( shapes, points );
GEOM::ListOfGO_var shapes;
SMESH::nodes_array_var points;
h->GetEnforcedNodes( shapes, points );
- for (
size_t
i = 0; i < shapes->length(); ++i )
+ for (
CORBA::ULong
i = 0; i < shapes->length(); ++i )
{
CORBA::String_var name = shapes[i]->GetName();
CORBA::String_var entry = shapes[i]->GetStudyEntry();
{
CORBA::String_var name = shapes[i]->GetName();
CORBA::String_var entry = shapes[i]->GetStudyEntry();
@@
-234,7
+234,7
@@
void StdMeshersGUI_QuadrangleParamCreator::retrieveParams() const
item->setData( Qt::UserRole, entry.in() );
myShapesList->addItem( item );
}
item->setData( Qt::UserRole, entry.in() );
myShapesList->addItem( item );
}
- for (
size_t
i = 0; i < points->length(); ++i )
+ for (
CORBA::ULong
i = 0; i < points->length(); ++i )
{
QTreeWidgetItem* item = new QTreeWidgetItem
( QStringList()
{
QTreeWidgetItem* item = new QTreeWidgetItem
( QStringList()
@@
-288,9
+288,7
@@
QString StdMeshersGUI_QuadrangleParamCreator::storeParams() const
{
QListWidgetItem* item = myShapesList->item(i);
QString entry = item->data( Qt::UserRole ).toString();
{
QListWidgetItem* item = myShapesList->item(i);
QString entry = item->data( Qt::UserRole ).toString();
- Handle(SALOME_InteractiveObject) io =
- new SALOME_InteractiveObject( entry.toStdString().c_str(), "GEOM" );
- GEOM::GEOM_Object_var go = GEOMBase::ConvertIOinGEOMObject( io );
+ GEOM::GEOM_Object_var go = SMESH::EntryToInterface<GEOM::GEOM_Object>( entry );
if ( !go->_is_nil() )
goList[ nbShapes++ ] = go;
}
if ( !go->_is_nil() )
goList[ nbShapes++ ] = go;
}
@@
-501,8
+499,8
@@
ItemDelegate::ItemDelegate( QObject* parent ) : QItemDelegate( parent )
*/
QWidget* StdMeshersGUI_QuadrangleParamCreator::
ItemDelegate::createEditor( QWidget* parent,
*/
QWidget* StdMeshersGUI_QuadrangleParamCreator::
ItemDelegate::createEditor( QWidget* parent,
- const QStyleOptionViewItem&
option
,
- const QModelIndex&
index
) const
+ const QStyleOptionViewItem&
/*option*/
,
+ const QModelIndex&
/*index*/
) const
{
SMESHGUI_SpinBox* sb = new SMESHGUI_SpinBox( parent );
sb->RangeStepAndValidator( COORD_MIN, COORD_MAX, 10 );
{
SMESHGUI_SpinBox* sb = new SMESHGUI_SpinBox( parent );
sb->RangeStepAndValidator( COORD_MIN, COORD_MAX, 10 );