X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_ObjectReferenceParamWdg.cxx;h=5b6b5451246f76bd2a9b1d8f857db7cf4caf157d;hb=8a9d91b414c3f26586dea735c22c7700898a0a1e;hp=3390e8b59346265648ec19b598dc331ed0062705;hpb=7eda9ca931ed2a11cb5e4637e4ffe19f5c061115;p=modules%2Fsmesh.git diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx index 3390e8b59..5b6b54512 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx @@ -55,12 +55,10 @@ //================================================================================ StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg -( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection - /*, bool stretch */) +( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection ) : QWidget( parent ), myMultiSelection( multiSelection ) { myFilter = f; - // myStretchActivated = stretch; init(); } @@ -78,6 +76,7 @@ StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg myFilter = new SMESH_TypeFilter( objType ); init(); } + //================================================================================ /*! * \brief Destructor @@ -93,7 +92,6 @@ StdMeshersGUI_ObjectReferenceParamWdg::~StdMeshersGUI_ObjectReferenceParamWdg() } } - //================================================================================ /*! * \brief Create a leayout, initialize fields @@ -128,9 +126,6 @@ void StdMeshersGUI_ObjectReferenceParamWdg::init() aHBox->addWidget( mySelButton ); aHBox->addWidget( myObjNameLineEdit ); - //if (myStretchActivated){ - // aHBox->addStretch(); - //} connect( mySelButton, SIGNAL(clicked()), SLOT(activateSelection())); } @@ -232,9 +227,9 @@ void StdMeshersGUI_ObjectReferenceParamWdg::SetObjects(SMESH::string_array_var& for ( unsigned i = 0; i < objects->length(); ++i ) { - _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); + _PTR(Study) aStudy = SMESH::getStudy(); _PTR(SObject) aSObj = aStudy->FindObjectID(objects[i].in()); - CORBA::Object_var anObj = SMESH::SObjectToObject(aSObj,aStudy); + CORBA::Object_var anObj = SMESH::SObjectToObject(aSObj); if ( !CORBA::is_nil( anObj )) { std::string name = aSObj->GetName(); QString text = myObjNameLineEdit->text();