A fix for a bug was integrated. The bug: Python function (body) was changed, but...

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

diff --git a/src/GraphExecutor/DataFlowExecutor_DataFlow.lxx b/src/GraphExecutor/DataFlowExecutor_DataFlow.lxx
index ce3c6061dcdce30f2fa9d1e90dbbbf1ac5fde8da..377f542287ee7acdfea78d89075bf416c5a18956 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_DataFlow.lxx
+++ b/src/GraphExecutor/DataFlowExecutor_DataFlow.lxx
@@ -29,42 +29,34 @@
 
 #include "DataFlowExecutor_OutNode.hxx"
 
-inline bool GraphExecutor::DataFlow::LoadDataFlow(
-       const GraphBase::SGraph &aDataFlow ) {
+inline bool GraphExecutor::DataFlow::LoadDataFlow( const GraphBase::SGraph * aDataFlow ) {
   return GraphExecutor::OutNode::LoadDataFlow( aDataFlow ) ; 
 }
 
-inline bool GraphExecutor::DataFlow::LoadXml( const char* myFileName ) {
-  return GraphExecutor::OutNode::LoadXml( myFileName ) ; 
-}
+//inline bool GraphExecutor::DataFlow::LoadXml( const char* myFileName ) {
+//  return GraphExecutor::OutNode::LoadXml( myFileName ) ; 
+//}
 
-inline const SALOME_ModuleCatalog::Service * GraphExecutor::DataFlow::NodeService(
-                                             const char * aNodeName ) {
-  if ( GetGraphNode( aNodeName ) )
-    return GetGraphNode( aNodeName )->GetService() ;
+inline const SALOME_ModuleCatalog::Service * GraphExecutor::DataFlow::NodeService( const char * aNodeName ) {
+  if ( Graph()->GetGraphNode( aNodeName ) )
+    return Graph()->GetGraphNode( aNodeName )->GetService() ;
   return NULL ;
 }
 
-inline bool GraphExecutor::DataFlow::ChangeInputData( const char* ToNodeName ,
-                                                 const char* ToParameterName ,
-                                                 const CORBA::Any aValue ) {
+inline bool GraphExecutor::DataFlow::AddInputData( const char* ToNodeName ,
+                                                   const char* ToParameterName ,
+                                                   const CORBA::Any aValue ) {
   if ( !IsValid() )
     return false ;
-  return GraphBase::Graph::ChangeInputData( ToNodeName , ToParameterName ,
-                                            aValue ) ; 
+  return Graph()->AddInputData( ToNodeName , ToParameterName , aValue ) ; 
 } ;
 
-inline bool GraphExecutor::DataFlow::AddInputSharedData(const char* ToNodeName1 ,
-                                                      const char* ToParameterName1 ,
-                                                      const char* ToNodeName2 ,
-                                                      const char* ToParameterName2 ) {
+inline bool GraphExecutor::DataFlow::ChangeInputData( const char* ToNodeName ,
+                                                      const char* ToParameterName ,
+                                                      const CORBA::Any aValue ) {
   if ( !IsValid() )
     return false ;
-  return GraphExecutor::OutNode::AddInputData( ToNodeName1 ,
-                                               ToParameterName1 ,
-                                               ToNodeName2 ,
-                                               ToParameterName2 ) ;
-//                                         aKindOfPortValue ) ; 
+  return Graph()->ChangeInputData( ToNodeName , ToParameterName , aValue ) ; 
 } ;
 
 inline bool GraphExecutor::DataFlow::IsValid() {
@@ -78,11 +70,6 @@ inline bool GraphExecutor::DataFlow::IsExecutable() {
 inline bool GraphExecutor::DataFlow::Run( const bool AndSuspend ) {
   return GraphExecutor::OutNode::Run( AndSuspend ) ;
 }
-inline bool GraphExecutor::DataFlow::Run( const char * aNodeName ,
-                                          const char * AtNodeName ,
-                                          const bool AndSuspend ) {
-  return GraphExecutor::OutNode::Run( aNodeName ,  AtNodeName , AndSuspend ) ;
-}
 
 inline long GraphExecutor::DataFlow::LastLevelDone() {
   return GraphExecutor::OutNode::LastLevelDone() ;
@@ -107,6 +94,10 @@ inline long GraphExecutor::DataFlow::EventQSize() {
   return GraphExecutor::OutNode::EventQSize() ;
 }
 
+inline void GraphExecutor::DataFlow::State(GraphExecutor::AutomatonState aState ) {
+  GraphExecutor::OutNode::State( aState ) ;
+}
+
 inline SUPERV::GraphState GraphExecutor::DataFlow::State() {
   return GraphExecutor::OutNode::State() ;
 }
@@ -130,11 +121,11 @@ inline long GraphExecutor::DataFlow::Thread( const char * aNodeName ) {
   return GraphExecutor::OutNode::Thread( aNodeName ) ;
 }
 
-inline SUPERV::AutomatonState GraphExecutor::DataFlow::AutomatonState() {
+inline GraphExecutor::AutomatonState GraphExecutor::DataFlow::AutomatonState() {
   return GraphExecutor::OutNode::AutomatonState() ;
 }
 
-inline SUPERV::AutomatonState GraphExecutor::DataFlow::AutomatonState(
+inline GraphExecutor::AutomatonState GraphExecutor::DataFlow::AutomatonState(
                                const char * aNodeName ) {
   return GraphExecutor::OutNode::AutomatonState( aNodeName ) ;
 }