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 gni/evolution
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_ObjectReferenceParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 823331951bb1cdcec54112137d1ebdd1c48d4fbd..af809e147d1984ad92077505e5a44ea4fdfe586c 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
//
// 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>
@@
-227,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();