From b687cd2004ac5afa04b9420d512c987c16d03882 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 13 Jan 2021 09:53:06 +0100 Subject: [PATCH] Checkpoint 0 - OK now time to study management --- src/SMESH_SWIG/SMeshHelper.cxx | 12 ++++-------- src/SMESH_SWIG/smeshBuilder.py | 4 +++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/SMESH_SWIG/SMeshHelper.cxx b/src/SMESH_SWIG/SMeshHelper.cxx index 9ed1d558c..06ab867ec 100644 --- a/src/SMESH_SWIG/SMeshHelper.cxx +++ b/src/SMESH_SWIG/SMeshHelper.cxx @@ -32,22 +32,18 @@ std::string BuildSMESHInstance() CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); PortableServer::POA_var poa = PortableServer::POA::_narrow(obj); PortableServer::POAManager_var pman = poa->the_POAManager(); - CORBA::PolicyList policies; - policies.length(0); - PortableServer::POA_var poa2 = poa->create_POA("POA2",pman,policies); - PortableServer::ObjectId_var conId; // { char *argv[4] = {"Container","FactoryServer","toto",nullptr}; - Engines_Container_i *cont = new Engines_Container_i(orb,poa2,"FactoryServer",2,argv,false,false); - conId = poa2->activate_object(cont); + Engines_Container_i *cont = new Engines_Container_i(orb,poa,"FactoryServer",2,argv,false,false); + conId = poa->activate_object(cont); } // pman->activate(); // - SMESH_Gen_i *servant = new SMESH_Gen_i(orb,poa2,const_cast(&conId.in()),"SMESH_inst_2","SMESH"); + SMESH_Gen_i *servant = new SMESH_Gen_i(orb,poa,const_cast(&conId.in()),"SMESH_inst_2","SMESH"); PortableServer::ObjectId *zeId = servant->getId(); - CORBA::Object_var zeRef = poa2->id_to_reference(*zeId); + CORBA::Object_var zeRef = poa->id_to_reference(*zeId); CORBA::String_var ior = orb->object_to_string(zeRef); return std::string(ior.in()); } diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py index a87ba0cd7..045a46120 100644 --- a/src/SMESH_SWIG/smeshBuilder.py +++ b/src/SMESH_SWIG/smeshBuilder.py @@ -361,9 +361,11 @@ class smeshBuilder( SMESH._objref_SMESH_Gen, object ): Hex_5Tet, Hex_6Tet, Hex_24Tet, Hex_2Prisms, Hex_4Prisms = 1, 2, 3, 1, 2 def __new__(cls, *args): + #import pdb global engine global smeshInst global doLcc + #pdb.set_trace() #print("==== __new__", engine, smeshInst, doLcc) if smeshInst is None: @@ -380,7 +382,7 @@ class smeshBuilder( SMESH._objref_SMESH_Gen, object ): # 1. CORBA resolution of server # 2. the __new__ method is called again #print("==== smeshInst = lcc.FindOrLoadComponent ", engine, smeshInst, doLcc) - #smeshInst = salome.lcc.FindOrLoadComponent( "FactoryServer", "SMESH" ) + #salome.lcc.FindOrLoadComponent( "FactoryServer", "SMESH" ) import SMeshHelper smesh_ior = SMeshHelper.BuildSMESHInstance() import SMESH -- 2.39.2