ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-24 16:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for SMESH working with SHAPERSTUDY

Browse Source
This commit is contained in:
mpv 2019-12-17 14:37:02 +03:00
parent c7e6dcf72a
commit b6155253f8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -278,7 +278,7 @@ SALOME_LifeCycleCORBA* SMESH_Gen_i::GetLCC()
GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper ) GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper )
{ {
Engines::EngineComponent_ptr temp = Engines::EngineComponent_ptr temp =
GetLCC()->FindOrLoad_Component( isShaper ? "FactoryServerPy" : "FactoryServer", GetLCC()->FindOrLoad_Component( isShaper ? "FactoryServer" : "FactoryServer",
isShaper ? "SHAPERSTUDY" : "GEOM" ); isShaper ? "SHAPERSTUDY" : "GEOM" );
myGeomGen = GEOM::GEOM_Gen::_narrow( temp ); myGeomGen = GEOM::GEOM_Gen::_narrow( temp );
@ -295,7 +295,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( bool isShaper )
GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( GEOM::GEOM_Object_ptr go ) GEOM::GEOM_Gen_var SMESH_Gen_i::GetGeomEngine( GEOM::GEOM_Object_ptr go )
{ {
GEOM::GEOM_Gen_var gen; GEOM::GEOM_Gen_ptr gen;
if ( !CORBA::is_nil( go )) if ( !CORBA::is_nil( go ))
gen = go->GetGen(); gen = go->GetGen();
return gen; return gen;

2
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -255,7 +255,7 @@ TopoDS_Shape SMESH_Gen_i::GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject)
if ( !theGeomObject->_is_nil() && !theGeomObject->_non_existent() ) if ( !theGeomObject->_is_nil() && !theGeomObject->_non_existent() )
{ {
GEOM_Client* aClient = GetShapeReader(); GEOM_Client* aClient = GetShapeReader();
GEOM::GEOM_Gen_ptr aGeomEngine = GetGeomEngine( theGeomObject ); GEOM::GEOM_Gen_var aGeomEngine = GetGeomEngine( theGeomObject );
if ( aClient && !aGeomEngine->_is_nil () ) if ( aClient && !aGeomEngine->_is_nil () )
S = aClient->GetShape( aGeomEngine, theGeomObject ); S = aClient->GetShape( aGeomEngine, theGeomObject );
} }