NRI : Merge from 1.2c.

[modules/superv.git] / src / GraphEditor / DataFlowEditor_InNode.cxx

diff --git a/src/GraphEditor/DataFlowEditor_InNode.cxx b/src/GraphEditor/DataFlowEditor_InNode.cxx
index 034c99e097b880557548bd59c75072d115e9b3f6..28044aa31d82309b31a733fcf901f54c5159f76a 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_InNode.cxx
+++ b/src/GraphEditor/DataFlowEditor_InNode.cxx
@@ -25,22 +25,23 @@
 //  Module : SUPERV
 
 using namespace std;
-#include <string.h>
-#include <strstream>
-#include <iostream>
+//#include <string.h>
+//#include <sstream>
+//#include <iostream>
 
 #include "DataFlowEditor_InNode.hxx"
 
 GraphEditor::InNode::InNode() {
 }
 
+//ostream * fdebug = NULL ;
 GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB, 
-                            SALOME_NamingService* ptrNamingService ,
+                            SALOME_NamingService * ptrNamingService ,
                              GraphBase::ListOfFuncName aFuncName ,
                              GraphBase::ListOfPythonFunctions aPythonFunction ,
                              const SALOME_ModuleCatalog::Service& aService ,
                              const char * ComponentName ,
-                             const char* NodeInterfaceName ,
+                             const char * NodeInterfaceName ,
                              const char * NodeName ,
                              const SUPERV::KindOfNode akind ,
                              const SUPERV::SDate NodeFirstCreation ,
@@ -53,9 +54,15 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                              const int X ,
                              const int Y ,
                              int * Graph_prof_debug,
