X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_Container_i.hxx;h=197d0def95f49a37db0c8bfb496e1d5f6be97b89;hb=52111d0ad7a0d8acccc1bb4e49bb5877d949b844;hp=aa81eff997e62d563cf8ce6c5c4923a3e82b2f8e;hpb=9749fc1db72bd80e278405114b05ffc69b5031da;p=modules%2Fkernel.git diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx index aa81eff99..197d0def9 100644 --- a/src/Container/SALOME_Container_i.hxx +++ b/src/Container/SALOME_Container_i.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -30,6 +30,7 @@ #define _SALOME_CONTAINER_I_HXX_ #include "SALOME_Container.hxx" +#include "Utils_Mutex.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Component) @@ -75,7 +76,12 @@ public: create_component_instance_env( const char* componentName, CORBA::Long studyId, // 0 for multiStudy const Engines::FieldsDict& env, - CORBA::String_out reason); + 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 @@ -106,7 +112,9 @@ 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); + Engines::PyNode_ptr getDefaultPyNode(const char *nodeName); Engines::PyScriptNode_ptr createPyScriptNode(const char* nodeName, const char* code); + Engines::PyScriptNode_ptr getDefaultPyScriptNode(const char *nodeName); // --- local C++ methods Engines::EngineComponent_ptr @@ -154,6 +162,9 @@ protected: std::map _listInstances_map; std::map _fileRef_map; std::map _Salome_file_map; + std::map _dftPyScriptNode; + std::map _dftPyNode; + Utils_Mutex _mutexForDftPy; std::list _tmp_files; Engines::fileTransfer_var _fileTransfer;