ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-25 22:37:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

Question for C++ export : Why getStudyServantVirtual method is requested ?

Browse Source
This commit is contained in:
Anthony Geay 2021-02-01 16:24:36 +01:00
parent 75f7ed9579
commit 90af165fd6
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESH_I/SMESH_Gen_No_Session_i.cxx
View File

@ -38,7 +38,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_No_Session_i::GetGeomEngine( bool isShaper )
return myGeomGen; return myGeomGen;
} }
SALOMEDS::Study_var SMESH_Gen_No_Session_i::getStudyServant() const SALOMEDS::Study_var SMESH_Gen_No_Session_i::getStudyServantVirtual() const
{ {
return SALOMEDS::Study::_duplicate(KERNEL::getStudyServantSA()); return SALOMEDS::Study::_duplicate(KERNEL::getStudyServantSA());
} }

2
src/SMESH_I/SMESH_Gen_No_Session_i.hxx
View File

@ -30,6 +30,6 @@ public:
const char* instanceName, const char* instanceName,
const char* interfaceName); const char* interfaceName);
GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) override; GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) override;
SALOMEDS::Study_var getStudyServant() const override; SALOMEDS::Study_var getStudyServantVirtual() const override;
SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const override; SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const override;
}; };

2
src/SMESH_I/SMESH_Gen_Session_i.cxx
View File

@ -38,7 +38,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_Session_i::GetGeomEngine( bool isShaper )
return myGeomGen; return myGeomGen;
} }
SALOMEDS::Study_var SMESH_Gen_Session_i::getStudyServant() const SALOMEDS::Study_var SMESH_Gen_Session_i::getStudyServantVirtual() const
{ {
return SALOMEDS::Study::_duplicate(KERNEL::getStudyServant()); return SALOMEDS::Study::_duplicate(KERNEL::getStudyServant());
} }

2
src/SMESH_I/SMESH_Gen_Session_i.hxx
View File

@ -31,6 +31,6 @@ public:
const char* interfaceName); const char* interfaceName);
GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) override; GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) override;
// Get the SALOMEDS::Study from naming service // Get the SALOMEDS::Study from naming service
SALOMEDS::Study_var getStudyServant() const override; SALOMEDS::Study_var getStudyServantVirtual() const override;
SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const override; SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const override;
}; };

5
src/SMESH_I/SMESH_Gen_i.hxx
View File

@ -108,10 +108,11 @@ public:
// Get SALOME_LifeCycleCORBA object // Get SALOME_LifeCycleCORBA object
static SALOME_LifeCycleCORBA* GetLCC(); static SALOME_LifeCycleCORBA* GetLCC();
// Retrieve and get GEOM engine reference // Retrieve and get GEOM engine reference
virtual GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) = 0;
static GEOM::GEOM_Gen_var GetGeomEngine( GEOM::GEOM_Object_ptr ); static GEOM::GEOM_Gen_var GetGeomEngine( GEOM::GEOM_Object_ptr );
// Retrieve Study depending on Session / Standalone mode // Retrieve Study depending on Session / Standalone mode
virtual SALOMEDS::Study_var getStudyServant() const = 0; virtual GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ) = 0;
SALOMEDS::Study_var getStudyServant() const { return this->getStudyServantVirtual(); }
virtual SALOMEDS::Study_var getStudyServantVirtual() const = 0 ;
virtual SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const = 0; virtual SALOME_ModuleCatalog::ModuleCatalog_var getModuleCatalog() const = 0;
SALOMEDS::SObject_ptr publish(CORBA::Object_ptr theIOR, SALOMEDS::SObject_ptr publish(CORBA::Object_ptr theIOR,
SALOMEDS::SObject_ptr theFatherObject, SALOMEDS::SObject_ptr theFatherObject,