X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGraphEditor%2FDataFlowEditor_DataFlow.lxx;h=d73dd005f687da36736d14dd93a7487f7cce6cdc;hb=d551616cdcc3796f6ee599217086a90c14850af7;hp=e048755c5e0921662043f421db53a66067494586;hpb=2ec1d902f3b25df08e5ec66e0be7fd5ba62eb43d;p=modules%2Fsuperv.git

diff --git a/src/GraphEditor/DataFlowEditor_DataFlow.lxx b/src/GraphEditor/DataFlowEditor_DataFlow.lxx
index e048755..d73dd00 100644
--- a/src/GraphEditor/DataFlowEditor_DataFlow.lxx
+++ b/src/GraphEditor/DataFlowEditor_DataFlow.lxx
@@ -33,6 +33,8 @@ inline void GraphEditor::DataFlow::ReadOnly() {
   _ReadOnly = true ;
 }
 
+//JR 07.07.2005 : old code from the first prototype
+#if 0
 inline char * GraphEditor::DataFlow::DataFlowInfo() {
   ostringstream s;
   IsValid() ;
@@ -56,6 +58,7 @@ inline char * GraphEditor::DataFlow::NodeInfo( const char * aNodeName ) {
     s << aNodeName << " not found" << ends ;
   return CORBA::string_dup( s.str().c_str() );
 }
+#endif
 
 inline bool GraphEditor::DataFlow::LoadDataFlow( const GraphBase::SGraph * aDataFlow ) {
   if ( _ReadOnly )
@@ -424,8 +427,10 @@ inline const CORBA::Any GraphEditor::DataFlow::GetOutData(
 
 //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::IsValid(bool kLoopSwitch ) {
+inline bool GraphEditor::DataFlow::IsValid() {
+//  return GraphEditor::OutNode::IsValid( kLoopSwitch ) ;
+  return GraphEditor::OutNode::IsValid() ;
 }
 
 inline bool GraphEditor::DataFlow::IsExecutable() {
@@ -470,35 +475,40 @@ inline bool GraphEditor::DataFlow::IsReadOnly() {
 }
 
 inline long GraphEditor::DataFlow::LevelMax() {
-  if ( !IsValid() ) {
+//  if ( !IsValid( false ) ) {
+  if ( !IsExecutable() ) {
     return 0 ;
   }
   return Graph()->LevelMax() ;
 }
 
 inline SUPERV::ListOfStrings * GraphEditor::DataFlow::LevelNodes(long aLevel ) {
-  if ( !IsValid( false ) ) {
+//  if ( !IsValid( false ) ) {
+  if ( !IsExecutable() ) {
     return ((SUPERV::ListOfStrings * ) NULL ) ;
   }
   return Graph()->LevelNodes( aLevel ) ;
 }
 
 inline long GraphEditor::DataFlow::ThreadsMax() {
-  if ( !IsValid() ) {
+//  if ( !IsValid() ) {
+  if ( !IsExecutable() ) {
     return 0 ;
   }
   return Graph()->ThreadsMax() ;
 }
 
 inline long GraphEditor::DataFlow::SubGraphsNumber() {
-  if ( !IsValid() ) {
+//  if ( !IsValid() ) {
+  if ( !IsExecutable() ) {
     return 0 ;
   }
   return Graph()->SubGraphsNumber() ;
 }
 
 inline long GraphEditor::DataFlow::SubStreamGraphsNumber() {
-  if ( !IsValid() ) {
+//  if ( !IsValid() ) {
+  if ( !IsExecutable() ) {
     return 0 ;
   }
   return StreamGraph()->SubStreamGraphsNumber() ;