Export of an unvalid graph with InLineNodes and with Ports of InLineNodes linked...

diff --git a/src/GraphBase/DataFlowBase_ComputingNode.cxx b/src/GraphBase/DataFlowBase_ComputingNode.cxx
index 4ed3c5bbc79cbf6a49fa2d82756c14502cca851a..ebeeb813b08dbcd91cd3c3c8daf9ff4d50aa5713 100644 (file)
--- a/src/GraphBase/DataFlowBase_ComputingNode.cxx
+++ b/src/GraphBase/DataFlowBase_ComputingNode.cxx
@@ -1207,6 +1207,10 @@ bool GraphBase::ComputingNode::SaveXML( QDomDocument & Graph , QDomElement & inf
   aField = Graph.createTextNode( aYCoordinate ) ;
   node.appendChild( yposition ) ;
   yposition.appendChild( aField ) ;
+  cdebug_out << "ComputingNode::SavePY " ;
+
+  NodeInfo( *_fdebug ) ;
+  cdebug << endl ;
   cdebug_out << "SaveXML Node " << Name() << endl ;
   return true ;
 }
@@ -1511,7 +1515,7 @@ bool GraphBase::ComputingNode::SavePY( ostream &f , const char * aGraphName ,
          }
         }
       }
-      delete [] EndName ;
+//      delete [] EndName ;
     }
   }
 

diff --git a/src/GraphBase/DataFlowBase_PortsOfNode.cxx b/src/GraphBase/DataFlowBase_PortsOfNode.cxx
index e464f542a818b1d970a8d931fcb2e00de48324f1..cedc71112477d498d3f772e883897eef51b972bc 100644 (file)
--- a/src/GraphBase/DataFlowBase_PortsOfNode.cxx
+++ b/src/GraphBase/DataFlowBase_PortsOfNode.cxx
@@ -394,9 +394,9 @@ GraphBase::OutPort * GraphBase::PortsOfNode::AddOutPort( CORBA::ORB_ptr ORB ,
     else {
       index = _NodeOutPortsSize-2 - DataStreamOutPortsNumber() ;
     }
-    if ( aKindOfNode == SUPERV::LoopNode || aKindOfNode == SUPERV::EndLoopNode ) {
-      index += 1 ;
-    }
+//    if ( aKindOfNode == SUPERV::LoopNode || aKindOfNode == SUPERV::EndLoopNode ) {
+//      index += 1 ;
+//    }
     if ( index >= 0 ) {
       int i ;
       for ( i = _NodeOutPortsSize - 2 ; i >= index ; i-- ) {

diff --git a/src/GraphEditor/DataFlowEditor_OutNode.cxx b/src/GraphEditor/DataFlowEditor_OutNode.cxx
index 43ee44bd8cbf2794f3306b7367e1e624334c34b4..9ffeee3eb231abbe53d9544c5c1199fa057822e4 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_OutNode.cxx
+++ b/src/GraphEditor/DataFlowEditor_OutNode.cxx
@@ -964,6 +964,8 @@ bool GraphEditor::OutNode::Valid() {
     Graph()->CoupledNode()->GraphEditor()->UnValid() ;
   }
 
+  Graph()->InLineServices() ;
+
   int SubStreamGraphsNumber = 0 ;
   if ( !Graph()->Sort( SubStreamGraphsNumber ) ) {
     cdebug_out << "This DataFlow is not valid." << endl ;
@@ -979,7 +981,7 @@ bool GraphEditor::OutNode::Valid() {
   
 //  CreateService() ;
 
-  Graph()->InLineServices() ;
+//  Graph()->InLineServices() ;
 
   Graph()->ComputingNodes() ;
 

diff --git a/src/Supervision/Graph_Impl.cxx b/src/Supervision/Graph_Impl.cxx
index f3ae774e90e0047bb38e50da32487a9635ad2189..dd0df077aaca30549036e939e2f00cf22c2b502e 100644 (file)
--- a/src/Supervision/Graph_Impl.cxx
+++ b/src/Supervision/Graph_Impl.cxx
@@ -522,9 +522,10 @@ SUPERV::LNode_ptr Graph_Impl::LNode( const char * InitName ,
       myEndNode->SetObjRef( SUPERV::ELNode::_duplicate( iendobject ) ) ;
       myNode->SetCoupled( myEndNode->BaseNode()->Name() ) ;
       myEndNode->SetCoupled( myNode->BaseNode()->Name() ) ;
-      Link( myNode->Port( "DoLoop" ) , myEndNode->Port( "DoLoop" ) ) ;
+//JR 25.01.2005  That links are already done in SetCoupled above ...
+//      Link( myNode->Port( "DoLoop" ) , myEndNode->Port( "DoLoop" ) ) ;
 //      Link( myEndNode->Port( "DoLoop" ) , myNode->Port( "InitLoop" ) ) ;
-      Link( myEndNode->Port( "DoLoop" ) , myNode->Port( "DoLoop" ) ) ;
+//      Link( myEndNode->Port( "DoLoop" ) , myNode->Port( "DoLoop" ) ) ;
     }
   }
   anEndOfLoop = SUPERV::ELNode::_duplicate( iendobject ) ;