-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// 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
//
#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>
-HYDROData_BSplineOperation::HYDROData_BSplineOperation(
+#include <CurveCreator_Utils.hxx>
+
+Handle(Geom_BSplineCurve) HYDROData_BSplineOperation::ComputeCurve(
const NCollection_Sequence<gp_XYZ>& thePoints,
const bool theIsClosed,
const double theTolerance )
}
// 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++)
{