Bug fix: don't set "Loading" state for MacroNodes in InitialState() function (called...

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

diff --git a/src/GraphEditor/DataFlowEditor_InNode.cxx b/src/GraphEditor/DataFlowEditor_InNode.cxx
index 4dee936cb4674da58023b1bca9babddb5147ce91..ff472c467ddfa0950013dc19b12130c4a6f2c8de 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_InNode.cxx
+++ b/src/GraphEditor/DataFlowEditor_InNode.cxx
@@ -34,6 +34,13 @@ using namespace std;
 GraphEditor::InNode::InNode() {
 }
 
+#if 0
+GraphEditor::InNode::InNode(GraphBase::GOTONode * aGOTONode ) {
+  _ComputingNode = aGOTONode ;
+  _GOTONode = aGOTONode ;
+}
+#endif
+
 //ostream * fdebug = NULL ;
 GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB, 
                             SALOME_NamingService * ptrNamingService ,
@@ -51,8 +58,8 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                              const char * NodeComputer ,
                              const char * NodeComment ,
                              const bool   GeneratedName ,
-                             const int X ,
-                             const int Y ,
+                             const int NodeX ,
+                             const int NodeY ,
                              int * Graph_prof_debug,
                              ofstream * Graph_fdebug) {
   SetDebug( ORB , Graph_prof_debug , Graph_fdebug ) ;
@@ -80,7 +87,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                                    NodeLastModification  ,
                                                    NodeEditorRelease , NodeAuthor ,
                                                    NodeComment , GeneratedName ,
-                                                   X , Y ,
+                                                   NodeX , NodeY ,
                                                    Graph_prof_debug , Graph_fdebug ) ;
     break ;
   }
@@ -94,7 +101,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                                NodeLastModification  ,
                                                NodeEditorRelease , NodeAuthor ,
                                                NodeComputer , NodeComment ,
-                                               GeneratedName , X , Y ,
+                                               GeneratedName , NodeX , NodeY ,
                                                Graph_prof_debug , Graph_fdebug ) ;
 //    cout << "GraphEditor::InNode::InNode SUPERV::FactoryNode : " << NodeName << endl ;
     _ComputingNode = (GraphBase::ComputingNode *) _FactoryNode ;
@@ -108,11 +115,28 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                              NodeFirstCreation , NodeLastModification  ,
                                              NodeEditorRelease , NodeAuthor ,
                                              NodeComment , GeneratedName ,
-                                             X , Y ,
+                                             NodeX , NodeY ,
                                              Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _InLineNode ;
     break ;
   }
+  case SUPERV::MacroNode : {
+    cdebug << "GraphEditor::InNode::InNode SUPERV::MacroNode : " << NodeName << endl ;
+    _GraphMacroNode = new GraphBase::Graph( ORB , ptrNamingService ,
+//                                            aFuncName[0].c_str() , *aPythonFunction[0] ,
+                                            NodeName ,
+                                            akind ,
+//                                            NodeFirstCreation , NodeLastModification  ,
+//                                            NodeEditorRelease , NodeAuthor ,
+//                                            NodeComment , GeneratedName ,
+//                                            NodeX , NodeY ,
+                                            Graph_prof_debug , Graph_fdebug ) ;
+    _ComputingNode = (GraphBase::ComputingNode *) _GraphMacroNode ;
+    _InLineNode = (GraphBase::InLineNode *) _ComputingNode ;
+    _GOTONode = (GraphBase::GOTONode *) _InLineNode ;
+    _GraphMacroNode->Coordinates( NodeX , NodeY ) ;
+    break ;
+  }
   case SUPERV::GOTONode : {
     cdebug << "GraphEditor::InNode::InNode SUPERV::GOTONode : " << NodeName << endl ;
     _GOTONode = new GraphBase::GOTONode( ORB , ptrNamingService ,
@@ -121,7 +145,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                          NodeFirstCreation , NodeLastModification  ,
                                          NodeEditorRelease , NodeAuthor ,
                                          NodeComment , GeneratedName ,
-                                         X , Y ,
+                                         NodeX , NodeY ,
                                          Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _GOTONode ;
     _InLineNode = (GraphBase::InLineNode *) _ComputingNode ;
@@ -137,7 +161,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                          NodeFirstCreation , NodeLastModification  ,
                                          NodeEditorRelease , NodeAuthor ,
                                          NodeComment , GeneratedName ,
-                                         X , Y ,
+                                         NodeX , NodeY ,
                                          Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _LoopNode ;
     _GOTONode = (GraphBase::GOTONode *) _ComputingNode ;
@@ -153,7 +177,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                          NodeFirstCreation , NodeLastModification  ,
                                          NodeEditorRelease , NodeAuthor ,
                                          NodeComment , GeneratedName ,
-                                         X , Y ,
+                                         NodeX , NodeY ,
                                          Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _EndOfLoopNode ;
     _GOTONode = (GraphBase::GOTONode *) _ComputingNode ;
@@ -168,7 +192,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                              NodeFirstCreation , NodeLastModification  ,
                                              NodeEditorRelease , NodeAuthor ,
                                              NodeComment , GeneratedName ,
-                                             X , Y ,
+                                             NodeX , NodeY ,
                                              Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _SwitchNode ;
     _GOTONode = (GraphBase::GOTONode *) _ComputingNode ;
@@ -184,7 +208,7 @@ GraphEditor::InNode::InNode( CORBA::ORB_ptr ORB,
                                              NodeFirstCreation , NodeLastModification  ,
                                              NodeEditorRelease , NodeAuthor ,
                                              NodeComment , GeneratedName ,
-                                             X , Y ,
+                                             NodeX , NodeY ,
                                              Graph_prof_debug , Graph_fdebug ) ;
     _ComputingNode = (GraphBase::ComputingNode *) _EndOfSwitchNode ;
     _GOTONode = (GraphBase::GOTONode *) _ComputingNode ;