-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 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
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// File : SALOME_ParallelContainer_i.hxx
-// Author : André RIBES, EDF
+// Author : Andr� RIBES, EDF
#ifndef _SALOME_PARALLEL_CONTAINER_I_HXX_
#define _SALOME_PARALLEL_CONTAINER_I_HXX_
virtual bool load_component_Library(const char* componentName, CORBA::String_out reason);
virtual Engines::EngineComponent_ptr
- create_component_instance( const char* componentName,
- CORBA::Long studyId); // 0 for multiStudy
+ create_component_instance( const char* componentName);
virtual Engines::EngineComponent_ptr
create_component_instance_env( const char* componentName,
- CORBA::Long studyId, // 0 for multiStudy
const Engines::FieldsDict& env,
CORBA::String_out reason);
+ virtual char*
+ create_python_service_instance(const char* CompName,
+ CORBA::String_out reason);
+
Engines::EngineComponent_ptr
- find_component_instance( const char* registeredName,
- CORBA::Long studyId); // 0 for multiStudy
+ find_component_instance( const char* registeredName);
Engines::EngineComponent_ptr
load_impl(const char* nameToRegister,
void
create_paco_component_node_instance(const char* componentName,
- const char* proxy_containerName,
- CORBA::Long studyId); // 0 for multiStudy
+ const char* proxy_containerName);
void updateInstanceNumber();
Engines::EngineComponent_ptr
createCPPInstance(std::string genericRegisterName,
- void *handle,
- int studyId);
+ void *handle);
Engines::EngineComponent_ptr
- createPythonInstance(std::string genericRegisterName,
- int studyId);
+ createPythonInstance(std::string genericRegisterName);
static bool isPythonContainer(const char* ContainerName);
static void decInstanceCnt(std::string genericRegisterName);
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);
+ Engines::PyNode_ptr getDefaultPyNode(const char *nodeName);
Engines::PyScriptNode_ptr createPyScriptNode(const char* nodeName, const char* code);
-
+ Engines::PyScriptNode_ptr getDefaultPyScriptNode(const char *nodeName);
protected:
SALOME_NamingService *_NS;
_fileRef_map_t _fileRef_map;
_Salome_file_map_t _Salome_file_map;
- // Cette map contient les references vers les différentes
- // instances d'objets parallèles.
+ // Cette map contient les references vers les diff�rentes
+ // instances d'objets parall�les.
std::map<std::string, PortableServer::ObjectId *> _par_obj_inst_map;
typedef PortableServer::ObjectId * (*FACTORY_FUNCTION) (CORBA::ORB_ptr, char *, int,