+// Copyright (C) 2014-2015 EDF-R&D
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include <HYDROData_BSplineOperation.h>
-
-#include <TColgp_HArray1OfPnt.hxx>
-
-#include <GeomAPI_Interpolate.hxx>
#include <GeomConvert_BSplineCurveToBezierCurve.hxx>
#include <Geom_BezierCurve.hxx>
-
+#include <gp_Pnt.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
#include <QPainterPath>
+#include <CurveCreator_Utils.hxx>
-HYDROData_BSplineOperation::HYDROData_BSplineOperation(
+Handle(Geom_BSplineCurve) HYDROData_BSplineOperation::ComputeCurve(
const NCollection_Sequence<gp_XYZ>& thePoints,
- const bool theIsClosed )
+ const bool theIsClosed,
+ const double theTolerance )
{
- // fill array for algorithm by the received coordinates
+ // skip equal points
int aNbPoints = thePoints.Size();
+ NCollection_Sequence<gp_XYZ> aPoints;
+ if ( aNbPoints > 0 ) {
+ gp_XYZ aPrevPoint = thePoints.Value( 1 );
+ aPoints.Append( aPrevPoint );
+ for( int i = 2 ; i <= aNbPoints; ++i )
+ {
+ gp_XYZ aPoint( thePoints.Value( i ) );
+ if ( !aPoint.IsEqual( aPrevPoint, theTolerance ) )
+ aPoints.Append( aPoint );
+ aPrevPoint = aPoint;
+ }
+ }
+ // fill array for algorithm by the received coordinates
+ aNbPoints = aPoints.Size();
Handle(TColgp_HArray1OfPnt) aHCurvePoints = new TColgp_HArray1OfPnt( 1, aNbPoints );
for ( int i = 1; i <= aNbPoints; i++ )
{
- gp_Pnt aPnt( thePoints.Value( i ) );
+ gp_Pnt aPnt( aPoints.Value( i ) );
aHCurvePoints->SetValue( i, aPnt );
}
// compute BSpline
- GeomAPI_Interpolate aGBC( aHCurvePoints, theIsClosed, gp::Resolution() );
- aGBC.Perform();
- if ( aGBC.IsDone() )
- myCurve = aGBC.Curve();
+ Handle(Geom_BSplineCurve) aBSpline;
+ if( CurveCreator_Utils::constructBSpline( aHCurvePoints, theIsClosed, aBSpline ) )
+ return aBSpline;
+ else
+ return Handle(Geom_BSplineCurve)();
}
-void HYDROData_BSplineOperation::ComputePath( QPainterPath& thePath ) const
+void HYDROData_BSplineOperation::ComputePath( const Handle(Geom_BSplineCurve)& theCurve,
+ QPainterPath& thePath )
{
- if ( myCurve.IsNull() ) // returns an empty Path if original curve is invalid
+ if ( theCurve.IsNull() ) // returns an empty Path if original curve is invalid
return;
- GeomConvert_BSplineCurveToBezierCurve aConverter(myCurve);
+ GeomConvert_BSplineCurveToBezierCurve aConverter(theCurve);
int a, aNumArcs = aConverter.NbArcs();
for(a = 1; a <= aNumArcs; a++)
{
