Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '0d956a814' into pre/IMPS_2016
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_BSplineOperation.cxx
diff --git
a/src/HYDROData/HYDROData_BSplineOperation.cxx
b/src/HYDROData/HYDROData_BSplineOperation.cxx
index f3d451f1654dc1beb5207e6869a0a1e60bb1ede4..64ae37d4cb6ce8342354165aaafc3bf44e8d304b 100644
(file)
--- a/
src/HYDROData/HYDROData_BSplineOperation.cxx
+++ b/
src/HYDROData/HYDROData_BSplineOperation.cxx
@@
-1,8
+1,4
@@
-// 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
// 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
@@
-21,16
+17,15
@@
//
#include <HYDROData_BSplineOperation.h>
//
#include <HYDROData_BSplineOperation.h>
-
-#include <TColgp_HArray1OfPnt.hxx>
-
-#include <GeomAPI_Interpolate.hxx>
#include <GeomConvert_BSplineCurveToBezierCurve.hxx>
#include <Geom_BezierCurve.hxx>
#include <GeomConvert_BSplineCurveToBezierCurve.hxx>
#include <Geom_BezierCurve.hxx>
-
+#include <gp_Pnt.hxx>
+#include <TColgp_HArray1OfPnt.hxx>
#include <QPainterPath>
#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 )
const NCollection_Sequence<gp_XYZ>& thePoints,
const bool theIsClosed,
const double theTolerance )
@@
-60,18
+55,20
@@
HYDROData_BSplineOperation::HYDROData_BSplineOperation(
}
// compute BSpline
}
// 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 (
my
Curve.IsNull() ) // returns an empty Path if original curve is invalid
+ if (
the
Curve.IsNull() ) // returns an empty Path if original curve is invalid
return;
return;
- GeomConvert_BSplineCurveToBezierCurve aConverter(
my
Curve);
+ GeomConvert_BSplineCurveToBezierCurve aConverter(
the
Curve);
int a, aNumArcs = aConverter.NbArcs();
for(a = 1; a <= aNumArcs; a++)
{
int a, aNumArcs = aConverter.NbArcs();
for(a = 1; a <= aNumArcs; a++)
{