MPV: Merge V1_2d

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

diff --git a/src/Supervision/Graph_Impl.hxx b/src/Supervision/Graph_Impl.hxx
index 2560596cf39fee164e684af2bc2fcb45930d79d0..d7b8d9a1387ae053f9eed11925617d639c4b3b22 100644 (file)
--- a/src/Supervision/Graph_Impl.hxx
+++ b/src/Supervision/Graph_Impl.hxx
@@ -59,9 +59,9 @@ class Graph_Impl :public INode_Impl ,
     SALOME_NamingService *     _NamingService ;
     char * _DebugFileName ;
 
+    pthread_mutex_t            _MutexExecutorWait ;
     GraphExecutor::DataFlow *  _DataFlowExecutor ;
 
-    int                        _ExecNumber ;
     SUPERV::Graph_var          myServant; // mpv 23.12.2002: store servant of graph to get constant IOR
 
   public:
@@ -81,7 +81,7 @@ class Graph_Impl :public INode_Impl ,
 
     virtual void ReadOnly() ;
 
-    virtual SUPERV::INode_ptr GetNode() ;
+    virtual SUPERV::INode_ptr Node() ;
 
 //    virtual char * DataFlowInfo() ;
 //    virtual char * DataNodeInfo() ;
@@ -126,7 +126,7 @@ class Graph_Impl :public INode_Impl ,
                           const SUPERV::ListOfStrings & PythonFunction ,
                           SUPERV::INode_out anEndOfSwitch ) ;
 
-    virtual SUPERV::CNode_ptr GetNode( const char * NodeName );
+    virtual SUPERV::CNode_ptr Node( const char * NodeName );
 
     virtual SUPERV::Link_ptr Link( SUPERV::Port_ptr OutPort ,
                                    SUPERV::Port_ptr InPort ) ;
@@ -134,6 +134,7 @@ class Graph_Impl :public INode_Impl ,
     virtual SUPERV::ListOfNodes_var Graph_Impl::SetNode( SUPERV::ListOfNodes_var RetVal ,
                                       GraphBase::ComputingNode * aNode ) ;
     virtual SUPERV::ListOfNodes * Nodes() ;
+    virtual void SetNodeObjRef( GraphEditor::InNode * anInNode ) ;
     virtual SUPERV::ListOfLinks * GLinks() ;
     virtual SUPERV::ListOfLinks * Links( GraphBase::ComputingNode * aNode ,
                                          const char * anInputParam ) ;
@@ -172,6 +173,7 @@ class Graph_Impl :public INode_Impl ,
     virtual bool EventW( SUPERV::CNode_out aNode ,
                          SUPERV::GraphEvent & anEvent ,
                          SUPERV::GraphState & aState ) ;
+    virtual long EventQSize() ;
 
     virtual bool Merge(const SUPERV::Graph_ptr aGraph ) ;