Datastream handling adjustments

[modules/superv.git] / src / GraphBase / DataFlowBase_StreamGraph.cxx

diff --git a/src/GraphBase/DataFlowBase_StreamGraph.cxx b/src/GraphBase/DataFlowBase_StreamGraph.cxx
index e509444a829fd004e99234ad4fef918218ef6958..240572b3456bddb8b5c2f69c15654c5dac7289db 100644 (file)
--- a/src/GraphBase/DataFlowBase_StreamGraph.cxx
+++ b/src/GraphBase/DataFlowBase_StreamGraph.cxx
@@ -116,7 +116,7 @@ bool GraphBase::StreamGraph::CreateStreamTopology( const char * aDirectory ) {
     f << "DEBUT        " << filename << endl ;
     f << "     TIMEOUT " << _Timeout << endl ;
     f << "     TRACE   " << KindOfDataStreamTraceToString( _DataStreamTrace ) << endl ;
-    f << "     DELTA_T " << _DeltaTime << endl ;
+    f << "     DELTAT  " << _DeltaTime << endl ;
     f << endl ;
     f << endl ;
     f << "# Liste des codes" << endl ;
@@ -163,6 +163,7 @@ bool GraphBase::StreamGraph::CreateStreamTopology( const char * aDirectory ) {
         f << endl ;
         f << " INSTANCE        " << GetGraphNode( j )->Name() << endl ;
         f << "         CODE    " << GetGraphNode( j )->ServiceName() << endl ;
+        f << "         EXEC    \"" << GetGraphNode( j )->ServiceName() << "\"" << endl ;
         f << " FIN" << endl ;
       }
     }
@@ -187,13 +188,18 @@ bool GraphBase::StreamGraph::CreateStreamTopology( const char * aDirectory ) {
               SUPERV::KindOfExtrapolation aKindOfExtrapolation ;
               ((GraphBase::InDataStreamPort *) GetGraphNode( j )->GetNodeOutPort( k )->InPorts( n ))->Params( aKindOfSchema , aKindOfInterpolation , aKindOfExtrapolation ) ;
               f << "           " << GetGraphNode( j )->Name() << "."
-                << GetGraphNode( j )->GetNodeOutPort( k )->PortName()
-                << "   " << aNumberOfValues
-                << "           =>      "
+                << GetGraphNode( j )->GetNodeOutPort( k )->PortName() ;
+              if ( aNumberOfValues != 0 ) {
+                f << " NIVEAU " << aNumberOfValues ;
+             }
+              f << "           =>      "
                 << GetGraphNode( j )->GetNodeOutPort( k )->InPorts( n )->NodeName() << "."
                 << GetGraphNode( j )->GetNodeOutPort( k )->InPorts( n )->PortName()
-                << "   " << aKindOfSchema << " " << aKindOfInterpolation << "  " << aKindOfExtrapolation
-                << " ;" << endl ;
+                << "   " << aKindOfSchema << " " << aKindOfInterpolation ;
+              if ( aKindOfExtrapolation != SUPERV::EXTRANULL ) {
+                f << " " << aKindOfExtrapolation ;
+             }
+              f << " ;" << endl ;
            }
          }
         }