-                             ostream * Graph_fdebug) {
+                             ofstream * Graph_fdebug) {
   SetDebug( ORB , Graph_prof_debug , Graph_fdebug ) ;
-
+//  cout << "GraphEditor::InNode::InNode GraphBase::Base::_fdebug " << GraphBase::Base::_fdebug << endl ;
+  cdebug_in << "GraphEditor::InNode::InNode" << endl ;
+//  if ( GraphBase::Base::_fdebug )
+//    *GraphBase::Base::_fdebug << endl << "xxx-->" << " " << "GraphEditor::InNode::InNode" << endl ;
+//  if ( fdebug )
+//    (*fdebug) << endl << "xxxxxx-->" << " " << "GraphEditor::InNode::InNode" << endl ;
+//  cout << "GraphEditor::InNode::InNode GraphBase::Base::_fdebug " << GraphBase::Base::_fdebug << endl ;
   _ComputingNode = NULL ;
   _FactoryNode = NULL ;
   _InLineNode = NULL ;
@@ -66,7 +73,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
   _EndOfSwitchNode = NULL ;
   switch ( akind ) {
   case SUPERV::ComputingNode : {
-    cdebug << "GraphEditor::InNode::InNode SUPERV::ComputingNode : " << NodeName ;
+    cdebug << "GraphEditor::InNode::InNode SUPERV::ComputingNode : " << NodeName << endl ;
     _ComputingNode = new GraphBase::ComputingNode( ORB , ptrNamingService , aService ,
                                                    NodeName , akind ,
                                                    NodeFirstCreation ,
@@ -78,7 +85,8 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
     break ;
   }
   case SUPERV::FactoryNode : {
-    cdebug << "GraphEditor::InNode::InNode SUPERV::FactoryNode : " << NodeName ;
+//    cout << "GraphEditor::InNode::InNode SUPERV::FactoryNode : " << NodeName << endl ;
+    cdebug << "GraphEditor::InNode::InNode SUPERV::FactoryNode : " << NodeName << endl ;
     _FactoryNode = new GraphBase::FactoryNode( ORB , ptrNamingService , aService ,
                                                ComponentName , NodeInterfaceName ,
                                                NodeName , akind ,
@@ -88,11 +96,12 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                                NodeComputer , NodeComment ,
                                                GeneratedName , X , Y ,
                                                Graph_prof_debug , Graph_fdebug ) ;
+//    cout << "GraphEditor::InNode::InNode SUPERV::FactoryNode : " << NodeName << endl ;
     _ComputingNode = (GraphBase::ComputingNode *) _FactoryNode ;
     break ;
   }
   case SUPERV::InLineNode : {
-    cdebug << "GraphEditor::InNode::InNode SUPERV::InLineNode : " << NodeName ;
+    cdebug << "GraphEditor::InNode::InNode SUPERV::InLineNode : " << NodeName << endl ;
     _InLineNode = new GraphBase::InLineNode( ORB , ptrNamingService ,
                                              aFuncName[0].c_str() , *aPythonFunction[0] ,
                                              NodeName , akind ,
@@ -105,7 +114,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
     break ;
   }
   case SUPERV::GOTONode : {
-    cdebug << "GraphEditor::InNode::InNode SUPERV::GOTONode : " << NodeName ;
+    cdebug << "GraphEditor::InNode::InNode SUPERV::GOTONode : " << NodeName << endl ;
     _GOTONode = new GraphBase::GOTONode( ORB , ptrNamingService ,
                                          aFuncName[0].c_str() , *aPythonFunction[0] ,
                                          NodeName , akind ,
@@ -115,10 +124,11 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                          X , Y ,
                                          Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _GOTONode ;
+    _InLineNode = (GraphBase::InLineNode *) _ComputingNode ;
     break ;
   }
   case SUPERV::LoopNode : {
-    cdebug << "GraphEditor::InNode::InNode SUPERV::LoopNode : " << NodeName ;
+    cdebug << "GraphEditor::InNode::InNode SUPERV::LoopNode : " << NodeName << endl ;
     _LoopNode = new GraphBase::LoopNode( ORB , ptrNamingService ,
                                          aFuncName[0].c_str() , *aPythonFunction[0] ,
                                          aFuncName[1].c_str() , *aPythonFunction[1] ,
@@ -131,10 +141,11 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                          Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _LoopNode ;
     _GOTONode = (GraphBase::GOTONode *) _ComputingNode ;
+    _InLineNode = (GraphBase::InLineNode *) _ComputingNode ;
     break ;
   }
   case SUPERV::EndLoopNode : {
-    cdebug << "GraphEditor::InNode::InNode SUPERV::EndOfLoopNode : " << NodeName ;
+    cdebug << "GraphEditor::InNode::InNode SUPERV::EndOfLoopNode : " << NodeName << endl ;
     _EndOfLoopNode = new GraphBase::EndOfLoopNode(
                                          ORB , ptrNamingService ,
                                          aFuncName[0].c_str() , *aPythonFunction[0] ,
@@ -146,10 +157,11 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                          Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _EndOfLoopNode ;
     _GOTONode = (GraphBase::GOTONode *) _ComputingNode ;
+    _InLineNode = (GraphBase::InLineNode *) _ComputingNode ;
     break ;
   }
   case SUPERV::SwitchNode : {
-    cdebug << "GraphEditor::InNode::InNode SUPERV::SwitchNode : " << NodeName ;
+    cdebug << "GraphEditor::InNode::InNode SUPERV::SwitchNode : " << NodeName << endl ;
     _SwitchNode = new GraphBase::SwitchNode( ORB , ptrNamingService ,
                                              aFuncName[0].c_str() , *aPythonFunction[0] ,
                                              NodeName , akind ,
@@ -160,10 +172,11 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                              Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _SwitchNode ;
     _GOTONode = (GraphBase::GOTONode *) _ComputingNode ;
+    _InLineNode = (GraphBase::InLineNode *) _ComputingNode ;
     break ;
   }
   case SUPERV::EndSwitchNode : {
-    cdebug << "GraphEditor::InNode::InNode SUPERV::EndOfSwitchNode : " << NodeName ;
+    cdebug << "GraphEditor::InNode::InNode SUPERV::EndOfSwitchNode : " << NodeName << endl ;
     _EndOfSwitchNode = new GraphBase::EndOfSwitchNode(
                                              ORB , ptrNamingService ,
                                              aFuncName[0].c_str() , *aPythonFunction[0] ,
@@ -175,12 +188,19 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                              Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _EndOfSwitchNode ;
     _GOTONode = (GraphBase::GOTONode *) _ComputingNode ;
+    _InLineNode = (GraphBase::InLineNode *) _ComputingNode ;
     break ;
   }
+  case SUPERV::DataFlowNode : {
+    cdebug << "GraphEditor::InNode::InNode ERROR SUPERV::DataFlowNode : " << NodeName << endl ;
+  }
+  case SUPERV::UnknownNode : {
+    cdebug << "GraphEditor::InNode::InNode ERROR SUPERV::UnknownNode : " << NodeName << endl ;
+  }
   }
-  cdebug << "GraphEditor::InNode::InNode "  << (void *) this
-         << " _ComputingNode " << (void *) _ComputingNode  ;
   _ComputingNode->InNode( this ) ;
+  cdebug_out << "GraphEditor::InNode::InNode " << (void *) this
+             << " _ComputingNode " << (void *) _ComputingNode  << endl ;
 }
 
 GraphEditor::InNode::~InNode() {