ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-15 21:00:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Anthony Geay 2021-02-23 11:15:59 +01:00
parent 03a8b8a98d
commit 1d2723102d
3 changed files with 9 additions and 7 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

@ -20,6 +20,7 @@
#include "SMESH_Gen_No_Session_i.hxx" #include "SMESH_Gen_No_Session_i.hxx"
#include "SALOMEDS_Study_i.hxx" #include "SALOMEDS_Study_i.hxx"
#include "SALOME_KernelServices.hxx" #include "SALOME_KernelServices.hxx"
#include "SALOME_Fake_NamingService.hxx"
#include "SALOME_ModuleCatalog_impl.hxx" #include "SALOME_ModuleCatalog_impl.hxx"
SMESH_Gen_No_Session_i::SMESH_Gen_No_Session_i( CORBA::ORB_ptr orb, SMESH_Gen_No_Session_i::SMESH_Gen_No_Session_i( CORBA::ORB_ptr orb,
@ -35,6 +36,7 @@ GEOM::GEOM_Gen_var SMESH_Gen_No_Session_i::GetGeomEngine( bool isShaper )
{ {
CORBA::Object_var temp = KERNEL::RetrieveCompo(isShaper ? "SHAPERSTUDY" : "GEOM"); CORBA::Object_var temp = KERNEL::RetrieveCompo(isShaper ? "SHAPERSTUDY" : "GEOM");
myGeomGen = GEOM::GEOM_Gen::_narrow( temp ); myGeomGen = GEOM::GEOM_Gen::_narrow( temp );
myNS = new SALOME_Fake_NamingService;
return myGeomGen; return myGeomGen;
} }

10
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -164,9 +164,9 @@ static int MYDEBUG = 0;
GEOM::GEOM_Gen_var SMESH_Gen_i::myGeomGen; GEOM::GEOM_Gen_var SMESH_Gen_i::myGeomGen;
CORBA::ORB_var SMESH_Gen_i::myOrb; CORBA::ORB_var SMESH_Gen_i::myOrb;
PortableServer::POA_var SMESH_Gen_i::myPoa; PortableServer::POA_var SMESH_Gen_i::myPoa;
SALOME_NamingService* SMESH_Gen_i::myNS = NULL; SALOME_NamingService_Abstract* SMESH_Gen_i::myNS = nullptr;
SALOME_LifeCycleCORBA* SMESH_Gen_i::myLCC = NULL; SALOME_LifeCycleCORBA* SMESH_Gen_i::myLCC = nullptr;
SMESH_Gen_i* SMESH_Gen_i::mySMESHGen = NULL; SMESH_Gen_i* SMESH_Gen_i::mySMESHGen = nullptr;
const int nbElemPerDiagonal = 10; const int nbElemPerDiagonal = 10;
@ -245,7 +245,7 @@ CORBA::Object_var SMESH_Gen_i::SObjectToObject( SALOMEDS::SObject_ptr theSObject
*/ */
//============================================================================= //=============================================================================
SALOME_NamingService* SMESH_Gen_i::GetNS() SALOME_NamingService_Abstract* SMESH_Gen_i::GetNS()
{ {
if ( myNS == NULL ) { if ( myNS == NULL ) {
myNS = SINGLETON_<SALOME_NamingService>::Instance(); myNS = SINGLETON_<SALOME_NamingService>::Instance();
@ -340,7 +340,7 @@ SMESH_Gen_i::SMESH_Gen_i( CORBA::ORB_ptr orb,
// SMESH_Gen_i::SetEmbeddedMode(), have wrong IsEmbeddedMode flag // SMESH_Gen_i::SetEmbeddedMode(), have wrong IsEmbeddedMode flag
if(checkNS) if(checkNS)
{ {
if ( SALOME_NamingService* ns = GetNS() ) if ( SALOME_NamingService_Abstract* ns = GetNS() )
{ {
CORBA::Object_var obj = ns->Resolve( "/Kernel/Session" ); CORBA::Object_var obj = ns->Resolve( "/Kernel/Session" );
SALOME::Session_var session = SALOME::Session::_narrow( obj ) ; SALOME::Session_var session = SALOME::Session::_narrow( obj ) ;

4
src/SMESH_I/SMESH_Gen_i.hxx
View File

@ -104,7 +104,7 @@ public:
// Get SMESH module's POA object // Get SMESH module's POA object
static PortableServer::POA_var GetPOA() { return myPoa;} static PortableServer::POA_var GetPOA() { return myPoa;}
// Get Naming Service object // Get Naming Service object
static SALOME_NamingService* GetNS(); static SALOME_NamingService_Abstract* GetNS();
// 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
@ -646,10 +646,10 @@ private:
protected: protected:
static GEOM::GEOM_Gen_var myGeomGen; static GEOM::GEOM_Gen_var myGeomGen;
static SALOME_NamingService_Abstract* myNS; // Naming Service
private: private:
static CORBA::ORB_var myOrb; // ORB reference static CORBA::ORB_var myOrb; // ORB reference
static PortableServer::POA_var myPoa; // POA reference static PortableServer::POA_var myPoa; // POA reference
static SALOME_NamingService* myNS; // Naming Service
static SALOME_LifeCycleCORBA* myLCC; // Life Cycle CORBA static SALOME_LifeCycleCORBA* myLCC; // Life Cycle CORBA
static SMESH_Gen_i* mySMESHGen; // Point to last created instance of the class static SMESH_Gen_i* mySMESHGen; // Point to last created instance of the class
::SMESH_Gen myGen; // SMESH_Gen local implementation ::SMESH_Gen myGen; // SMESH_Gen local implementation