ImportFromFile()

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

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 217c49c..1faa296
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -23,8 +23,6 @@
 #include "HYDROData_Tool.h"
 #include "HYDROData_PolylineXY.h"
 
-#include <boost/math/special_functions/fpclassify.hpp>
-
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakePolygon.hxx>
@@ -64,7 +62,8 @@ HYDROData_Profile::~HYDROData_Profile()
 {
 }
 
-QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Profile::DumpToPython( const QString&       thePyScriptPath,
+                                             MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
   QString aProfileName = GetObjPyName();
@@ -72,7 +71,7 @@ QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObje
   //TCollection_AsciiString aFilePath = GetFilePath();
   //if ( !aFilePath.IsEmpty() ) 
   //{
-  //  aResList << QString( "%1.ImportFromFile( \"%2\" );" )
+  //  aResList << QString( "%1.ImportFromFile( \"%2\" )" )
   //            .arg( aName ).arg( aFilePath.ToCString() );
   //}
 
@@ -115,7 +114,7 @@ QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObje
 
     aResList << aPntsDefinition;
     
-    aResList << QString( "%1.%3( %2 );" )
+    aResList << QString( "%1.%3( %2 )" )
                 .arg( aProfileName ).arg( aPntsListName )
                 .arg( anIsValidProfile ? "SetProfilePoints" : "SetParametricPoints" );
   
@@ -129,13 +128,13 @@ QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObje
     HYDROData_IPolyline::SectionType aSecType = aPrf->GetSectionType( 0 );
     if ( aSecType != HYDROData_IPolyline::SECTION_POLYLINE )
     {
-      aResList << QString( "%1.GetProfileUZ().SetSectionType( 0, %2 );" )
+      aResList << QString( "%1.GetProfileUZ().SetSectionType( 0, %2 )" )
                   .arg( aProfileName ).arg( "HYDROData_IPolyline.SECTION_SPLINE" );
       aResList << QString( "" );
     }
   }
 
-  aResList << QString( "%1.Update();" ).arg( aProfileName );
+  aResList << QString( "%1.Update()" ).arg( aProfileName );
   aResList << QString( "" );
 
   return aResList;
@@ -619,8 +618,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile,
     double aCoordX = aValX.RealValue();
     double aCoordY = aValY.RealValue();
 
-    if ( boost::math::isnan( aCoordX ) || boost::math::isinf( aCoordX ) ||
-         boost::math::isnan( aCoordY ) || boost::math::isinf( aCoordY ) )
+    if ( HYDROData_Tool::IsNan( aCoordX ) || HYDROData_Tool::IsInf( aCoordX ) ||
+         HYDROData_Tool::IsNan( aCoordY ) || HYDROData_Tool::IsInf( aCoordY ) )
       aRes = false;
 
     if ( anIsParametric )
@@ -646,7 +645,7 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile,
       }
 
       double aCoordZ = aValZ.RealValue();
-      if ( boost::math::isnan( aCoordZ ) || boost::math::isinf( aCoordZ ) )
+      if ( HYDROData_Tool::IsNan( aCoordZ ) || HYDROData_Tool::IsInf( aCoordZ ) )
         aRes = false;
 
       ProfilePoint aPoint( aCoordX, aCoordY, aCoordZ );