Point 2.3 of "SUPERVISOR: Current state - bugs/improvements" :

[modules/superv.git] / src / GraphBase / DataFlowBase_Port.cxx

diff --git a/src/GraphBase/DataFlowBase_Port.cxx b/src/GraphBase/DataFlowBase_Port.cxx
index 2e773b6e49446eae96628c3780ba330162f10cb5..7a6e685570776fbee2853365dcdccb638eaebec5 100644 (file)
--- a/src/GraphBase/DataFlowBase_Port.cxx
+++ b/src/GraphBase/DataFlowBase_Port.cxx
@@ -39,7 +39,7 @@ bool GraphBase::Port::AddCoord( const int index ,
     return false ;
   }
   else {
-    if ( index <= 0 || index > _X.size()+1 )
+    if ( index <= 0 || index > (int ) _X.size()+1 )
       return false ;
     _X.resize( _X.size()+1 ) ;
     _Y.resize( _Y.size()+1 ) ;
@@ -66,7 +66,7 @@ bool GraphBase::Port::ChangeCoord( const int index ,
     return false ;
   }
   else {
-    if ( index <= 0 || index > _X.size() )
+    if ( index <= 0 || index > (int ) _X.size() )
       return false ;
     _X[ index - 1 ] = x ;
     _Y[ index - 1 ] = y ;
@@ -85,10 +85,10 @@ bool GraphBase::Port::RemoveCoord( const int index ) {
     return false ;
   }
   else {
-    if ( index <= 0 || index > _X.size() )
+    if ( index <= 0 || index > (int ) _X.size() )
       return false ;
     int i ;
-    for ( i = index - 1 ; i < _X.size() - 1 ; i++ ) {
+    for ( i = index - 1 ; i < (int ) _X.size() - 1 ; i++ ) {
       _X[ i ] = _X[ i+1 ] ;
       _Y[ i ] = _Y[ i+1 ] ;
     }
@@ -126,7 +126,7 @@ bool GraphBase::Port::GetCoord( int *x , int *y ) const {
     return false ;
   }
   else {
-    for ( i = 0 ; i < _X.size() ; i++ ) {
+    for ( i = 0 ; i < (int ) _X.size() ; i++ ) {
       x[ i ] = _X[ i ] ;
       y[ i ] = _Y[ i ] ;
     }
@@ -139,7 +139,7 @@ const GraphBase::ListOfCoords * GraphBase::Port::Coords() const {
   int i ;
   if ( !IsEndSwitch() ) {
     _list_Coords->resize( _X.size() );
-    for ( i = 0 ; i < _X.size() ; i++ ) {
+    for ( i = 0 ; i < (int ) _X.size() ; i++ ) {
       (*_list_Coords)[ i ].theX = _X[ i ] ;
       (*_list_Coords)[ i ].theY = _Y[ i ] ;
     }
@@ -152,7 +152,7 @@ bool GraphBase::Port::GetCoord( const int index , long &x , long &y ) const {
     return false ;
   }
   else {
-    if ( index <= 0 || index > _X.size() )
+    if ( index <= 0 || index > (int ) _X.size() )
       return false ;
     x = _X[ index - 1 ] ;
     y = _Y[ index - 1 ] ;
@@ -168,24 +168,33 @@ bool GraphBase::Port::GetCoord( const int index , long &x , long &y ) const {
 
 ostream & operator<< (ostream & f ,const SUPERV::KindOfPort & s ) {
   switch (s) {
+  case SUPERV::UndefinedParameter :
+    f << "UndefinedParameter";
+    break;
   case SUPERV::ServiceParameter :
     f << "ServiceParameter";
     break;
   case SUPERV::GateParameter :
     f << "GateParameter";
     break;
-  case SUPERV::LoopParameter :
-    f << "LoopParameter";
-    break;
   case SUPERV::InLineParameter :
     f << "InLineParameter";
     break;
+  case SUPERV::LoopParameter :
+    f << "LoopParameter";
+    break;
   case SUPERV::SwitchParameter :
     f << "SwitchParameter";
     break;
   case SUPERV::EndSwitchParameter :
     f << "EndSwitchParameter";
     break;
+  case SUPERV::GOTOParameter :
+    f << "GOTOParameter";
+    break;
+  case SUPERV::DataStreamParameter :
+    f << "DataStreamParameter";
+    break;
   default :
     f << "UnknownKindOfPort";
     break;
@@ -194,3 +203,46 @@ ostream & operator<< (ostream & f ,const SUPERV::KindOfPort & s ) {
   return f;
 }
 
+ostream & operator<< (ostream & f ,const SALOME_ModuleCatalog::DataStreamDependency & s ) {
+  switch (s) {
+  case SALOME_ModuleCatalog::DATASTREAM_UNDEFINED :
+    f << "DATASTREAM_UNDEFINED";
+    break;
+  case SALOME_ModuleCatalog::DATASTREAM_TEMPORAL :
+    f << "DATASTREAM_TEMPORAL";
+    break;
+  case SALOME_ModuleCatalog::DATASTREAM_ITERATIVE :
+    f << "DATASTREAM_ITERATIVE";
+    break;
+  default :
+    f << "DATASTREAM_?";
+    break;
+  }
+
+  return f;
+}
+
+ostream & operator<< (ostream & f ,const StatusOfPort & s ) {
+  switch (s) {
+  case NotConnected :
+    f << "NotConnected";
+    break;
+  case PortConnected :
+    f << "PortConnected";
+    break;
+//  case PortAndDataConnected :
+//    f << "PortAndDataConnected";
+//    break;
+  case DataConnected :
+    f << "DataConnected";
+    break;
+  case ExternConnected :
+    f << "ExternConnected";
+    break;
+  default :
+    f << "UnknownStatusOfPort";
+    break;
+  }
+
+  return f;
+}