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
Merge branch 'master' into V9_dev
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_ObjectReferenceParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 3390e8b59346265648ec19b598dc331ed0062705..5b6b5451246f76bd2a9b1d8f857db7cf4caf157d 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@
-55,12
+55,10
@@
//================================================================================
StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
//================================================================================
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;
: QWidget( parent ), myMultiSelection( multiSelection )
{
myFilter = f;
- // myStretchActivated = stretch;
init();
}
init();
}
@@
-78,6
+76,7
@@
StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
myFilter = new SMESH_TypeFilter( objType );
init();
}
myFilter = new SMESH_TypeFilter( objType );
init();
}
+
//================================================================================
/*!
* \brief Destructor
//================================================================================
/*!
* \brief Destructor
@@
-93,7
+92,6
@@
StdMeshersGUI_ObjectReferenceParamWdg::~StdMeshersGUI_ObjectReferenceParamWdg()
}
}
}
}
-
//================================================================================
/*!
* \brief Create a leayout, initialize fields
//================================================================================
/*!
* \brief Create a leayout, initialize fields
@@
-128,9
+126,6
@@
void StdMeshersGUI_ObjectReferenceParamWdg::init()
aHBox->addWidget( mySelButton );
aHBox->addWidget( myObjNameLineEdit );
aHBox->addWidget( mySelButton );
aHBox->addWidget( myObjNameLineEdit );
- //if (myStretchActivated){
- // aHBox->addStretch();
- //}
connect( mySelButton, SIGNAL(clicked()), SLOT(activateSelection()));
}
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 )
{
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());
_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();
if ( !CORBA::is_nil( anObj )) {
std::string name = aSObj->GetName();
QString text = myObjNameLineEdit->text();