Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/superv.git] / src / GraphExecutor / DataFlowExecutor_DataFlow.hxx

diff --git a/src/GraphExecutor/DataFlowExecutor_DataFlow.hxx b/src/GraphExecutor/DataFlowExecutor_DataFlow.hxx
index b5774e7965bd7adefa79b86fb05f5eaebe99019d..dc8038b0cacd2da6d74641eb89578ef7d65773fa 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_DataFlow.hxx
+++ b/src/GraphExecutor/DataFlowExecutor_DataFlow.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
 //
 //
 //
@@ -59,28 +59,34 @@ namespace GraphExecutor {
                 const char * DebugFileName = NULLSTRING ) ;
       virtual ~DataFlow();
 
-      bool LoadDataFlow( const GraphBase::SGraph &aDataFlow ) ;
-      bool LoadXml( const char* myFileName ) ;
+      bool LoadDataFlow( const GraphBase::SGraph * aDataFlow ) ;
+//      bool LoadXml( const char* myFileName ) ;
 
       const SALOME_ModuleCatalog::Service * NodeService( const char * NodeName ) ;
 
-      bool ChangeInputData( const char* ToNodeName ,
-                            const char* ToParameterName ,
+      bool AddInputData( const char * ToNodeName ,
+                         const char * ToParameterName ,
+                         const CORBA::Any aValue = CORBA::Any() ) ;
+      bool ChangeInputData( const char * ToNodeName ,
+                            const char * ToParameterName ,
                             const CORBA::Any aValue = CORBA::Any() ) ;
-      bool AddInputSharedData( const char* ToNodeName1 ,
-                               const char* ToParameterName1 ,
-                               const char* ToNodeName2 ,
-                               const char* ToParameterName2 ) ;
+
+      bool InputOfAny( const char * ToServiceParameterName ,
+                       const CORBA::Any & aValue ,
+                       const bool SomeDataReady = true ) ;
+      bool OutputOfAny( const char * aNodeName ,
+                        const char * ToServiceParameterName ,
+                        const CORBA::Any & aValue ) ;
+      bool SetWaitingStates( const char * ToServiceParameterName ) ;
 
       bool IsValid() ;
       bool IsExecutable() ;
 
       bool Run( const bool AndSuspend ) ;
-      bool Run( const char * aNodeName ,
-                const char * AtNodeName , const bool AndSuspend ) ;
 
       long LastLevelDone() ;
 
+      void State(GraphExecutor::AutomatonState aState ) ;
       SUPERV::GraphState State() ;
       SUPERV::GraphState State(const char * aNodeName ) ;
       SUPERV::GraphState State( const char * aNodeName ,
@@ -89,8 +95,8 @@ namespace GraphExecutor {
       long Thread() ;
       long Thread(const char * aNodeName ) ;
 
-      SUPERV::AutomatonState AutomatonState() ;
-      SUPERV::AutomatonState AutomatonState(const char * aNodeName ) ;
+      GraphExecutor::AutomatonState AutomatonState() ;
+      GraphExecutor::AutomatonState AutomatonState(const char * aNodeName ) ;
 
       SUPERV::ControlState ControlState() ;
       SUPERV::ControlState ControlState(const char * aNodeName ) ;
@@ -116,13 +122,15 @@ namespace GraphExecutor {
       bool IsRunning(const char * aNodeName ) ;
       bool IsDone(const char * aNodeName ) ;
       bool IsSuspended(const char * aNodeName ) ;
-      bool IsDone(const char * aNodeName ,
-                  const char * anOutServiceParameterName ) ;
-
-      const CORBA::Any *GetInData( const char * ToNodeName ,
-                                   const char * ToParameterName ) ;
-      const CORBA::Any *GetOutData( const char * FromNodeName ,
-                                    const char * FromParameterName ) ;
+      bool PortDone( const char * aNodeName ,
+                     const char * anOutServiceParameterName ) ;
+
+//JR 30.03.2005      const CORBA::Any *GetInData( const char * ToNodeName ,
+      const CORBA::Any GetInData( const char * ToNodeName ,
+                                  const char * ToParameterName ) ;
+//JR 30.03.2005      const CORBA::Any *GetOutData( const char * FromNodeName ,
+      const CORBA::Any GetOutData( const char * FromNodeName ,
+                                   const char * FromParameterName ) ;
 
       long Threads() ;