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

[modules/superv.git] / src / GraphEditor / DataFlowEditor_DataFlow.lxx

diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.lxx b/src/GraphEditor/DataFlowEditor_DataFlow.lxx
index 1f82bf0d90447f779b7286cee9f8498314984d74..93bfb43c4f4a7f65b8acf7e7f3ed6c0f32705e32 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_DataFlow.lxx
+++ b/src/GraphEditor/DataFlowEditor_DataFlow.lxx
@@ -429,41 +429,17 @@ inline bool GraphEditor::DataFlow::IsExecutable() {
 }
 
 inline void GraphEditor::DataFlow::Executing() {
-  cdebug << "Executing _Executing = true " << endl ;
+  cdebug << "Editor::DataFlow::Executing() : set _Executing = true " << endl ;
   _Executing = true ;
 }
 
 inline bool GraphEditor::DataFlow::IsExecuting() {
-#if 0
-  //cout << " +++++> Old!" << endl;
-  if ( _DataFlowExecutor ) {
-    if ( _DataFlowExecutor->IsDone() ) {
-      _Executing = false ;
-    }
-    else {
-    _Executing = true ;
-    }
-  }
-  else {
-    _Executing = false ;
-  }
-#endif
-//  cdebug << "GraphEditor::DataFlow::IsExecuting _Executing " << _Executing << " DataFlowExecutor " << _DataFlowExecutor ;
-  if ( _DataFlowExecutor ) {
-    cdebug << " IsDone " << _DataFlowExecutor->IsDone() << " State " << _DataFlowExecutor->State() ;
-  }
-  cdebug << endl ;
-//  cout << "+++++++++++++> _Executing = " << _Executing << "  _DataFlowExecutor = " << _DataFlowExecutor << endl;
-  if ( _Executing && _DataFlowExecutor ) {
-    if ( _DataFlowExecutor->IsDone() ) {
-      _Executing = false ;
-    }
-  }
   return _Executing ;
 }
 
+
 inline void GraphEditor::DataFlow::Editing() {
-  cdebug << "Editing _Executing = false " << endl ;
+  cdebug << "Editor::DataFlow::Editing() : set _Executing = false " << endl ;
   _Executing = false ;
 }
 
@@ -479,6 +455,12 @@ inline bool GraphEditor::DataFlow::EditedAfterExecution() {
   return _EditedAfterExecution ;
 }
 
+inline bool GraphEditor::DataFlow::UnValid() {
+  Editing() ;
+  EditedAfterExecution( true ) ;
+  return GraphEditor::OutNode::UnValid() ;
+}
+
 inline bool GraphEditor::DataFlow::IsReadOnly() {
   return _ReadOnly ;
 }