NRI : Merge from 1.2c.

[modules/superv.git] / src / GraphBase / DataFlowBase_Graph.hxx

diff --git a/src/GraphBase/DataFlowBase_Graph.hxx b/src/GraphBase/DataFlowBase_Graph.hxx
index 4be973908cb87da4b2559e24fd30db2f351d5325..9b585d4c1c5d4c5fc882ad7802653a21dcd47cc5 100644 (file)
--- a/src/GraphBase/DataFlowBase_Graph.hxx
+++ b/src/GraphBase/DataFlowBase_Graph.hxx
@@ -45,7 +45,7 @@ namespace GraphBase {
     private:
 
       int                 _Graph_prof_debug;
-      ostream           * _Graph_fdebug;
+      ofstream          * _Graph_fdebug;
       CORBA::ORB_ptr      _Orb ;
       SUPERV::Graph_var   _Graph ;
       Graph_Impl        * _GraphImpl ;
@@ -103,8 +103,11 @@ namespace GraphBase {
 
       void Set_prof_debug( CORBA::ORB_ptr ORB ,
                            const char * DebugFileName ) ;
-      int * Graph_prof_debug() { return &_Graph_prof_debug ; } ;
-      ostream * Graph_fdebug() { return _Graph_fdebug ; } ;
+      int * Graph_prof_debug() {
+//            MESSAGE( "Graph_prof_debug _Graph_prof_debug " << &_Graph_prof_debug << " _Graph_fdebug "
+//                     << _Graph_fdebug ) ;
+            return &_Graph_prof_debug ; } ;
+      ofstream * Graph_fdebug() { return _Graph_fdebug ; } ;
 
       SUPERV::Graph_var ObjRef() const { return _Graph ; } ;
       void SetObjRef( SUPERV::Graph_var aGraph ) {
@@ -214,7 +217,7 @@ namespace GraphBase {
 
       GraphBase::SNode * GetInfo() const ;
       GraphBase::ListOfNodes * GetNodes() const ;
-      GraphBase::ListOfLinks * GetLinks() const ;
+      GraphBase::ListOfLinks * GetLinks(bool AllLinks = false ) const ;
       GraphBase::ListOfGraphs * GetGraphs() const ;
       GraphBase::ListOfLinks * GetDatas() const ;
 //      SALOME_ModuleCatalog::Service * GetService() const ;
@@ -264,6 +267,7 @@ namespace GraphBase {
 
       bool Sort() ;
       bool ComputingNodes() const ;
+      bool LinkLoopNodes(bool & NewLink ) ;
       bool DataServerNodes() const ;
   
       long LevelMax() {