Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/superv.git] / src / Supervision / Graph_Impl.hxx

diff --git a/src/Supervision/Graph_Impl.hxx b/src/Supervision/Graph_Impl.hxx
index b8515c7dc18ab6a9ee4fa34c3d35b7892e512918..1be15cd64afe738acfcc552bce33067b13f56b28 100644 (file)
--- a/src/Supervision/Graph_Impl.hxx
+++ b/src/Supervision/Graph_Impl.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -115,7 +115,7 @@ class Graph_Impl : public POA_SUPERV::Graph ,
                           const char * NodeComponentName ,
                           const char * InterfaceName ,
                           const SALOME_ModuleCatalog::Service &NodeService ,
-                         bool isCimpl ) ; // mkr : PAL11273 : C++ implementation by default
+                         const SALOME_ModuleCatalog::ImplType ImplType ) ; // mkr : PAL11273 : C++ implementation by default
     virtual SUPERV::INode_ptr INode(
                           const char * FuncName ,
                           const SUPERV::ListOfStrings & PythonFunction ) ;
@@ -158,7 +158,7 @@ class Graph_Impl : public POA_SUPERV::Graph ,
     virtual SUPERV::Link_ptr Link( SUPERV::Port_ptr OutPort ,
                                    SUPERV::Port_ptr InPort ) ;
 
-    virtual SUPERV::ListOfNodes_var Graph_Impl::SetNode( SUPERV::ListOfNodes_var RetVal ,
+    virtual SUPERV::ListOfNodes_var SetNode( SUPERV::ListOfNodes_var RetVal ,
                                                          GraphBase::ComputingNode * aNode ) ;
     virtual SUPERV::ListOfNodes * Nodes() ;
     virtual void SetNodeObjRef( GraphEditor::InNode * anInNode ) ;
@@ -176,21 +176,21 @@ class Graph_Impl : public POA_SUPERV::Graph ,
     virtual bool IsExecutable() ;
 
     virtual bool IsEditing() ;
-    virtual bool IsExecuting() ;
+    virtual CORBA::Boolean IsExecuting() ;
 
     virtual bool IsReadOnly() ;
 
-    virtual long LevelMax() ;
-    virtual SUPERV::ListOfNodes * LevelNodes(long aLevel ) ;
-    virtual long ThreadsMax() ;
-    virtual long Threads() ;
-    virtual long SuspendedThreads() ;
+    virtual CORBA::Long LevelMax() ;
+    virtual SUPERV::ListOfNodes * LevelNodes(CORBA::Long aLevel ) ;
+    virtual CORBA::Long ThreadsMax() ;
+    virtual CORBA::Long Threads() ;
+    virtual CORBA::Long SuspendedThreads() ;
 
     virtual bool Run() ;   // called on "Execute Graph" command
     virtual bool Start() ; // called on "Execute Graph Step-by-Step" command
  
     virtual bool Begin() ;
-    virtual long LastLevelDone() ;
+    virtual CORBA::Long LastLevelDone() ;
 
     virtual bool EventNoW( SUPERV::CNode_out aNode ,
                            SUPERV::GraphEvent & anEvent ,
@@ -201,10 +201,10 @@ class Graph_Impl : public POA_SUPERV::Graph ,
     virtual bool EventW( SUPERV::CNode_out aNode ,
                          SUPERV::GraphEvent & anEvent ,
                          SUPERV::GraphState & aState ) ;
-    virtual long EventQSize() ;
+    virtual CORBA::Long EventQSize() ;
 
-    virtual long SubGraphsNumber() ;
-    virtual SUPERV::ListOfNodes * SubGraphsNodes( const long aSubGraphNumber ) ;
+    virtual CORBA::Long SubGraphsNumber() ;
+    virtual SUPERV::ListOfNodes * SubGraphsNodes( CORBA::Long aSubGraphNumber ) ;
 
     virtual bool Merge(const SUPERV::Graph_ptr aGraph ) ;
     virtual bool Merge(const SUPERV::Graph_ptr aGraph , map< string , int > & aMapOfNodes ) ;
@@ -212,6 +212,10 @@ class Graph_Impl : public POA_SUPERV::Graph ,
     virtual SUPERV::StreamGraph_ptr ToStreamGraph() ;
 
     virtual void Editing(); // Destroy Executor and use only Editor and its data model
+  
+    virtual char* DefaultCContainerName() ;
+    virtual char* DefaultPythonContainerName() ;
+    virtual char* ContainerNameForComponent( const char * theComponentName) ;
 
 private:
     bool run( const bool andSuspend = false ); // Run() calls run( false ), Start() calls run( true );