vector<ComputingNode *> _QueueNodes ;
bool _ParallelExecutionNodes ;
-// For generated NodeNames with ServiceName : number of Nodes using
-// the same ServiceName. It is not the same Service if it belongs to
+// For StreamGraphs. It is not the same Service if it belongs to
// a different Interface and/or a different Component ...
map< string , GraphBase::Service * > _MapOfServiceNames ;
+// For automactic rename of nodes if unique names in graphs
+ map< string , int > _MapOfServiceInstanceNumber ;
+
// Total number of SubGraphs
int _SubGraphsNumber ;
// _SubGraphs[ SubGraphNumero ] [ NodeNumero ]
void DelGraphNodeIndex( const char *name ) {
_MapOfGraphNodes.erase( name ) ; } ;
+ int GetGraphNodeSize() const {
+ return _MapOfGraphNodes.size() ; }
const GraphBase::ComputingNode * GetGraphNode( const int index ) const {
const ComputingNode * aNode = GetChangeGraphNode( index ) ;
return aNode ; } ;
if ( aState == SUPERV::DoneState )
aRet = true ;
return aRet ; } ;
- const CORBA::Any * PortInData( const char* ToNodeName ,
- const char* ToServiceParameterName ) ;
- const CORBA::Any * PortOutData( const char* FromNodeName ,
- const char* FromServiceParameterName ) ;
+//JR 30.03.2005 const CORBA::Any * PortInData( const char* ToNodeName ,
+ const CORBA::Any PortInData( const char* ToNodeName ,
+ const char* ToServiceParameterName ) ;
+//JR 30.03.2005 const CORBA::Any * PortOutData( const char* FromNodeName ,
+ const CORBA::Any PortOutData( const char* FromNodeName ,
+ const char* FromServiceParameterName ) ;
bool LoadXml( CORBA::ORB_ptr Orb , const char* anXmlFile ,
GraphBase::ListOfSGraphs & aListOfDataFlows ) ;
bool ChangeInputData( const char* ToNodeName ,
const char* ToParameterName ,
const CORBA::Any aValue ) ;
- bool AddInputData( const char* ToNodeName ,
- const char* ToParameterName ,
- const CORBA::Any ** aValue ) ;
+// bool AddInputData( const char* ToNodeName ,
+// const char* ToParameterName ,
+// const CORBA::Any ** aValue ) ;
bool AddOutputData( const char* FromNodeName ,
const char* FromParameterName ,
bool Sort( int & SubStreamGraphsNumber ) ;
bool ValidLoops() const ;
+ bool ValidSwitchs() const ;
bool ComputingNodes() const ;
bool LinkLoopNodes(bool & NewLink ) ;
bool DataServerNodes() const ;
map< string , GraphBase::Service * > MapOfServiceNames() ;
GraphBase::Service * GetServiceOfMap( char * name ) ;
bool SetServiceOfMap( GraphBase::Service * aService ) ;
- int GetServiceNameNumber( SALOME_ModuleCatalog::Service aService ) ;
+ int GetNewServiceInstanceNumber( char * aServiceName ) ;
SUPERV::ListOfStrings * LevelNodes(long aLevel ) ;
long ThreadsMax() {