From 5abfdb140531c1c59254eb5dc4a62cb6bbd60e34 Mon Sep 17 00:00:00 2001 From: luz paz Date: Fri, 27 Nov 2020 11:12:55 -0500 Subject: [PATCH] ReverseEngineering: Fix header uniformity + trailing whitespace [skip ci] --- .../ReverseEngineering/App/ApproxSurface.cpp | 20 +++++++++---------- .../ReverseEngineering/App/ApproxSurface.h | 16 +++++++-------- .../ReverseEngineering/App/PreCompiled.cpp | 2 +- .../ReverseEngineering/App/Segmentation.cpp | 2 +- .../App/SurfaceTriangulation.cpp | 12 +++++------ .../App/SurfaceTriangulation.h | 4 ++-- .../ReverseEngineering/Gui/PreCompiled.cpp | 2 +- src/Mod/ReverseEngineering/Gui/Workbench.h | 2 +- src/Mod/ReverseEngineering/Init.py | 8 +++----- src/Mod/ReverseEngineering/InitGui.py | 13 ++++++------ .../ReverseEngineering/reverseengineering.dox | 5 ++++- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp index 8899b4619e..d68ee8815b 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp @@ -188,7 +188,7 @@ BSplineBasis::ValueT BSplineBasis::LocalSupport(int iIndex, double fParam) int m = _vKnotVector.Length()-1; int p = _iOrder-1; - if ((iIndex == 0 && fParam == _vKnotVector(0)) || + if ((iIndex == 0 && fParam == _vKnotVector(0)) || (iIndex == m-p-1 && fParam == _vKnotVector(m))) { return BSplineBasis::Full; } @@ -207,7 +207,7 @@ double BSplineBasis::BasisFunction(int iIndex, double fParam) double saved; TColStd_Array1OfReal N(0,p); - if ((iIndex == 0 && fParam == _vKnotVector(0)) || + if ((iIndex == 0 && fParam == _vKnotVector(0)) || (iIndex == m-p-1 && fParam == _vKnotVector(m))) { return 1.0; } @@ -254,7 +254,7 @@ void BSplineBasis::DerivativesOfBasisFunction(int iIndex, int iMaxDer, double fP int iMax = iMaxDer; if (Derivat.Length() != iMax+1) Standard_RangeError::Raise("BSplineBasis"); - //k-te Ableitungen (k>Grad) sind Null + //k-te Ableitungen (k>Grad) sind Null if (iMax >= _iOrder) { for (int i=_iOrder; i<=iMaxDer; i++) Derivat(i) = 0.0; @@ -277,7 +277,7 @@ void BSplineBasis::DerivativesOfBasisFunction(int iIndex, int iMaxDer, double fP for (int j=0; j<_iOrder; j++) { if (fParam >= _vKnotVector(iIndex+j) && fParam < _vKnotVector(iIndex+j+1)) N(j,0) = 1.0; - else + else N(j,0) = 0.0; } @@ -345,7 +345,7 @@ double BSplineBasis::DerivativeOfBasisFunction(int iIndex, int iMaxDer, double f if (iMax == 0) return BasisFunction(iIndex, fParam); - //k-te Ableitungen (k>Grad) sind Null + //k-te Ableitungen (k>Grad) sind Null if (iMax >= _iOrder) { return 0.0; } @@ -364,7 +364,7 @@ double BSplineBasis::DerivativeOfBasisFunction(int iIndex, int iMaxDer, double f for (int j=0; j<_iOrder; j++) { if (fParam >= _vKnotVector(iIndex+j) && fParam < _vKnotVector(iIndex+j+1)) N(j,0) = 1.0; - else + else N(j,0) = 0.0; } @@ -442,8 +442,8 @@ double BSplineBasis::GetIntegralOfProductOfBSplines(int iIdx1, int iIdx2, int iO if (fMax > fMin) { for (int i=0; i<=iMax; i++) { double fParam = 0.5*(vRoots(i)+1)*(fMax-fMin)+fMin; - dIntegral += 0.5*(fMax-fMin)*vWeights(i) * - DerivativeOfBasisFunction(iIdx1, iOrd1, fParam) * + dIntegral += 0.5*(fMax-fMin)*vWeights(i) * + DerivativeOfBasisFunction(iIdx1, iOrd1, fParam) * DerivativeOfBasisFunction(iIdx2, iOrd2, fParam); } } @@ -716,7 +716,7 @@ void ParameterCorrection::ProjectControlPointsOnPlane() } } -Handle(Geom_BSplineSurface) ParameterCorrection::CreateSurface(const TColgp_Array1OfPnt& points, +Handle(Geom_BSplineSurface) ParameterCorrection::CreateSurface(const TColgp_Array1OfPnt& points, int iIter, bool bParaCor, double fSizeFactor) @@ -803,7 +803,7 @@ void BSplineParameterCorrection::Init() _vUMults(0) = _usUOrder; _vUMults(usUMax) = _usUOrder; - + // v-Richtung for (unsigned i=0; i<=usVMax; i++) { _vVKnots(i) = static_cast(i) / static_cast(usVMax); diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.h b/src/Mod/ReverseEngineering/App/ApproxSurface.h index 6d3d8d7836..cf335497ce 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.h +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.h @@ -122,8 +122,8 @@ public: /** * Setzt den Knotenvektor und die Ordnung fest. uebergeben wird der Knotenvektor der Form - * (Wert, Vielfachheit). Intern wird dieser in einen Knotenvektor der Form (Wert,1) - * umgerechnet. Die Groesse dieses neuen Vektors muss exakt so gross sein, wie im Konstruktor + * (Wert, Vielfachheit). Intern wird dieser in einen Knotenvektor der Form (Wert,1) + * umgerechnet. Die Groesse dieses neuen Vektors muss exakt so gross sein, wie im Konstruktor * festgelegt. */ virtual void SetKnots(TColStd_Array1OfReal& vKnots, TColStd_Array1OfInteger& vMults, int iOrder=1); @@ -172,7 +172,7 @@ public: virtual int FindSpan(double fParam); /** - * Berechnet die Funktionswerte der an der Stelle fParam + * Berechnet die Funktionswerte der an der Stelle fParam * nicht verschwindenden Basisfunktionen. Es muss darauf geachtet werden, dass * die Liste fuer d(=Grad des B-Splines) Elemente (0,...,d-1) ausreicht. * (aus: Piegl/Tiller 96 The NURBS-Book) @@ -221,7 +221,7 @@ public: virtual double DerivativeOfBasisFunction(int iIndex, int k, double fParam); /** - * Berechnet das Integral des Produkts zweier B-Splines bzw. deren Ableitungen. + * Berechnet das Integral des Produkts zweier B-Splines bzw. deren Ableitungen. * Der Integrationsbereich erstreckt sich ueber den ganzen Definitionsbereich. * Berechnet wird das Integral mittels der Gauss'schen Quadraturformeln. */ @@ -280,10 +280,10 @@ protected: void ProjectControlPointsOnPlane(); /** - * Berechnet eine initiale Flaeche zu Beginn des Algorithmus. Dazu wird die Ausgleichsebene zu der + * Berechnet eine initiale Flaeche zu Beginn des Algorithmus. Dazu wird die Ausgleichsebene zu der * Punktwolke berechnet. - * Die Punkte werden bzgl. der Basis bestehend aus den Eigenvektoren der Kovarianzmatrix berechnet und - * auf die Ausgleichsebene projiziert. Von diesen Punkten wird die Boundingbox berechnet, dann werden + * Die Punkte werden bzgl. der Basis bestehend aus den Eigenvektoren der Kovarianzmatrix berechnet und + * auf die Ausgleichsebene projiziert. Von diesen Punkten wird die Boundingbox berechnet, dann werden * die u/v-Parameter fuer die Punkte berechnet. */ virtual bool DoInitialParameterCorrection(double fSizeFactor=0.0f); @@ -427,7 +427,7 @@ public: virtual const math_Matrix& GetThirdSmoothMatrix() const; /** - * Setzt die erste Matrix der Glaettungsterme + * Setzt die erste Matrix der Glaettungsterme */ virtual void SetFirstSmoothMatrix(const math_Matrix& rclMat); diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.cpp b/src/Mod/ReverseEngineering/App/PreCompiled.cpp index 1e5d389dd2..7cd1cae80f 100644 --- a/src/Mod/ReverseEngineering/App/PreCompiled.cpp +++ b/src/Mod/ReverseEngineering/App/PreCompiled.cpp @@ -21,4 +21,4 @@ ***************************************************************************/ -#include "PreCompiled.h" +#include "PreCompiled.h" diff --git a/src/Mod/ReverseEngineering/App/Segmentation.cpp b/src/Mod/ReverseEngineering/App/Segmentation.cpp index eb2f7c5bcb..b809c0e963 100644 --- a/src/Mod/ReverseEngineering/App/Segmentation.cpp +++ b/src/Mod/ReverseEngineering/App/Segmentation.cpp @@ -66,7 +66,7 @@ void Segmentation::perform(int ksearch) // All the objects needed pcl::PassThrough pass; pcl::NormalEstimation ne; - pcl::SACSegmentationFromNormals seg; + pcl::SACSegmentationFromNormals seg; pcl::ExtractIndices extract; pcl::ExtractIndices extract_normals; pcl::search::KdTree::Ptr tree (new pcl::search::KdTree ()); diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp index 56c5d71f34..427fe176d4 100644 --- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp +++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp @@ -347,9 +347,9 @@ void GridReconstruction::perform(int ksearch) GridProjection grid; // Set parameters - grid.setResolution(0.005); - grid.setPaddingSize(3); - grid.setNearestNeighborNum(100); + grid.setResolution(0.005); + grid.setPaddingSize(3); + grid.setNearestNeighborNum(100); grid.setMaxBinarySearchLevel(10); grid.setInputCloud (cloud_with_normals); grid.setSearchMethod (tree2); @@ -395,9 +395,9 @@ void GridReconstruction::perform(const std::vector& normals) GridProjection grid; // Set parameters - grid.setResolution(0.005); - grid.setPaddingSize(3); - grid.setNearestNeighborNum(100); + grid.setResolution(0.005); + grid.setPaddingSize(3); + grid.setNearestNeighborNum(100); grid.setMaxBinarySearchLevel(10); grid.setInputCloud (cloud_with_normals); grid.setSearchMethod (tree); diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h index 09a46e1a5a..3299a8ff6f 100644 --- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h +++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h @@ -56,14 +56,14 @@ public: * (this will make the algorithm adapt to different point densities in the cloud). * \param[in] mu the multiplier */ - inline void + inline void setMu (double mu) { this->mu = mu; } /** \brief Set the sphere radius that is to be used for determining the k-nearest neighbors used for triangulating. * \param[in] radius the sphere radius that is to contain all k-nearest neighbors * \note This distance limits the maximum edge length! */ - inline void + inline void setSearchRadius (double radius) { this->searchRadius = radius; } private: diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp b/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp index 1e5d389dd2..7cd1cae80f 100644 --- a/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp +++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp @@ -21,4 +21,4 @@ ***************************************************************************/ -#include "PreCompiled.h" +#include "PreCompiled.h" diff --git a/src/Mod/ReverseEngineering/Gui/Workbench.h b/src/Mod/ReverseEngineering/Gui/Workbench.h index f7cea4cb78..11bac50861 100644 --- a/src/Mod/ReverseEngineering/Gui/Workbench.h +++ b/src/Mod/ReverseEngineering/Gui/Workbench.h @@ -48,4 +48,4 @@ protected: } // namespace ReverseEngineeringGui -#endif // REENGUI_WORKBENCH_H +#endif // REENGUI_WORKBENCH_H diff --git a/src/Mod/ReverseEngineering/Init.py b/src/Mod/ReverseEngineering/Init.py index 042fb264cc..9f25ae3d58 100644 --- a/src/Mod/ReverseEngineering/Init.py +++ b/src/Mod/ReverseEngineering/Init.py @@ -1,7 +1,4 @@ # -*- coding: utf8 -*- -# FreeCAD init script of the ReverseEngineering module -# (c) 2001 Juergen Riegel - # *************************************************************************** # * Copyright (c) 2002 Juergen Riegel * # * * @@ -14,13 +11,14 @@ # * for detail see the LICENCE text file. * # * * # * FreeCAD is distributed in the hope that it will be useful, * -# * but WITHOUT ANY WARRANTY; without even the implied warranty of * +# * 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 Library General Public * -# * License along with FreeCAD; if not, write to the Free Software * +# * License along with FreeCAD; if not, write to the Free Software * # * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * # * USA * # * * # ***************************************************************************/ +# FreeCAD init script of the ReverseEngineering module diff --git a/src/Mod/ReverseEngineering/InitGui.py b/src/Mod/ReverseEngineering/InitGui.py index e9ace199fd..7b647c2b5a 100644 --- a/src/Mod/ReverseEngineering/InitGui.py +++ b/src/Mod/ReverseEngineering/InitGui.py @@ -1,10 +1,3 @@ -# ReverseEngineering gui init module -# (c) 2003 Juergen Riegel -# -# Gathering all the information to start FreeCAD -# This is the second one of three init scripts, the third one -# runs when the gui is up - #*************************************************************************** #* Copyright (c) 2002 Juergen Riegel * #* * @@ -28,6 +21,12 @@ #* * #***************************************************************************/ +# ReverseEngineering gui init module +# +# Gathering all the information to start FreeCAD +# This is the second one of three init scripts, the third one +# runs when the gui is up + class ReverseEngineeringWorkbench ( Workbench ): "ReverseEngineering workbench object" diff --git a/src/Mod/ReverseEngineering/reverseengineering.dox b/src/Mod/ReverseEngineering/reverseengineering.dox index 7db86c977b..a3ebec68e8 100644 --- a/src/Mod/ReverseEngineering/reverseengineering.dox +++ b/src/Mod/ReverseEngineering/reverseengineering.dox @@ -1,5 +1,8 @@ /** \defgroup REEN ReverseEngineering - * \ingroup CWORKBENCHES + * \ingroup CWORKBENCHES * \brief Generate Part shapes from Mesh and Points based objects + +See \ref src/Mod/Draft/draft.dox as an example of how to populate this page + */