X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGraphBase%2FDataFlowBase_XmlHandler.cxx;h=2f22457f7e812892448165d5e962471775f17bd3;hb=8bb6ea38a8357d6ae5c45c4edbed03fd540f7866;hp=7578329fa25b547ee96ac882ecf538ebe6346756;hpb=b7b531f894fd0a967071ce2b05e0ced7b4743f3b;p=modules%2Fsuperv.git

diff --git a/src/GraphBase/DataFlowBase_XmlHandler.cxx b/src/GraphBase/DataFlowBase_XmlHandler.cxx
index 7578329..2f22457 100644
--- a/src/GraphBase/DataFlowBase_XmlHandler.cxx
+++ b/src/GraphBase/DataFlowBase_XmlHandler.cxx
@@ -357,7 +357,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
           else if ( qName == "streamgraph-deltatime" ) {
             if ( fieldvalue[depth] == NULLSTRING )
               return returnfalse( this , "depth3-3" , qName ) ;
-            sscanf( fieldvalue[depth].c_str() ,"%lf" , (int * ) &aNode.theDeltaTime ) ;
+            sscanf( fieldvalue[depth].c_str() ,"%lf" , (double * ) &aNode.theDeltaTime ) ;
             fieldvalue[depth] = NULLSTRING ;
             step[depth]++ ;
             step[4] = 0 ;
@@ -709,7 +709,8 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             aLink.aLinkValue = CORBA::Any() ;
             switch ( Kind ) {
             case CORBA::tk_string: {
-              aLink.aLinkValue <<= (char *) NULL ;
+//Mandrake 10.1/Salome 3              aLink.aLinkValue <<= (char *) NULL ;
+              aLink.aLinkValue <<= (char *) "" ;
               char * t;
               aLink.aLinkValue >>= t;
 #if TRACE
@@ -759,8 +760,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             if ( fieldvalue[depth] == NULLSTRING )
               return returnfalse( this , "depth4-4" , qName ) ;
             if ( !strcmp( fieldvalue[depth].c_str() , "?" ) ) {
-//              aLink.aLinkValue.Value = fieldvalue[depth].c_str() ;
-              aLink.aLinkValue = CORBA::Any() ; // ???
+              aLink.aLinkValue <<= "" ;
 	    }
             else {
               switch ( aLink.aLinkValue.type()->kind() ) {
@@ -971,7 +971,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             fieldvalue[depth] = NULLSTRING ;
 #if TRACE
   //cout << "InDataStreamParameter.inParameter-dependency " << anInDataStreamParameter.theDataStreamParameter.Parameterdependency << " step[" << depth << "]"
-                 << step[depth] << endl ;
+  //               << step[depth] << endl ;
 #endif
 //            step[depth]++ ;
 //            step[depth] = 4 ;
@@ -984,7 +984,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             fieldvalue[depth] = NULLSTRING ;
 #if TRACE
   //cout << "InDataStreamParameter.inParameter-schema " << anInDataStreamParameter.theKindOfSchema << " step[" << depth << "]"
-                 << step[depth] << endl ;
+  //               << step[depth] << endl ;
 #endif
 //            step[depth]++ ;
 //            step[depth] = 4 ;
@@ -997,7 +997,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             fieldvalue[depth] = NULLSTRING ;
 #if TRACE
   //cout << "InDataStreamParameter.inParameter-interpolation " << anInDataStreamParameter.theKindOfInterpolation << " step[" << depth << "]"
-                 << step[depth] << endl ;
+  //               << step[depth] << endl ;
 #endif
 //            step[depth]++ ;
 //            step[depth] = 4 ;
@@ -1012,7 +1012,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             step[depth] = 4 ;
 #if TRACE
   //cout << "InDataStreamParameter.inParameter-extrapolation " << anInDataStreamParameter.theKindOfExtrapolation << " step[" << depth << "]"
-                 << step[depth] << endl ;
+  //               << step[depth] << endl ;
 #endif
             break ;
           }
@@ -1029,7 +1029,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             step[depth] = 7 ;
 #if TRACE
   //cout << "OutDataStreamParameter.outParameter-type " << anOutDataStreamParameter.theDataStreamParameter.Parametertype << " step[" << depth << "]"
-                 << step[depth] << endl ;
+  //               << step[depth] << endl ;
 #endif
           }
           else
@@ -1048,7 +1048,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             fieldvalue[depth] = NULLSTRING ;
 #if TRACE
   //cout << "OutDataStreamParameter.outParameter-name " << anOutDataStreamParameter.theDataStreamParameter.Parametername << " step[" << depth << "]"
-                 << step[depth] << endl ;
+  //               << step[depth] << endl ;
 #endif
 //            step[depth]++ ;
 //            step[depth] = 6 ;
@@ -1060,7 +1060,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             fieldvalue[depth] = NULLSTRING ;
 #if TRACE
   //cout << "OutDataStreamParameter.outParameter-dependency " << anOutDataStreamParameter.theDataStreamParameter.Parameterdependency << " step[" << depth << "]"
-                 << step[depth] << endl ;
+  //               << step[depth] << endl ;
 #endif
 //            step[depth]++ ;
 //            step[depth] = 6 ;
@@ -1074,7 +1074,7 @@ bool GraphBase::XmlHandler::endElement( const QString&,
             step[depth] = 6 ;
 #if TRACE
   //cout << "OutDataStreamParameter.outParameter-values " << anOutDataStreamParameter.theNumberOfValues << " step[" << depth << "]"
-                 << step[depth] << endl ;
+  //               << step[depth] << endl ;
 #endif
           }
           else