ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-14 09:38:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Anthony Geay 2021-01-13 16:27:12 +01:00
parent adda3cab1c
commit 01b0ad6701
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -98,12 +98,15 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
PortableServer::ObjectId* contId,
const char* instanceName,
const char* interfaceName) :
Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
const char* interfaceName,
bool withRegistry,
bool withNS) :
Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, withRegistry)
{
_thisObj = this;
_id = _poa->activate_object(_thisObj);
name_service = new SALOME_NamingService(_orb);
if(withNS)
name_service = new SALOME_NamingService(_orb);
_impl = new ::GEOMImpl_Gen;

6
src/GEOM_I/GEOM_Gen_i.hh
View File

@ -95,7 +95,9 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi
PortableServer::POA_ptr poa,
PortableServer::ObjectId * contId,
const char *instanceName,
const char *interfaceName);
const char *interfaceName,
bool withRegistry = true,
bool withNS = true);
// destructor, doing nothing (for now)
virtual ~GEOM_Gen_i();
@ -388,7 +390,7 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi
private:
::GEOMImpl_Gen* _impl;
SALOME_NamingService * name_service;
SALOME_NamingService * name_service = nullptr;
char * _name;
// plugin operations managing

2
src/GEOM_SWIG/GeomHelper.cxx
View File

@ -44,7 +44,7 @@ std::string BuildGEOMInstance()
//
pman->activate();
//
GEOM_Gen_i *servant = new GEOM_Gen_i(orb,poa,const_cast<PortableServer::ObjectId*>(&conId.in()),"GEOM_inst_2","GEOM");
GEOM_Gen_i *servant = new GEOM_Gen_i(orb,poa,const_cast<PortableServer::ObjectId*>(&conId.in()),"GEOM_inst_2","GEOM",false,false);
PortableServer::ObjectId *zeId = servant->getId();
CORBA::Object_var zeRef = poa->id_to_reference(*zeId);
CORBA::String_var ior = orb->object_to_string(zeRef);

2
src/GEOM_SWIG/geomBuilder.py
View File

@ -246,7 +246,7 @@ import omniORB
# to avoid problems in some cases, e.g. when generating documentation
try:
import salome
salome.salome_init()
#salome.salome_init()
from salome import *
except:
pass