From 609c80b71a949688f999f9fb4d1bc0f98212fe71 Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Tue, 10 Jan 2017 20:05:18 +0100 Subject: [PATCH] Part: Fixes triggered by Werner's comments on my branch --- src/Mod/Part/App/Geometry.cpp | 6 +++--- src/Mod/Part/App/Geometry.h | 4 ++-- src/Mod/Sketcher/App/Sketch.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp index 89ecd1adc..4758687a6 100644 --- a/src/Mod/Part/App/Geometry.cpp +++ b/src/Mod/Part/App/Geometry.cpp @@ -653,7 +653,7 @@ void GeomBSplineCurve::setKnots(const std::vector& knots) } } -void GeomBSplineCurve::setKnots(const std::vector& knots, const std::vector multiplicities) +void GeomBSplineCurve::setKnots(const std::vector& knots, const std::vector& multiplicities) { Standard_Integer index=0; @@ -698,7 +698,7 @@ int GeomBSplineCurve::getDegree() const return myCurve->Degree(); } -bool GeomBSplineCurve::IsPeriodic() const +bool GeomBSplineCurve::isPeriodic() const { return myCurve->IsPeriodic()==Standard_True; } @@ -817,7 +817,7 @@ void GeomBSplineCurve::Save(Base::Writer& writer) const std::vector knots = this->getKnots(); std::vector mults = this->getMultiplicities(); int degree = this->getDegree(); - bool isperiodic = this->IsPeriodic(); + bool isperiodic = this->isPeriodic(); writer.Stream() << writer.ind() diff --git a/src/Mod/Part/App/Geometry.h b/src/Mod/Part/App/Geometry.h index b650ecc01..aa0eeee88 100644 --- a/src/Mod/Part/App/Geometry.h +++ b/src/Mod/Part/App/Geometry.h @@ -200,13 +200,13 @@ public: void setWeights(const std::vector& weights); void setKnot(int index, const double val, int mult=-1); void setKnots(const std::vector& knots); - void setKnots(const std::vector& knots, const std::vector multiplicities); + void setKnots(const std::vector& knots, const std::vector& multiplicities); std::vector getPoles() const; std::vector getWeights() const; std::vector getKnots() const; std::vector getMultiplicities() const; int getDegree() const; - bool IsPeriodic() const; + bool isPeriodic() const; bool join(const Handle_Geom_BSplineCurve&); void makeC1Continuous(double, double); std::list toBiArcs(double tolerance) const; diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp index 22c2f86a3..93744efe2 100644 --- a/src/Mod/Sketcher/App/Sketch.cpp +++ b/src/Mod/Sketcher/App/Sketch.cpp @@ -670,7 +670,7 @@ int Sketch::addBSpline(const Part::GeomBSplineCurve &bspline, bool fixed) std::vector knots = bsp->getKnots(); std::vector mult = bsp->getMultiplicities(); int degree = bsp->getDegree(); - bool periodic = bsp->IsPeriodic(); + bool periodic = bsp->isPeriodic(); Base::Vector3d startPnt = bsp->getStartPoint(); Base::Vector3d endPnt = bsp->getEndPoint();