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
0022400: EDF SMESH: ExportCGNS is not available anymore in V7_main
[modules/smesh.git]
/
src
/
StdMeshers_I
/
StdMeshers_ObjRefUlils.cxx
diff --git
a/src/StdMeshers_I/StdMeshers_ObjRefUlils.cxx
b/src/StdMeshers_I/StdMeshers_ObjRefUlils.cxx
index 910d0aaa870d886314d0a6cd276ee3d0405a7ff7..88a0163ec928dd52d1910b02deda913650f45ff0 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_ObjRefUlils.cxx
+++ b/
src/StdMeshers_I/StdMeshers_ObjRefUlils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
@@
-27,6
+27,7
@@
//
#include "StdMeshers_ObjRefUlils.hxx"
//
#include "StdMeshers_ObjRefUlils.hxx"
+#include <SALOMEDS_wrap.hxx>
#include <TopoDS_Shape.hxx>
using namespace std;
#include <TopoDS_Shape.hxx>
using namespace std;
@@
-60,8
+61,8
@@
StdMeshers_ObjRefUlils::EntryOrShapeToGeomObject (const std::string& theEntry,
if (SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen()) {
SALOMEDS::Study_var study = gen->GetCurrentStudy();
if ( ! theEntry.empty() && ! study->_is_nil() ) {
if (SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen()) {
SALOMEDS::Study_var study = gen->GetCurrentStudy();
if ( ! theEntry.empty() && ! study->_is_nil() ) {
- SALOMEDS::SObject_
var sobj
= study->FindObjectID( theEntry.c_str() );
- CORBA::Object_var obj = gen->SObjectToObject( sobj );
+ SALOMEDS::SObject_
wrap sobj
= study->FindObjectID( theEntry.c_str() );
+ CORBA::Object_var
obj = gen->SObjectToObject( sobj );
geom = GEOM::GEOM_Object::_narrow( obj );
}
}
geom = GEOM::GEOM_Object::_narrow( obj );
}
}
@@
-87,9
+88,10
@@
void StdMeshers_ObjRefUlils::SaveToStream( const TopoDS_Shape& theShape, ostream
if (SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen()) {
GEOM::GEOM_Object_var geom = gen->ShapeToGeomObject( theShape );
if ( ! geom->_is_nil() ) {
if (SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen()) {
GEOM::GEOM_Object_var geom = gen->ShapeToGeomObject( theShape );
if ( ! geom->_is_nil() ) {
- SALOMEDS::SObject_
var
sobj = gen->ObjectToSObject( gen->GetCurrentStudy(), geom );
+ SALOMEDS::SObject_
wrap
sobj = gen->ObjectToSObject( gen->GetCurrentStudy(), geom );
if ( !sobj->_is_nil() ) {
if ( !sobj->_is_nil() ) {
- stream << " " << sobj->GetID();
+ CORBA::String_var entry = sobj->GetID();
+ stream << " " << entry.in();
ok = true;
}
}
ok = true;
}
}
@@
-114,9
+116,9
@@
TopoDS_Shape StdMeshers_ObjRefUlils::LoadFromStream( istream & stream)
if ( ! study->_is_nil() ) {
string str;
if (stream >> str) {
if ( ! study->_is_nil() ) {
string str;
if (stream >> str) {
- SALOMEDS::SObject_
var sobj
= study->FindObjectID( str.c_str() );
- CORBA::Object_var obj = gen->SObjectToObject( sobj );
- GEOM::GEOM_Object_var geom = GEOM::GEOM_Object::_narrow( obj );
+ SALOMEDS::SObject_
wrap sobj
= study->FindObjectID( str.c_str() );
+ CORBA::Object_var
obj = gen->SObjectToObject( sobj );
+ GEOM::GEOM_Object_var
geom = GEOM::GEOM_Object::_narrow( obj );
return gen->GeomObjectToShape( geom.in() );
}
}
return gen->GeomObjectToShape( geom.in() );
}
}