Join modifications from BR_Dev_For_4_0 tag V4_1_1.

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

diff --git a/src/GraphBase/DataFlowBase_Base.cxx b/src/GraphBase/DataFlowBase_Base.cxx
index dc0015511cec7e40b1b7fc98b6a08a8b33264ad0..2f750142f08d02e36c073c4002b890c563ccedc1 100644 (file)
--- a/src/GraphBase/DataFlowBase_Base.cxx
+++ b/src/GraphBase/DataFlowBase_Base.cxx
@@ -34,6 +34,7 @@ char *SuperVision_Version = "3.0" ;
 char *NULLSTRING = "" ;
 
 char *FACTORYSERVER = "localhost/FactoryServer" ;
+char *FACTORYSERVERPY = "localhost/FactoryServerPy" ;
 
 GraphBase::Base::Base() {
   _prof_debug = NULL ;
@@ -66,14 +67,14 @@ char * GraphBase::Base::ObjectToString( CORBA::Object_ptr obj ) const {
   return _Orb->object_to_string( obj );
 }
 
-CORBA::Object_ptr GraphBase::Base::StringToObject( char * obj ) const {
+CORBA::Object_ptr GraphBase::Base::StringToObject( const char * obj ) const {
   return _Orb->string_to_object( obj );
 }
 
 ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) {
   switch (anAny.type()->kind()) {
     case CORBA::tk_string: {
-      char * t;
+      const char * t;
       anAny >>= t;
       *_fdebug << " " << t << " (tk_string)" << endl ;
       break;
@@ -97,7 +98,7 @@ ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) {
       break;
     }
     case CORBA::tk_long: {
-      long l;
+      CORBA::Long l;
       anAny >>= l;
       *_fdebug << " " << l << "(tk_long)" << endl ;
       break;
@@ -150,6 +151,7 @@ ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) {
   return *_fdebug ;
 }
 
+/*
 string DataStreamTypeToString( const SALOME_ModuleCatalog::DataStreamType aDataStreamType ) {
   string aIdlType ;
   switch ( aDataStreamType ) {
@@ -210,6 +212,19 @@ SALOME_ModuleCatalog::DataStreamType StringToDataStreamType( const char * aIdlTy
   }
   return aDataStreamType ;
 }
+*/
+int StringToDataStreamType (const char * aIdlType)
+{
+  int aDataStreamType;
+  if      (!strcmp(aIdlType, "Unknown")) aDataStreamType = 0; //SALOME_ModuleCatalog::DATASTREAM_UNKNOWN
+  else if (!strcmp(aIdlType, "int"))     aDataStreamType = 1; //SALOME_ModuleCatalog::DATASTREAM_INTEGER
+  else if (!strcmp(aIdlType, "float"))   aDataStreamType = 2; //SALOME_ModuleCatalog::DATASTREAM_FLOAT
+  else if (!strcmp(aIdlType, "double"))  aDataStreamType = 3; //SALOME_ModuleCatalog::DATASTREAM_DOUBLE
+  else if (!strcmp(aIdlType, "string"))  aDataStreamType = 4; //SALOME_ModuleCatalog::DATASTREAM_STRING
+  else if (!strcmp(aIdlType, "bool"))    aDataStreamType = 5; //SALOME_ModuleCatalog::DATASTREAM_BOOLEAN
+  else                                   aDataStreamType = 0; //SALOME_ModuleCatalog::DATASTREAM_UNKNOWN
+  return aDataStreamType;
+}
 
 string KindOfDataStreamTraceToString( SUPERV::KindOfDataStreamTrace aDataStreamTrace ) {
   string aTrace ;
@@ -250,7 +265,24 @@ string DataStreamDependencyToString( const SALOME_ModuleCatalog::DataStreamDepen
   return aDependency;
 }
 
-string DataStreamToString( const SALOME_ModuleCatalog::DataStreamType aDataStreamType ) {
+string DataStreamToString (const char* aDataStreamType)
+{
+  string aStreamType ;
+  string type (aDataStreamType);
+
+  if      (type == "Unknown") aStreamType = "Unknown";
+  else if (type == "int")     aStreamType = "ENTIER";
+  else if (type == "float")   aStreamType = "REEL";
+  else if (type == "double")  aStreamType = "DOUBLE";
+  else if (type == "string")  aStreamType = "CHAINE";
+  else if (type == "bool")    aStreamType = "LOGIQUE";
+  else                        aStreamType = "?";
+
+  return aStreamType;
+}
+
+/*
+string DataStreamToString( const char* aDataStreamType ) {
   string aStreamType ;
   switch ( aDataStreamType ) {
   case SALOME_ModuleCatalog::DATASTREAM_UNKNOWN : {
@@ -312,4 +344,4 @@ ostream & operator<< (ostream & f ,const SALOME_ModuleCatalog::DataStreamType &
 
   return f;
 }
-
+*/