#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>
#include <gp_XY.hxx>
#include <gp_XYZ.hxx>
#include <gp_Pnt2d.hxx>
+#include <gp_Ax3.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <Geom_Plane.hxx>
#include <TDataStd_AsciiString.hxx>
#include <TDataStd_RealArray.hxx>
{
}
-QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Profile::DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
QString aProfileName = GetObjPyName();
//TCollection_AsciiString aFilePath = GetFilePath();
//if ( !aFilePath.IsEmpty() )
//{
- // aResList << QString( "%1.ImportFromFile( \"%2\" );" )
+ // aResList << QString( "%1.ImportFromFile( \"%2\" )" )
// .arg( aName ).arg( aFilePath.ToCString() );
//}
aResList << aPntsDefinition;
- aResList << QString( "%1.%3( %2 );" )
+ aResList << QString( "%1.%3( %2 )" )
.arg( aProfileName ).arg( aPntsListName )
.arg( anIsValidProfile ? "SetProfilePoints" : "SetParametricPoints" );
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;
TopoDS_Shape HYDROData_Profile::GetShape3D() const
{
- TopoDS_Shape aShape = getShape3D();
+ TopoDS_Shape aShape = HYDROData_Object::GetShape3D();
if( aShape.IsNull() )
aShape = CreateProfileWire( true );
return aShape;
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;
int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc,
const TCollection_AsciiString& theFileName,
- NCollection_Sequence<int>& theBadProfilesIds )
+ NCollection_Sequence<int>& theBadProfilesIds,
+ bool isToProject )
{
if ( theDoc.IsNull() || theFileName.IsEmpty() )
return 0;
aNewProfile = Handle(HYDROData_Profile)::DownCast( theDoc->CreateObject( KIND_PROFILE ) );
bool anIsRead = false;
- if ( aNewProfile->ImportFromFile( aFile, &anIsRead ) )
+ if ( aNewProfile->ImportFromFile( aFile, isToProject, &anIsRead ) )
{
aCreatedProfiles.Append( aNewProfile );
aNewProfile.Nullify();
aProfile->SetFilePath( theFileName );
- aProfile->SetBorderColor( HYDROData_Profile::DefaultBorderColor() );
+ aProfile->SetBorderColor( aProfile->DefaultBorderColor() );
}
return aCreatedProfiles.Length();
}
bool HYDROData_Profile::ImportFromFile( const TCollection_AsciiString& theFileName,
- bool* theIsRead )
+ bool isToProject,
+ bool* isNotEmpty )
{
- if ( theIsRead )
- *theIsRead = false;
+ if( isNotEmpty )
+ *isNotEmpty = false;
// Try to open the file
OSD_File aFile( theFileName );
if ( !aFile.IsOpen() )
return false;
- bool aRes = ImportFromFile( aFile, theIsRead );
+ bool aRes = ImportFromFile( aFile, isToProject, isNotEmpty );
// Close the file
aFile.Close();
}
bool HYDROData_Profile::ImportFromFile( OSD_File& theFile,
- bool* theIsRead )
+ bool isToProject,
+ bool* isNotEmpty )
{
- if ( theIsRead )
- *theIsRead = false;
+ if( isNotEmpty )
+ *isNotEmpty = false;
if ( !theFile.IsOpen() )
return false;
}
// Set flag of read status to true
- if ( theIsRead )
- *theIsRead = true;
+ if( isNotEmpty )
+ *isNotEmpty = true;
TCollection_AsciiString aValX = aLine.Token( " \t", 1 );
TCollection_AsciiString aValY = aLine.Token( " \t", 2 );
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 )
}
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 );
}
else if ( anIsGeoref )
{
+ if( isToProject )
+ ProjectProfilePoints( aPointsXYZ );
SetProfilePoints( aPointsXYZ, true );
}
}
return aMiddlePoint;
- }
\ No newline at end of file
+ }
+
+void HYDROData_Profile::ProjectProfilePoints( ProfilePoints& thePoints )
+{
+ int low = thePoints.Lower(), up = thePoints.Upper();
+ gp_Pnt aFirst = thePoints.Value( low );
+ gp_Pnt aLast = thePoints.Value( up );
+ gp_Vec d( aFirst, aLast );
+ gp_Vec n( d.Y(), -d.X(), 0 );
+
+ Handle(Geom_Plane) aPlane = new Geom_Plane( aFirst, gp_Dir( n ) );
+ for( int i=low; i<=up; i++ )
+ {
+ gp_XYZ p = thePoints.Value( i );
+ gp_Pnt pp = GeomAPI_ProjectPointOnSurf( p, aPlane );
+ thePoints.SetValue( i, pp.XYZ() );
+ }
+}