#include <BRep_Tool.hxx>
#include <Geom_BSplineCurve.hxx>
+#include <GeomAdaptor_Curve.hxx>
+#include <GCPnts_QuasiUniformAbscissa.hxx>
+#include <GCPnts_AbscissaPoint.hxx>
#include <gp_Pnt2d.hxx>
#include <gp_XY.hxx>
#include <TopTools_SequenceOfShape.hxx>
+//#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
#include <QColor>
#include <QStringList>
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Polyline3D,HYDROData_Object)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Polyline3D,HYDROData_Object)
QString aProfileName = aProfile->GetObjPyName();
if ( !aProfileName.isEmpty() )
{
- aResList << QString( "%1.SetProfileUZ( %2.GetProfileUZ() );" )
+ aResList << QString( "%1.SetProfileUZ( %2.GetProfileUZ() )" )
.arg( aPolylineName ).arg( aProfileName );
}
}
QString aProfileName = aProfile->GetObjPyName();
if ( !aProfileName.isEmpty() )
{
- aResList << QString( "%1.SetChildProfileUZ( %2.GetProfileUZ() );" )
+ aResList << QString( "%1.SetChildProfileUZ( %2.GetProfileUZ() )" )
.arg( aPolylineName ).arg( aProfileName );
}
}
}
aResList << QString( "" );
- aResList << QString( "%1.Update();" ).arg( aPolylineName );
+ aResList << QString( "%1.Update()" ).arg( aPolylineName );
aResList << QString( "" );
return aResList;
bool anIsSectionClosed = aPolylineXY->IsClosedSection( 0 );
HYDROData_IPolyline::SectionType aSectionType = aPolylineXY->GetSectionType( 0 );
+ NCollection_Sequence<Polyline3DPoint> aResPoints = GetProfilePoints3D(false);
+
+ TopoDS_Wire aResWire = HYDROData_PolylineXY::BuildWire( aSectionType, anIsSectionClosed, aResPoints );
+ SetTopShape( aResWire );
+ SetShape3D( aResWire );
+}
+
+HYDROData_Polyline3D::Polyline3DPoints HYDROData_Polyline3D::GetProfilePoints3D(bool IsConvertToGlobal)
+{
+ Handle(HYDROData_PolylineXY) aPolylineXY = GetPolylineXY();
+ if ( aPolylineXY.IsNull() )
+ return Polyline3DPoints();
+
HYDROData_IPolyline::PointsList aPolylinePoints = aPolylineXY->GetPoints( 0 );
if ( aPolylinePoints.IsEmpty() )
- return;
+ return Polyline3DPoints();
Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ();
aProfileUZ = GetChildProfileUZ();
if ( aProfileUZ.IsNull() )
- return;
+ return Polyline3DPoints();
HYDROData_IPolyline::PointsList aProfilePoints = aProfileUZ->GetPoints();
if ( aProfilePoints.IsEmpty() )
- return;
+ return NCollection_Sequence<HYDROData_Polyline3D::Polyline3DPoint>();
const HYDROData_IPolyline::Point& aFirstPoint = aPolylinePoints.First();
const HYDROData_IPolyline::Point& aLastPoint = aPolylinePoints.Last();
// Add last point as is
aResPoints.Append( Polyline3DPoint( aLastPoint.X(), aLastPoint.Y(), aLastParPoint.Y() ) );
- TopoDS_Wire aResWire = HYDROData_PolylineXY::BuildWire( aSectionType, anIsSectionClosed, aResPoints );
- SetTopShape( aResWire );
- SetShape3D( aResWire );
-}
+ if (IsConvertToGlobal)
+ {
+ Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
+ for (int i=1;i<=aResPoints.Size();i++)
+ {
+ gp_XYZ& point = aResPoints.ChangeValue(i);
+ aDoc->Transform( point, false );
+ }
+ }
+ return aResPoints;
+}
QColor HYDROData_Polyline3D::DefaultFillingColor() const
{
if ( !theIsCreate || !aProfileUZ.IsNull() )
return aProfileUZ;
- Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+ Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
if ( aDocument.IsNull() )
return aProfileUZ;
*/
}
-HYDROData_Polyline3D::Polyline3DPoints HYDROData_Polyline3D::GetPoints() const
+HYDROData_Polyline3D::Polyline3DPoints HYDROData_Polyline3D::GetPoints( double theEqDistance ) const
{
Polyline3DPoints aPoints;
} else {
// Get points from spline curve
Standard_Real aStart, anEnd;
- Handle(Geom_Curve) aCurve = BRep_Tool::Curve( TopoDS::Edge( anEdges.First() ), aStart, anEnd );
+ TopoDS_Edge anEdge = TopoDS::Edge( anEdges.First() );
+ Handle(Geom_Curve) aCurve = BRep_Tool::Curve( anEdge, aStart, anEnd );
+
+ if( theEqDistance > 0 )
+ {
+ GeomAdaptor_Curve anAdaptorCurve( aCurve );
+ double aLength = GCPnts_AbscissaPoint::Length( anAdaptorCurve );
+ int aNbPoints = ceil( aLength / theEqDistance );
+ GCPnts_QuasiUniformAbscissa aDist( anAdaptorCurve, aNbPoints );
+ if( aDist.IsDone() )
+ {
+ aNbPoints = aDist.NbPoints();
+ for( int i=1; i<=aNbPoints; i++ )
+ {
+ double p = aDist.Parameter( i );
+ gp_Pnt aPnt;
+ aCurve->D0( p, aPnt );
+ aPoints.Append( aPnt.XYZ() );
+ }
+ return aPoints;
+ }
+ }
+
Handle(Geom_BSplineCurve) aGeomSpline = Handle(Geom_BSplineCurve)::DownCast( aCurve );
if ( !aGeomSpline.IsNull() ) {