X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Image.cxx;h=74c278b4c3328957c03c1145e96e9a075b9f4791;hb=05d82ada59110252be57aaa774095a18ebdca455;hp=1cadb4bfcf7c2b73ae7c4f19c04684003dee0194;hpb=ec76f61e788f52834f4abf2de1e4f4589a0b667c;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index 1cadb4bf..74c278b4 100644
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -21,6 +21,7 @@
 #include "HYDROData_Document.h"
 #include "HYDROData_Lambert93.h"
 #include "HYDROData_OperationsFactory.h"
+#include "HYDROData_Tool.h"
 
 #include <TDataStd_RealArray.hxx>
 #include <TDataStd_ByteArray.hxx>
@@ -48,7 +49,6 @@ static const Standard_GUID GUID_SELF_SPLIT("997995aa-5c19-40bf-9a60-ab4b70ad04d8
 static const Standard_GUID GUID_HAS_LOCAL_POINTS("FD8841AA-FC44-42fa-B6A7-0F682CCC6F27");
 static const Standard_GUID GUID_HAS_GLOBAL_POINTS("330D0E81-742D-4ea3-92D4-484877CFA7C1");
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Image, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_Entity)
 
 HYDROData_Image::HYDROData_Image()
@@ -70,8 +70,9 @@ QStringList HYDROData_Image::DumpToPython( const QString&       thePyScriptPath,
   if ( !aFilePath.isEmpty() )
   {
     aResList << QString( "" );
-    aResList << QString( "%1.LoadImage( \"%2\" );" )
+    aResList << QString( "if not(%1.LoadImage( \"%2\" )):" )
                 .arg( anImageName ).arg( aFilePath );
+    aResList << QString( "  raise ValueError('problem while loading image')" );
     aResList << QString( "" );
 
     // Dump transformation points for image
@@ -90,12 +91,12 @@ QStringList HYDROData_Image::DumpToPython( const QString&       thePyScriptPath,
       if ( !anIsByTwoPoints )
       {
         aResList.last().append( "," );
-        aResList << QString( aGap             +  "QPoint( %1, %2 ) );" )
+        aResList << QString( aGap             +  "QPoint( %1, %2 ) )" )
                     .arg( aLocalPointC.x() ).arg( aLocalPointC.y() );
       }
       else
       {
-        aResList.last().append( " );" );
+        aResList.last().append( " )" );
       }
       aResList << QString( "" );
     }
@@ -109,18 +110,18 @@ QStringList HYDROData_Image::DumpToPython( const QString&       thePyScriptPath,
       aResList << QString( "%1.SetGlobalPoints( %2," )
                   .arg( anImageName ).arg( aTransformationMode );
       aResList << QString( aGap             +  "QPointF( %1, %2 )," )
-                  .arg( aTrsfPointA.x() ).arg( aTrsfPointA.y() );
+                  .arg( aTrsfPointA.x(), 0, 'f', 3  ).arg( aTrsfPointA.y(), 0, 'f', 3  );
       aResList << QString( aGap             +  "QPointF( %1, %2 )" )
-                  .arg( aTrsfPointB.x() ).arg( aTrsfPointB.y() );
+                  .arg( aTrsfPointB.x(), 0, 'f', 3  ).arg( aTrsfPointB.y(), 0, 'f', 3  );
       if ( !anIsByTwoPoints )
       {
         aResList.last().append( "," );
-        aResList << QString( aGap             +  "QPointF( %1, %2 ) );" )
-                    .arg( aTrsfPointC.x() ).arg( aTrsfPointC.y() );
+        aResList << QString( aGap             +  "QPointF( %1, %2 ) )" )
+                    .arg( aTrsfPointC.x(), 0, 'f', 3  ).arg( aTrsfPointC.y(), 0, 'f', 3  );
       }
       else
       {
-        aResList.last().append( " );" );
+        aResList.last().append( " )" );
       }
 
       if ( aTransformationMode == ReferenceImage )
@@ -139,7 +140,7 @@ QStringList HYDROData_Image::DumpToPython( const QString&       thePyScriptPath,
     {
       aResList << QString( "" );
 
-      aResList << QString( "%1.SetOperatorName( \"%2\" );" )
+      aResList << QString( "%1.SetOperatorName( \"%2\" )" )
                   .arg( anImageName ).arg( anOperatorName );
 
       ImageComposer_Operator* anImageOp = 
@@ -155,7 +156,7 @@ QStringList HYDROData_Image::DumpToPython( const QString&       thePyScriptPath,
           aResList << anOpArgs;
 
           aResList << QString( "" );
-          aResList << QString( "%1.SetArgs( %2 );" )
+          aResList << QString( "%1.SetArgs( %2 )" )
                       .arg( anImageName ).arg( anOpArgsArrayName );
         }
       }
@@ -175,7 +176,7 @@ QStringList HYDROData_Image::DumpToPython( const QString&       thePyScriptPath,
   }
 
   aResList << QString( "" );
-  aResList << QString( "%1.Update();" ).arg( anImageName );
+  aResList << QString( "%1.Update()" ).arg( anImageName );
 
   return aResList;
 }
@@ -670,8 +671,8 @@ bool HYDROData_Image::SetGlobalPointsFromFile( const QString& theFileName )
 
     // Check the result
     if ( !isDoubleOk ||
-         isnan( aDoubleValue ) ||
-         isinf( aDoubleValue ) ) {
+         HYDROData_Tool::IsNan( aDoubleValue ) ||
+         HYDROData_Tool::IsInf( aDoubleValue ) ) {
       continue;
     }