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 'OCCT780'
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_ObjectReferenceParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index db42e8484dc94ae13c50367d08d2a582e3f7c223..e07aa7e3009254511190fc4938c5584beff68244 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// 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>
#include <SVTK_ViewWindow.h>
#include <SALOME_ListIO.hxx>
-// SALOME KERNEL incl
du
es
+// SALOME KERNEL incl
ud
es
#include <SALOMEDSClient_SObject.hxx>
#include <SALOMEDSClient_Study.hxx>
#include <SALOMEDSClient_SObject.hxx>
#include <SALOMEDSClient_Study.hxx>
@@
-55,11
+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();
}
@@
-77,6
+76,7
@@
StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
myFilter = new SMESH_TypeFilter( objType );
init();
}
myFilter = new SMESH_TypeFilter( objType );
init();
}
+
//================================================================================
/*!
* \brief Destructor
//================================================================================
/*!
* \brief Destructor
@@
-92,7
+92,6
@@
StdMeshersGUI_ObjectReferenceParamWdg::~StdMeshersGUI_ObjectReferenceParamWdg()
}
}
}
}
-
//================================================================================
/*!
* \brief Create a leayout, initialize fields
//================================================================================
/*!
* \brief Create a leayout, initialize fields
@@
-123,12
+122,10
@@
void StdMeshersGUI_ObjectReferenceParamWdg::init()
myObjNameLineEdit = new QLineEdit(this);
myObjNameLineEdit->setReadOnly(true);
myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet);
myObjNameLineEdit = new QLineEdit(this);
myObjNameLineEdit->setReadOnly(true);
myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet);
+ myObjNameLineEdit->setMinimumWidth(150);
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()));
}
@@
-230,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();