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 2649e2b..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>
@@ -56,7 +54,7 @@ IMPLEMENT_STANDARD_HANDLE(HYDROData_Profile, HYDROData_Object)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Profile, HYDROData_Object)
 
 HYDROData_Profile::HYDROData_Profile()
-: HYDROData_Object()
+: HYDROData_Object( Geom_3d )
 {
 }
 
@@ -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;
@@ -163,7 +162,7 @@ TopoDS_Shape HYDROData_Profile::GetTopShape() const
 
 TopoDS_Shape HYDROData_Profile::GetShape3D() const
 {
-  TopoDS_Shape aShape = getShape3D();
+  TopoDS_Shape aShape = HYDROData_Object::GetShape3D();
   if( aShape.IsNull() )
     aShape = CreateProfileWire( true );
   return aShape;
@@ -191,26 +190,16 @@ void HYDROData_Profile::Update()
   SetShape3D( aShape );
 }
 
-QColor HYDROData_Profile::DefaultFillingColor()
+QColor HYDROData_Profile::DefaultFillingColor() const
 {
   return QColor( Qt::transparent );
 }
 
-QColor HYDROData_Profile::DefaultBorderColor()
+QColor HYDROData_Profile::DefaultBorderColor() const
 {
   return QColor( Qt::black );
 }
 
-QColor HYDROData_Profile::getDefaultFillingColor() const
-{
-  return DefaultFillingColor();
-}
-
-QColor HYDROData_Profile::getDefaultBorderColor() const
-{
-  return DefaultBorderColor();
-}
-
 bool HYDROData_Profile::IsValid() const
 {
   gp_XY aFirstPoint, aLastPoint;
@@ -239,7 +228,7 @@ void HYDROData_Profile::SetLeftPoint( const gp_XY& theGPoint, bool IsConvertFrom
   anArray->SetValue( 0, aLPoint.X() );
   anArray->SetValue( 1, aLPoint.Y() );
 
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal,
@@ -291,7 +280,7 @@ void HYDROData_Profile::SetRightPoint( const gp_XY& theGPoint, bool IsConvertFro
   anArray->SetValue( 0, aLPoint.X() );
   anArray->SetValue( 1, aLPoint.Y() );
 
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal,
@@ -336,7 +325,7 @@ void HYDROData_Profile::Invalidate()
   if ( !aLastLabel.IsNull() )
     aLastLabel.ForgetAllAttributes();
 
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 Handle(HYDROData_ProfileUZ) HYDROData_Profile::GetProfileUZ( const bool theIsCreate ) const
@@ -369,7 +358,7 @@ void HYDROData_Profile::RemovePoints()
   if ( !aProfileUZ.IsNull() )
   {
     aProfileUZ->RemoveSections();
-    SetToUpdate( true );
+    Changed( Geom_3d );
   }
 }
 
@@ -384,7 +373,7 @@ void HYDROData_Profile::SetParametricPoints( const HYDROData_ProfileUZ::PointsLi
     aProfileUZ->AddPoint( 0, aPoint );
   }
 
-  SetToUpdate( true );
+  Changed( Geom_3d );
 }
 
 HYDROData_ProfileUZ::PointsList HYDROData_Profile::GetParametricPoints() const
@@ -537,7 +526,7 @@ int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc,
 
     aProfile->SetFilePath( theFileName );
 
-    aProfile->SetBorderColor( HYDROData_Profile::DefaultBorderColor() );
+    aProfile->SetBorderColor( aProfile->DefaultBorderColor() );
   }
 
   return aCreatedProfiles.Length();
@@ -629,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 )
@@ -656,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 );