Error Messages

diff --git a/src/GraphBase/DataFlowBase_EndOfSwitchNode.hxx b/src/GraphBase/DataFlowBase_EndOfSwitchNode.hxx
index 93e2599d10b372258434fc874bcf7fc72656f6e7..c6ac446fff82a41783298088c9dbfc231a6e9852 100644 (file)
--- a/src/GraphBase/DataFlowBase_EndOfSwitchNode.hxx
+++ b/src/GraphBase/DataFlowBase_EndOfSwitchNode.hxx
@@ -44,19 +44,14 @@ namespace GraphBase {
                   ofstream * Graph_fdebug = NULL ) ;
       virtual ~EndOfSwitchNode() ;
 
-      void InitEndSwitchInPortLinked() { // without StreamInPorts and Default
-           _EndSwitchInPortLinkedNumber = GetNodeInPortsSize() - DataStreamInPortsNumber() - 1 ;
-           _SwitchWithGOTO = false ;
-           int i ;
-           for ( i = 0 ; i < GetNodeInPortsSize()-1 ; i++ ) {
-             GetChangeNodeInPort( i )->BranchOfSwitchLinked( false ) ;
-          } } ;
-      bool DecrEndSwitchInPortLinked( GraphBase::InPort * anInPort ) ;
+      void InitEndSwitchInPortLinked() ;
+      bool DecrEndSwitchInPortLinked( GraphBase::InPort * anInPort ,
+                                      string & anErrorMessage ) ;
       void SetSwitchWithGOTO() {
            _SwitchWithGOTO = true ; } ;
       bool SwitchWithGOTO() {
            return _SwitchWithGOTO ; } ;
-      bool CheckEndSwitchInPortsLinked() ;
+      bool CheckEndSwitchInPortsLinked( string & anErrorMessage ) ;
 
   };
   

diff --git a/src/GraphBase/DataFlowBase_Graph.hxx b/src/GraphBase/DataFlowBase_Graph.hxx
index 108d1c12b0cd38fa41229aa3d7cef764dd944b3a..886eb212ad4eb8ba0651fc84b0cc9af8ccafe8d8 100644 (file)
--- a/src/GraphBase/DataFlowBase_Graph.hxx
+++ b/src/GraphBase/DataFlowBase_Graph.hxx
@@ -90,6 +90,8 @@ namespace GraphBase {
 //      int                              _SubStreamGraphsSize ;
 //      vector<vector<ComputingNode *> > _SubStreamGraphs ;
 
+      string _Messages ;
+
       bool AddLink( GraphBase::ComputingNode *fromNode ,
                     GraphBase::OutPort *fromPort ,
                     GraphBase::ComputingNode *toNode ,
@@ -147,12 +149,41 @@ namespace GraphBase {
 //              cdebug << "GetGraphNodeIndex of " << name << " in _MapOfGraphNodes : "
 //                     << index << " Node " << hex << (void *) _GraphNodes[ index ]
 //                     << dec << " '" << _GraphNodes[ index ]->Name() << "'" << endl ;
+#if 0
+           cdebug << "Graph::GetGraphNodeIndex " << _GraphNodesSize << " known nodes" << endl;
+           int i ;
+           for ( i = 0 ; i < _GraphNodesSize ; i++ ) {
+             cdebug << "Node" << i << _GraphNodes[ i ]->Name() << endl ;
+           }
+           map< string , int >::iterator aMapOfGraphNodesIterator ;
+           i = 0 ;
+           for ( aMapOfGraphNodesIterator = _MapOfGraphNodes.begin() ;
+             aMapOfGraphNodesIterator != _MapOfGraphNodes.end() ; aMapOfGraphNodesIterator++ ) {
+             cdebug << "MapOfGraphNodes " << i++ << " " << aMapOfGraphNodesIterator->first
+                    << " --> " << aMapOfGraphNodesIterator->second << " - 1" << endl ;
+           }
+#endif
             return index ; } ;
       void SetGraphNodeIndex( const char *name , const int index ) {
            _MapOfGraphNodes[ name ] = index + 1 ;
            cdebug << "SetGraphNodeIndex of " << name << " in _MapOfGraphNodes : "
                   << index << " Node " << (void *) _GraphNodes[ index ]
-                  << " '" << _GraphNodes[ index ]->Name() << "'" << endl ;
+                  << " '" << _GraphNodes[ index ]->Name() << "' MapOfGraphNodessize "
+                  << GetGraphNodeSize() << endl ;
+#if 1
+           cdebug << "Graph::SetGraphNodeIndex " << _GraphNodesSize << " known nodes" << endl;
+           int i ;
+           for ( i = 0 ; i < _GraphNodesSize ; i++ ) {
+             cdebug << "Node" << i << _GraphNodes[ i ]->Name() << endl ;
+           }
+           map< string , int >::iterator aMapOfGraphNodesIterator ;
+           i = 0 ;
+           for ( aMapOfGraphNodesIterator = _MapOfGraphNodes.begin() ;
+             aMapOfGraphNodesIterator != _MapOfGraphNodes.end() ; aMapOfGraphNodesIterator++ ) {
+             cdebug << "MapOfGraphNodes " << i++ << " " << aMapOfGraphNodesIterator->first
+                    << " --> " << aMapOfGraphNodesIterator->second << " - 1" << endl ;
+           }
+#endif
            } ;
       void DelGraphNodeIndex( const char *name ) {
            _MapOfGraphNodes.erase( name ) ; } ;
@@ -301,6 +332,10 @@ namespace GraphBase {
 
       void SetGraphPorts() ;
 
+      string Messages() ;
+      void ReSetMessages() ;
+      void SetMessages( string anErrorMessage ) ;
+
       bool CreateService() ;
       bool InLineServices() ;