X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_ObjectReferenceParamWdg.cxx;h=896e964e6bd078d003d908a1925d5fca3b1d62d2;hb=94b4f20a6565decaab6d3bab63b6236bb4dcdb37;hp=649d1e5ab774d51dc39c7f619adfc6f24ad873de;hpb=3b8dd51d87a9d5e6304b4e134e123d22eed951bb;p=modules%2Fsmesh.git

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 649d1e5ab..896e964e6 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -36,7 +36,7 @@
 #include <SVTK_ViewWindow.h>
 #include <SALOME_ListIO.hxx>
 
-// SALOME KERNEL incldues
+// SALOME KERNEL includes
 #include <SALOMEDSClient_SObject.hxx>
 #include <SALOMEDSClient_Study.hxx>
 
@@ -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
@@ -124,13 +122,10 @@ void StdMeshersGUI_ObjectReferenceParamWdg::init()
   myObjNameLineEdit = new QLineEdit(this);
   myObjNameLineEdit->setReadOnly(true);
   myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet);
-  myObjNameLineEdit->setMinimumWidth(200);
+  myObjNameLineEdit->setMinimumWidth(150);
 
   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();