X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGraphExecutor%2FDataFlowExecutor_DataFlow.hxx;h=d91484b0ff87d6f676da5cf930e593fed4ce304d;hb=8bb6ea38a8357d6ae5c45c4edbed03fd540f7866;hp=02064933daab14c3da1b359878f4862e6292cdc8;hpb=08511b1f8b8a960573a076bd47e21fac8afe23b7;p=modules%2Fsuperv.git

diff --git a/src/GraphExecutor/DataFlowExecutor_DataFlow.hxx b/src/GraphExecutor/DataFlowExecutor_DataFlow.hxx
index 0206493..d91484b 100644
--- a/src/GraphExecutor/DataFlowExecutor_DataFlow.hxx
+++ b/src/GraphExecutor/DataFlowExecutor_DataFlow.hxx
@@ -42,7 +42,8 @@ namespace GraphExecutor {
       DataFlow();
       DataFlow( CORBA::ORB_ptr ORB, SALOME_NamingService* ptrNamingService ,
                 const char * DataFlowName ,
-                const char * DebugFileName );
+                const char * DebugFileName ,
+                const SUPERV::KindOfNode aKindOfNode );
       DataFlow( CORBA::ORB_ptr ORB, SALOME_NamingService* ptrNamingService ,
                 const SALOME_ModuleCatalog::Service& DataFlowService ,
                 const char *DataFlowComponentName ,
@@ -51,35 +52,40 @@ namespace GraphExecutor {
                 const SUPERV::KindOfNode DataFlowkind = SUPERV::ComputingNode ,
                 const SUPERV::SDate DataFlowFirstCreation = SUPERV::SDate() ,
                 const SUPERV::SDate DataFlowLastModification = SUPERV::SDate() ,
-                const char * DataFlowEditorRelease = NULL ,
-                const char * DataFlowAuthor = NULL ,
-                const char * DataFlowComputer = NULL ,
-                const char * DataFlowComment = NULL ,
-                const char * DebugFileName = NULL ) ;
+                const char * DataFlowEditorRelease = NULLSTRING ,
+                const char * DataFlowAuthor = NULLSTRING ,
+                const char * DataFlowComputer = NULLSTRING ,
+                const char * DataFlowComment = NULLSTRING ,
+                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 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 ,
@@ -88,8 +94,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 ) ;
@@ -103,6 +109,7 @@ namespace GraphExecutor {
       bool EventW( char ** aNodeName ,
                    SUPERV::GraphEvent & anEvent ,
                    SUPERV::GraphState & aState ) ;
+      long EventQSize() ;
 
       bool IsWaiting() ;
       bool IsReady() ;
@@ -114,13 +121,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() ;