SMH: 3.0.0 preparation = merged version (POLYWORK + RTVDEBUG01) + adopation for new GUI

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

diff --git a/src/GraphExecutor/DataFlowExecutor_DataFlow.cxx b/src/GraphExecutor/DataFlowExecutor_DataFlow.cxx
index a1da842bc21d9ca7bbbabe357dd0d7f6b71beb7a..801e9f1145b8ab7dcd9690f83e66f2425b685d87 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_DataFlow.cxx
+++ b/src/GraphExecutor/DataFlowExecutor_DataFlow.cxx
@@ -126,13 +126,13 @@ bool GraphExecutor::DataFlow::InputOfAny( const char * ToServiceParameterName ,
     GraphBase::OutPort * anOutPort ;
     anOutPort = Graph()->GetChangeInDataNodePort( ToServiceParameterName ) ;
     cdebug << pthread_self() << "GraphExecutor::DataFlow::InputOfAny " << Graph()->Name()
-           << " " << State() << " " << ToServiceParameterName << " " << anOutPort->State()
-           << " Done : " << anOutPort->Done() << endl ;
+           << " " << State() << " " << ToServiceParameterName << " " << anOutPort->PortState()
+           << " Done : " << anOutPort->PortDone() << endl ;
     RetVal = AddInputData( Graph()->Name() , ToServiceParameterName , aValue ) ;
-    anOutPort->State(  SUPERV::ReadyState ) ;
+    anOutPort->PortState(  SUPERV::ReadyState ) ;
 // There is only one port :
-    anOutPort->ChangeInPorts( 0 )->State( SUPERV::ReadyState ) ;
-    anOutPort->Done( true ) ;
+    anOutPort->ChangeInPorts( 0 )->PortState( SUPERV::ReadyState ) ;
+    anOutPort->PortDone( true ) ;
 // There is only one inport of a Node in an ReversedOutport of a graph :
     GraphExecutor::InNode * anInNode = (GraphExecutor::InNode * ) Graph()->GetChangeGraphNode( anOutPort->InPorts( 0 )->NodeName() )->GetInNode() ;
     cdebug << pthread_self() << "GraphExecutor::DataFlow::InputOfAny : " << anInNode->Name()
@@ -218,7 +218,8 @@ bool GraphExecutor::DataFlow::OutputOfAny( const char * aNodeName ,
              << " sended recursively to the MacroNode coupled to that graph" << endl ;
       Graph()->CoupledNode()->GraphEditor()->Executor()->OutputOfAny( Graph()->CoupledNodeName() ,
                                                             ToParameterName ,
-                                                            *anOutPort->Value() ) ;
+//JR 30.03.2005                                                            *anOutPort->Value() ) ;
+                                                            anOutPort->Value() ) ;
     }
     else {
       cdebug << "GraphExecutor::DataFlow::OutputOfAny to Graph " << ToNodeName