Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_2_2_BR'
[modules/kernel.git]
/
src
/
Container
/
SALOME_Component_i.hxx
diff --git
a/src/Container/SALOME_Component_i.hxx
b/src/Container/SALOME_Component_i.hxx
index 3581cd9d24facd62af396c96417f9bd9c7daaccd..658294c873eedcadd09da9c22ae70925208f54b5 100644
(file)
--- a/
src/Container/SALOME_Component_i.hxx
+++ b/
src/Container/SALOME_Component_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-49,7
+49,7
@@
class RegistryConnexion;
class Engines_Container_i;
class RegistryConnexion;
class Engines_Container_i;
-class CONTAINER_EXPORT Engines_Component_i:
+class CONTAINER_EXPORT Engines_Component_i:
public virtual POA_Engines::EngineComponent,
public virtual PortableServer::ServantBase
{
public virtual POA_Engines::EngineComponent,
public virtual PortableServer::ServantBase
{
@@
-57,16
+57,16
@@
public:
Engines_Component_i();
Engines_Component_i(CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
Engines_Component_i();
Engines_Component_i(CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
- PortableServer::ObjectId * contId,
- const char *instanceName,
+ PortableServer::ObjectId * contId,
+ const char *instanceName,
const char *interfaceName,
bool notif = false,
bool regist = true);
//Constructor for standalone component
Engines_Component_i(CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
const char *interfaceName,
bool notif = false,
bool regist = true);
//Constructor for standalone component
Engines_Component_i(CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
- Engines::Container_ptr container,
- const char *instanceName,
+ Engines::Container_ptr container,
+ const char *instanceName,
const char *interfaceName,
bool notif = false,
bool regist = true);
const char *interfaceName,
bool notif = false,
bool regist = true);
@@
-81,7
+81,6
@@
public:
void ping();
void destroy();
void ping();
void destroy();
- CORBA::Long getStudyId();
Engines::Container_ptr GetContainerRef();
void setProperties(const Engines::FieldsDict& dico);
Engines::Container_ptr GetContainerRef();
void setProperties(const Engines::FieldsDict& dico);
@@
-97,41
+96,38
@@
public:
bool Resume_impl();
CORBA::Long CpuUsed_impl() ;
bool Resume_impl();
CORBA::Long CpuUsed_impl() ;
- virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy,
- CORBA::Boolean isPublished,
+ virtual Engines::TMPFile* DumpPython(CORBA::Boolean isPublished,
CORBA::Boolean isMultiFile,
CORBA::Boolean& isValidScript);
// CORBA operations for Salome_file
CORBA::Boolean isMultiFile,
CORBA::Boolean& isValidScript);
// CORBA operations for Salome_file
- virtual Engines::Salome_file_ptr getInputFileToService(const char* service_name,
+ virtual Engines::Salome_file_ptr getInputFileToService(const char* service_name,
const char* Salome_file_name);
const char* Salome_file_name);
- virtual Engines::Salome_file_ptr getOutputFileToService(const char* service_name,
+ virtual Engines::Salome_file_ptr getOutputFileToService(const char* service_name,
const char* Salome_file_name);
virtual void checkInputFilesToService(const char* service_name);
const char* Salome_file_name);
virtual void checkInputFilesToService(const char* service_name);
- virtual Engines::Salome_file_ptr setInputFileToService(const char* service_name,
+ virtual Engines::Salome_file_ptr setInputFileToService(const char* service_name,
const char* Salome_file_name);
virtual void checkOutputFilesToService(const char* service_name);
const char* Salome_file_name);
virtual void checkOutputFilesToService(const char* service_name);
- virtual Engines::Salome_file_ptr setOutputFileToService(const char* service_name,
+ virtual Engines::Salome_file_ptr setOutputFileToService(const char* service_name,
const char* Salome_file_name);
// Object information
virtual bool hasObjectInfo() { return false; }
const char* Salome_file_name);
// Object information
virtual bool hasObjectInfo() { return false; }
- virtual char* getObjectInfo(
CORBA::Long studyId,
const char* entry) { return CORBA::string_dup(""); }
-
+ virtual char* getObjectInfo(const char* entry) { return CORBA::string_dup(""); }
+
// Version information
virtual char* getVersion();
// Version information
virtual char* getVersion();
-
+
// --- local C++ methods
// --- local C++ methods
- PortableServer::ObjectId * getId();
+ PortableServer::ObjectId * getId();
Engines_Container_i *GetContainerPtr();
std::string getContainerName();
void setContainerName();
Engines_Container_i *GetContainerPtr();
std::string getContainerName();
void setContainerName();
- virtual bool setStudyId(CORBA::Long studyId);
- static bool isMultiStudy();
static bool isMultiInstance();
static std::string GetDynLibraryName(const char *componentName);
static bool isMultiInstance();
static std::string GetDynLibraryName(const char *componentName);
@@
-149,10
+145,7
@@
public:
std::string file_port_name,
Salome_file_i * file);
std::string file_port_name,
Salome_file_i * file);
-
protected:
protected:
- int _studyId; // -1: not initialised; 0: multiStudy; >0: study
- static bool _isMultiStudy;
static bool _isMultiInstance;
std::string _instanceName ;
static bool _isMultiInstance;
std::string _instanceName ;
@@
-173,7
+166,7
@@
protected:
typedef std::map<std::string, Salome_file_i*> _t_Salome_file_map;
// Map Service_name to _Salome_file_map
typedef std::map<std::string, Engines_Component_i::_t_Salome_file_map*> _t_Service_file_map;
typedef std::map<std::string, Salome_file_i*> _t_Salome_file_map;
// Map Service_name to _Salome_file_map
typedef std::map<std::string, Engines_Component_i::_t_Salome_file_map*> _t_Service_file_map;
-
+
_t_Service_file_map _Input_Service_file_map;
_t_Service_file_map _Output_Service_file_map;
_t_Service_file_map::iterator _Service_file_map_it;
_t_Service_file_map _Input_Service_file_map;
_t_Service_file_map _Output_Service_file_map;
_t_Service_file_map::iterator _Service_file_map_it;