Bug fix: don't set "Loading" state for MacroNodes in InitialState() function (called...

[modules/superv.git] / src / GraphEditor / DataFlowEditor_DataFlow.hxx

diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.hxx b/src/GraphEditor/DataFlowEditor_DataFlow.hxx
index 23e65b19ea39db4305c73a026b83e7e7890c8479..1bc4096c58a512834087b9275b5053f69f670857 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_DataFlow.hxx
+++ b/src/GraphEditor/DataFlowEditor_DataFlow.hxx
@@ -27,11 +27,14 @@
 #ifndef _DATAFLOWEDITOR_DATAFLOW_HXX
 #define _DATAFLOWEDITOR_DATAFLOW_HXX
 
-//#include "DataFlowExecutor_DataFlow.hxx"
-
-#include "DataFlowExecutor_DataFlow.hxx"
 #include "DataFlowEditor_OutNode.hxx"
 
+namespace GraphExecutor {
+  
+  class DataFlow;
+
+} 
+
 namespace GraphEditor {
 
   class DataFlow : public GraphEditor::OutNode {
@@ -49,7 +52,8 @@ namespace GraphEditor {
       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 ,
@@ -71,7 +75,8 @@ namespace GraphEditor {
       char * NodeInfo( const char * aNodeName ) ;
 
       bool LoadDataFlow( const GraphBase::SGraph * aDataFlow ) ;
-      bool LoadXml( const char * myFileName ) ;
+//      bool LoadXml( const char * myFileName ) ;
+      bool LoadXml( const char * myFileName , GraphBase::ListOfSGraphs & aListOfDataFlows ) ;
       bool LoadInfo( const GraphBase::SNode &aDataFlowInfo ) ;
 
       bool SaveXml(const char * myFileName ) ;
@@ -80,12 +85,12 @@ namespace GraphEditor {
 
 //      void DateModification() ;
 
-      GraphBase::SGraph * GetDataFlow() ;
+      GraphBase::ListOfSGraphs * GetDataFlows() ;
       GraphBase::SNode * GetInfo() const ;
-      GraphBase::ListOfNodes * GetNodes() const ;
-      GraphBase::ListOfLinks * GetLinks() const ;
-      GraphBase::ListOfGraphs * GetGraphs() const ;
-      GraphBase::ListOfLinks * GetDatas() const ;
+      GraphBase::ListOfSNodes * GetNodes() const ;
+      GraphBase::ListOfSLinks * GetLinks() const ;
+      GraphBase::ListOfSGraphs * GetGraphs() const ;
+      GraphBase::ListOfSLinks * GetDatas() const ;
       const SALOME_ModuleCatalog::Service * GetService() ;
 
       GraphEditor::InNode * AddService (
@@ -131,18 +136,17 @@ namespace GraphEditor {
 
       bool HasInput(const char * ToServiceParameterName ) ;
 
-      bool AddLinkValue( const char * FromNodeName ,
-                         const char * FromServiceParameterName ,
-                         const char * ToNodeName ,
-                         const char * ToServiceParameterName ,
-                         const CORBA::Any aValue ) {
-           return AddLink( FromNodeName, FromServiceParameterName , ToNodeName ,
-                           ToServiceParameterName , aValue ) ; } ;
+//      bool AddLinkValue( const char * FromNodeName ,
+//                         const char * FromServiceParameterName ,
+//                         const char * ToNodeName ,
+//                         const char * ToServiceParameterName ,
+//                         const CORBA::Any aValue ) {
+//           return AddLinkValue( FromNodeName, FromServiceParameterName , ToNodeName ,
+//                                ToServiceParameterName , aValue ) ; } ;
       bool AddLink( const char * FromNodeName ,
                     const char * FromServiceParameterName ,
                    const char * ToNodeName ,
-                    const char * ToServiceParameterName ,
-                    const CORBA::Any aValue = CORBA::Any() ) ;
+                    const char * ToServiceParameterName ) ;
 
       bool RemoveLink( const char * FromNodeName ,
                        const char * FromServiceParameterName ,
@@ -200,10 +204,6 @@ namespace GraphEditor {
       bool AddInputData( 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 ) ;
 
       const CORBA::Any * GetInData( const char * ToNodeName ,
                                     const char * ToParameterName ) ;
@@ -213,8 +213,11 @@ namespace GraphEditor {
       bool IsValid() ;
       bool IsExecutable() ;
 
+      void Executing() ; // asv : removed a bool parameter, use Editing() to set _Executing = false
       bool IsExecuting() ;
+      void Editing() ;
       bool IsEditing() ;
+      bool UnValid() ;
       void EditedAfterExecution(bool EditedAfterExecution ) ;
       bool EditedAfterExecution() ;
 
@@ -223,7 +226,8 @@ namespace GraphEditor {
       long LevelMax() ;
       SUPERV::ListOfStrings * LevelNodes(long aLevel ) ;
       long ThreadsMax() ;
-      long GraphsNumber() ;
+      long SubGraphsNumber() ;
+      long SubStreamGraphsNumber() ;
 
       void Executor(GraphExecutor::DataFlow * DataFlowExecutor ) ;
       GraphExecutor::DataFlow * GraphEditor::DataFlow::Executor() const ;