Memory Leaks

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

diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.lxx b/src/GraphEditor/DataFlowEditor_DataFlow.lxx
index b5519aa8066ecb0b21db9fd08bc241514ddd6007..d69cc14cb8b51132539e79ba63fa16142586bcc7 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_DataFlow.lxx
+++ b/src/GraphEditor/DataFlowEditor_DataFlow.lxx
@@ -407,21 +407,25 @@ inline bool GraphEditor::DataFlow::AddInputData( const char* ToNodeName ,
   return Graph()->AddInputData( ToNodeName , ToParameterName , aValue ) ; 
 } ;
 
-inline const CORBA::Any *GraphEditor::DataFlow::GetInData(
+//JR 30.03.2005inline const CORBA::Any *GraphEditor::DataFlow::GetInData(
+inline const CORBA::Any GraphEditor::DataFlow::GetInData(
                                    const char * ToNodeName ,
                                    const char * ToParameterName ) {
   return GraphEditor::OutNode::GetInData( ToNodeName ,
                                           ToParameterName ) ;
 }
-inline const CORBA::Any *GraphEditor::DataFlow::GetOutData(
+//JR 30.03.2005inline const CORBA::Any *GraphEditor::DataFlow::GetOutData(
+inline const CORBA::Any GraphEditor::DataFlow::GetOutData(
                                    const char * FromNodeName ,
                                    const char * FromParameterName ) {
   return GraphEditor::OutNode::GetOutData( FromNodeName ,
                                            FromParameterName ) ;
 }
 
-inline bool GraphEditor::DataFlow::IsValid() {
-  return GraphEditor::OutNode::IsValid() ;
+//JR Optional parameter kLoopSwitch (default = true) :
+//In some cases we do not need to check the validity of loops and switchs
+inline bool GraphEditor::DataFlow::IsValid(bool kLoopSwitch ) {
+  return GraphEditor::OutNode::IsValid( kLoopSwitch ) ;
 }
 
 inline bool GraphEditor::DataFlow::IsExecutable() {
@@ -429,7 +433,7 @@ inline bool GraphEditor::DataFlow::IsExecutable() {
 }
 
 inline void GraphEditor::DataFlow::Executing() {
-  cdebug << "Executing() : set _Executing = true " << endl ;
+  cdebug << "Editor::DataFlow::Executing() : set _Executing = true " << endl ;
   _Executing = true ;
 }
 
@@ -437,8 +441,9 @@ inline bool GraphEditor::DataFlow::IsExecuting() {
   return _Executing ;
 }
 
+
 inline void GraphEditor::DataFlow::Editing() {
-  cdebug << "Editing() : set _Executing = false " << endl ;
+  cdebug << "Editor::DataFlow::Editing() : set _Executing = false " << endl ;
   _Executing = false ;
 }
 
@@ -465,14 +470,14 @@ inline bool GraphEditor::DataFlow::IsReadOnly() {
 }
 
 inline long GraphEditor::DataFlow::LevelMax() {
-  if ( !IsValid() ) {
+  if ( !IsValid( false ) ) {
     return 0 ;
   }
   return Graph()->LevelMax() ;
 }
 
 inline SUPERV::ListOfStrings * GraphEditor::DataFlow::LevelNodes(long aLevel ) {
-  if ( !IsValid() ) {
+  if ( !IsValid( false ) ) {
     return ((SUPERV::ListOfStrings * ) NULL ) ;
   }
   return Graph()->LevelNodes( aLevel ) ;