_ReadOnly = true ;
}
+//JR 07.07.2005 : old code from the first prototype
+#if 0
inline char * GraphEditor::DataFlow::DataFlowInfo() {
ostringstream s;
IsValid() ;
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 )
const int nXY ,
const int* X ,
const int* Y ) {
- _EditedAfterExecution = true ;
+ //_EditedAfterExecution = true ; // mkr : fix for bug IPAL9818
return GraphEditor::OutNode::AddLinkCoord( FromNodeName ,
FromServiceParameterName ,
ToNodeName ,
const int index ,
const int X ,
const int Y ) {
- _EditedAfterExecution = true ;
+ //_EditedAfterExecution = true ; // mkr : fix for bug IPAL9818
return GraphEditor::OutNode::AddLinkCoord( FromNodeName ,
FromServiceParameterName ,
ToNodeName ,
const int index ,
const int X ,
const int Y ) {
- _EditedAfterExecution = true ;
+ //_EditedAfterExecution = true ; // mkr : fix for bug IPAL9818
return GraphEditor::OutNode::ChangeLinkCoord( FromNodeName ,
FromServiceParameterName ,
ToNodeName ,
const char* ToNodeName ,
const char* ToServiceParameterName ,
const int index ) {
- _EditedAfterExecution = true ;
+ //_EditedAfterExecution = true ; // mkr : fix for bug IPAL9818
return GraphEditor::OutNode::RemoveLinkCoord( FromNodeName ,
FromServiceParameterName ,
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 ) ;
}
+//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 ) {
inline bool GraphEditor::DataFlow::IsValid() {
+// return GraphEditor::OutNode::IsValid( kLoopSwitch ) ;
return GraphEditor::OutNode::IsValid() ;
}
}
inline void GraphEditor::DataFlow::Executing() {
- cdebug << "Executing() : set _Executing = true " << endl ;
+ cdebug << "Editor::DataFlow::Executing() : set _Executing = true " << endl ;
_Executing = true ;
}
return _Executing ;
}
+
inline void GraphEditor::DataFlow::Editing() {
- cdebug << "Editing() : set _Executing = false " << endl ;
+ cdebug << "Editor::DataFlow::Editing() : set _Executing = false " << endl ;
_Executing = false ;
}
}
inline long GraphEditor::DataFlow::LevelMax() {
- if ( !IsValid() ) {
+// if ( !IsValid( false ) ) {
+// if ( !IsExecutable() ) {
+ // mkr : IPAL9974 -->
+ int SubStreamGraphsNumber = 0 ;
+ if ( !IsValid() || !Graph()->Sort( SubStreamGraphsNumber ) ) {
+ // mkr : IPAL9974 <--
return 0 ;
}
return Graph()->LevelMax() ;
}
inline SUPERV::ListOfStrings * GraphEditor::DataFlow::LevelNodes(long aLevel ) {
- if ( !IsValid() ) {
+// if ( !IsValid( false ) ) {
+// if ( !IsExecutable() ) {
+ if ( !IsValid() ) { // mkr : IPAL9974
return ((SUPERV::ListOfStrings * ) NULL ) ;
}
return Graph()->LevelNodes( aLevel ) ;
}
inline long GraphEditor::DataFlow::ThreadsMax() {
- if ( !IsValid() ) {
+// if ( !IsValid() ) {
+// if ( !IsExecutable() ) {
+ // mkr : IPAL9974 -->
+ int SubStreamGraphsNumber = 0 ;
+ if ( !IsValid() || !Graph()->Sort( SubStreamGraphsNumber ) ) {
+ // mkr : IPAL9974 <--
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() ;