merge master

[modules/hydro.git] / src / HYDROData / HYDROData_Image.cxx

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index e1787adae7950d3dc951c5ca1a327f5a8a681548..287541b1c3131095202b12021f50b2c7b3c0085b 100644 (file)
--- 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>
@@ -30,15 +31,21 @@
 #include <TDataStd_UAttribute.hxx>
 #include <TDataStd_AsciiString.hxx>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #include <ImageComposer_Operator.h>
 #include <ImageComposer_MetaTypes.h>
 
 #include <QStringList>
 #include <QFile>
 
-#include <boost/math/special_functions/fpclassify.hpp>
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
 
-static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8");
+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");
 
@@ -54,7 +61,8 @@ HYDROData_Image::~HYDROData_Image()
 {
 }
 
-QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Image::DumpToPython( const QString&       thePyScriptPath,
+                                           MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
   QString anImageName = GetObjPyName();
@@ -119,7 +127,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
       if ( aTransformationMode == ReferenceImage )
       {
         Handle(HYDROData_Image) aRefImg = GetTrsfReferenceImage();
-        setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" );
+        setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" );
       }
     }
   }
@@ -162,7 +170,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
       for ( int i = 0; i < aNbReferences; ++i )
       {
         Handle(HYDROData_Image) aRefImg = Handle(HYDROData_Image)::DownCast( Reference( i ) );
-        setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "AppendReference" );
+        setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefImg, "AppendReference" );
       }
     }
   }
@@ -499,7 +507,7 @@ void HYDROData_Image::RemoveAllReferences()
     ClearReferences();
     SetOperatorName( "" );
     SetArgs( "" );
-    SetIsSelfSplitted( false );
+    SetIsSelfSplit( false );
   }
 
   bool anIsByTwoPoints = IsByTwoPoints();
@@ -663,8 +671,8 @@ bool HYDROData_Image::SetGlobalPointsFromFile( const QString& theFileName )
 
     // Check the result
     if ( !isDoubleOk ||
-         boost::math::isnan( aDoubleValue ) ||
-         boost::math::isinf( aDoubleValue ) ) {
+         HYDROData_Tool::IsNan( aDoubleValue ) ||
+         HYDROData_Tool::IsInf( aDoubleValue ) ) {
       continue;
     }
 
@@ -866,19 +874,19 @@ QByteArray HYDROData_Image::Args() const
   return QByteArray(aData, aLen);
 }
 
-void HYDROData_Image::SetIsSelfSplitted(bool theFlag)
+void HYDROData_Image::SetIsSelfSplit(bool theFlag)
 {
   if (theFlag) {
-    TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLITTED);
+    TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLIT);
   } else {
-    myLab.ForgetAttribute(GUID_SELF_SPLITTED);
+    myLab.ForgetAttribute(GUID_SELF_SPLIT);
   }
   Changed( Geom_2d );
 }
 
-bool HYDROData_Image::IsSelfSplitted() const
+bool HYDROData_Image::IsSelfSplit() const
 {
-  return myLab.IsAttribute(GUID_SELF_SPLITTED);
+  return myLab.IsAttribute(GUID_SELF_SPLIT);
 }
 
 QPointF HYDROData_Image::generateThirdPoint( const QPointF& thePointA,