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 from V6_main 11/02/2013
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_2smeshpy.cxx
diff --git
a/src/SMESH_I/SMESH_2smeshpy.cxx
b/src/SMESH_I/SMESH_2smeshpy.cxx
index 4dc84a2a15083b369efa9098fc46631bdc267555..57a076883f6fa04f107a99bd22e86be21a89fd85 100644
(file)
--- a/
src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/
src/SMESH_I/SMESH_2smeshpy.cxx
@@
-26,11
+26,13
@@
//
#include "SMESH_2smeshpy.hxx"
//
#include "SMESH_2smeshpy.hxx"
-#include "utilities.h"
#include "SMESH_PythonDump.hxx"
#include "SMESH_NoteBook.hxx"
#include "SMESH_Filter_i.hxx"
#include "SMESH_PythonDump.hxx"
#include "SMESH_NoteBook.hxx"
#include "SMESH_Filter_i.hxx"
+#include <SALOMEDS_wrap.hxx>
+#include <utilities.h>
+
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
@@
-431,7
+433,7
@@
_pyGen::_pyGen(Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod
{
// find a GEOM entry
_pyID geomID;
{
// find a GEOM entry
_pyID geomID;
- SALOMEDS::SComponent_
var
geomComp = theStudy->FindComponent("GEOM");
+ SALOMEDS::SComponent_
wrap
geomComp = theStudy->FindComponent("GEOM");
if ( geomComp->_is_nil() ) return;
CORBA::String_var entry = geomComp->GetID();
geomID = entry.in();
if ( geomComp->_is_nil() ) return;
CORBA::String_var entry = geomComp->GetID();
geomID = entry.in();
@@
-1329,7
+1331,7
@@
bool _pyGen::IsNotPublished(const _pyID& theObjID) const
// either the SMESH object is not in study or it is a GEOM object
if ( IsGeomObject( theObjID ))
{
// either the SMESH object is not in study or it is a GEOM object
if ( IsGeomObject( theObjID ))
{
- SALOMEDS::SObject_
var
so = myStudy->FindObjectID( theObjID.ToCString() );
+ SALOMEDS::SObject_
wrap
so = myStudy->FindObjectID( theObjID.ToCString() );
if ( so->_is_nil() ) return true;
CORBA::Object_var obj = so->GetObject();
return CORBA::is_nil( obj );
if ( so->_is_nil() ) return true;
CORBA::Object_var obj = so->GetObject();
return CORBA::is_nil( obj );