From dc01e26a20460b62262624152720eef916dff4f4 Mon Sep 17 00:00:00 2001 From: prascle Date: Wed, 18 May 2005 15:16:44 +0000 Subject: [PATCH] PR: embedded container C++ & Python, debug --- src/Container/Container_i.cxx | 1 + src/Container/SALOME_Container.cxx | 3 +-- src/Container/SALOME_Container.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx index f6374609a..76d135641 100644 --- a/src/Container/Container_i.cxx +++ b/src/Container/Container_i.cxx @@ -168,6 +168,7 @@ Engines_Container_i::Engines_Container_i (CORBA::ORB_ptr orb, CORBA::String_var sior = _orb->object_to_string(pCont); string myCommand="pyCont = SALOME_Container.SALOME_Container_i('"; + myCommand += _containerName + "','"; myCommand += sior; myCommand += "')\n"; SCRUTE(myCommand); diff --git a/src/Container/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx index bce0641a2..174bc4a00 100644 --- a/src/Container/SALOME_Container.cxx +++ b/src/Container/SALOME_Container.cxx @@ -47,7 +47,6 @@ #include #endif -#include #include "Container_init_python.hxx" using namespace std; @@ -69,7 +68,7 @@ int main(int argc, char* argv[]) int _argc = 1; char* _argv[] = {""}; KERNEL_PYTHON::init_python(_argc,_argv); - + try{ // Obtain a reference to the root POA. // obtain the root poa manager diff --git a/src/Container/SALOME_Container.py b/src/Container/SALOME_Container.py index fc4f468a5..befd9a173 100644 --- a/src/Container/SALOME_Container.py +++ b/src/Container/SALOME_Container.py @@ -56,11 +56,11 @@ class SALOME_Container_i: #------------------------------------------------------------------------- - def __init__(self, containerIORStr ): + def __init__(self ,containerName, containerIORStr): MESSAGE( "SALOME_Container_i::__init__" ) self._orb = CORBA.ORB_init(sys.argv, CORBA.ORB_ID) self._poa = self._orb.resolve_initial_references("RootPOA") - self._containerName = sys.argv[1] + self._containerName = containerName #self._naming_service = SALOME_NamingServicePy_i(self._orb) self._container = self._orb.string_to_object(containerIORStr) -- 2.39.2