Merge from V5_1_main 14/05/2010

[modules/kernel.git] / src / ParallelContainer / SALOME_ParallelContainer_i.hxx

diff --git a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
index ba014d4582f4618f5ab47373271739ac6b531c8f..df06e58d91c3e950fe8f2e3696447da0bb90392b 100644 (file)
--- a/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
+++ b/src/ParallelContainer/SALOME_ParallelContainer_i.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME_ParallelContainer : implementation of container and engine for Parallel Kernel
 //  File   : SALOME_ParallelContainer_i.hxx
 //  Author : André RIBES, EDF
@@ -61,34 +62,40 @@ class CONTAINER_EXPORT Engines_Parallel_Container_i:
 {
 public:
   Engines_Parallel_Container_i(CORBA::ORB_ptr orb, 
-                              char * ior, 
-                              int rank,
-                              PortableServer::POA_ptr poa,
-                              std::string containerName ,
-                              bool isServantAloneInProcess = true);
+                               char * ior, 
+                               int rank,
+                               PortableServer::POA_ptr poa,
+                               std::string containerName ,
+                               bool isServantAloneInProcess = true);
 
   virtual ~Engines_Parallel_Container_i();
 
   // --- CORBA methods
 
-  virtual bool load_component_Library(const char* componentName);
+  virtual bool load_component_Library(const char* componentName, CORBA::String_out reason);
 
   virtual Engines::Component_ptr
   create_component_instance( const char* componentName,
-                            CORBA::Long studyId); // 0 for multiStudy
+                             CORBA::Long studyId); // 0 for multiStudy
+
+  virtual Engines::Component_ptr
+  create_component_instance_env( const char* componentName,
+                                 CORBA::Long studyId,          // 0 for multiStudy
+                                 const Engines::FieldsDict& env,
+                                 CORBA::String_out reason);
 
   Engines::Component_ptr
   find_component_instance( const char* registeredName,
-                          CORBA::Long studyId); // 0 for multiStudy
+                           CORBA::Long studyId); // 0 for multiStudy
 
   Engines::Component_ptr
   load_impl(const char* nameToRegister,
-           const char* componentName);
+            const char* componentName);
 
   void
   create_paco_component_node_instance(const char* componentName,
-                                     const char* proxy_containerName,
-                                     CORBA::Long studyId); // 0 for multiStudy
+                                      const char* proxy_containerName,
+                                      CORBA::Long studyId); // 0 for multiStudy
 
   void updateInstanceNumber();
 
@@ -114,12 +121,12 @@ public:
 
   Engines::Component_ptr
   createCPPInstance(std::string genericRegisterName,
-                   void *handle,
-                   int studyId);
+                    void *handle,
+                    int studyId);
 
   Engines::Component_ptr
   createPythonInstance(std::string genericRegisterName,
-                      int studyId);
+                       int studyId);
 
   static bool isPythonContainer(const char* ContainerName);
   static void decInstanceCnt(std::string genericRegisterName);
@@ -132,6 +139,7 @@ public:
 
   virtual Engines::Salome_file_ptr createSalome_file(const char* origFileName);
   void copyFile(Engines::Container_ptr container, const char* remoteFile, const char* localFile);
+  Engines::PyNode_ptr createPyNode(const char* nodeName, const char* code);
 
 protected:
 
@@ -160,10 +168,10 @@ protected:
   std::map<std::string, PortableServer::ObjectId *> _par_obj_inst_map;
 
   typedef  PortableServer::ObjectId * (*FACTORY_FUNCTION) (CORBA::ORB_ptr, char *, int,
-                                                          PortableServer::POA_ptr, 
-                                                          PortableServer::ObjectId *, 
-                                                          const char *, 
-                                                          const char *);
+                                                           PortableServer::POA_ptr, 
+                                                           PortableServer::ObjectId *, 
+                                                           const char *, 
+                                                           const char *);
 };
 
 #endif