PR: embedded container C++ & Python, debug

diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx
index f6374609ab258d4e596337448bb21307b67d3792..76d135641558ae9246179632f8f675be7760e568 100644 (file)
--- 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 bce0641a230d9244b23e2ce7bd1376f79749c2e2..174bc4a00219830b9f239ccc18809d9b260bcc41 100644 (file)
--- a/src/Container/SALOME_Container.cxx
+++ b/src/Container/SALOME_Container.cxx
@@ -47,7 +47,6 @@
 #include <mpi.h>
 #endif
 
-#include <Python.h>
 #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 fc4f468a50f9269f4851a36dd0b38726950edf99..befd9a1737b87b19ae854c06564399f8a469673b 100644 (file)
--- 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)