DCQ:prepare 2.0.0

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

diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.hxx b/src/GraphEditor/DataFlowEditor_DataFlow.hxx
index c405e0bc3fdd849120166ae0f81f24a8613e1c2b..5a96b2aa0b71af220fb91b33774ee93fc765ef6f 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_DataFlow.hxx
+++ b/src/GraphEditor/DataFlowEditor_DataFlow.hxx
@@ -72,7 +72,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 ) ;
@@ -81,12 +82,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 (
@@ -132,18 +133,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 ,
@@ -201,10 +201,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 ) ;
@@ -214,7 +210,9 @@ namespace GraphEditor {
       bool IsValid() ;
       bool IsExecutable() ;
 
+      void Executing() ;
       bool IsExecuting() ;
+      void Editing() ;
       bool IsEditing() ;
       void EditedAfterExecution(bool EditedAfterExecution ) ;
       bool EditedAfterExecution() ;