From 8793ad9354197cbcecd6cc552e614439471aa928 Mon Sep 17 00:00:00 2001 From: mkr Date: Wed, 28 Sep 2005 12:26:21 +0000 Subject: [PATCH] A part of the code of Valid() method is now in Executable() method (according to JR modification from 07.07.2005): if in Executable() method we found that dataflow is not valid, therefore it is not executable in that case and _Executable = false. --- src/GraphEditor/DataFlowEditor_OutNode.cxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/GraphEditor/DataFlowEditor_OutNode.cxx b/src/GraphEditor/DataFlowEditor_OutNode.cxx index 172dc21..5221b4f 100644 --- a/src/GraphEditor/DataFlowEditor_OutNode.cxx +++ b/src/GraphEditor/DataFlowEditor_OutNode.cxx @@ -1046,14 +1046,16 @@ bool GraphEditor::OutNode::Executable() { } //JR 07.07.2005 PAL9342 : that code is now in Executable() method instead of Valid() method + bool IsValid = true; int SubStreamGraphsNumber = 0 ; if ( !Graph()->Sort( SubStreamGraphsNumber ) ) { cdebug << "Editor::OutNode::Executable This DataFlow is not valid(Sort)." << endl ; RetVal = false ; + //mkr : 28.09.2005 : if dataflow is not valid => it is not executable + IsValid = false ; } - if ( Graph()->IsDataStreamNode() ) { + if ( Graph()->IsDataStreamNode() ) StreamGraph()->SubStreamGraphsNumber( SubStreamGraphsNumber ) ; - } Graph()->InLineServices() ; @@ -1061,10 +1063,14 @@ bool GraphEditor::OutNode::Executable() { if ( !Graph()->ValidLoops() ) { cdebug << "Editor::OutNode::Executable This DataFlow have not valid Loops(ValidLoops)." << endl ; RetVal = false ; + //mkr : 28.09.2005 : if dataflow is not valid => it is not executable + IsValid = false ; } if ( !Graph()->ValidSwitchs() ) { cdebug << "Editor::OutNode::Executable This DataFlow have not valid Switchs(ValidSwitchs)." << endl ; RetVal = false ; + //mkr : 28.09.2005 : if dataflow is not valid => it is not executable + IsValid = false ; } // } @@ -1088,6 +1094,9 @@ bool GraphEditor::OutNode::Executable() { RetVal = false ; } + //mkr : 28.09.2005 : if dataflow is not valid => it is not executable + if ( !IsValid ) _Executable = false ; + cdebug_out << "GraphEditor::OutNode::Executable _Executable " << _Executable << " RetVal " << RetVal << endl; return RetVal ; -- 2.39.2