From 55fa3d8a7786af217e146521ba90fd573f2f85c5 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 8 Aug 2022 10:46:04 +0200 Subject: [PATCH] Mod: [skip ci] improve whitespace --- src/Mod/Fem/App/FemConstraint.cpp | 16 ++++++++-------- src/Mod/Fem/App/FemMesh.cpp | 4 ++-- src/Mod/MeshPart/App/CurveProjector.cpp | 24 ++++-------------------- src/Mod/MeshPart/App/MeshAlgos.cpp | 14 +++++++------- 4 files changed, 21 insertions(+), 37 deletions(-) diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp index 13fac320a6..d6f10a2dc5 100644 --- a/src/Mod/Fem/App/FemConstraint.cpp +++ b/src/Mod/Fem/App/FemConstraint.cpp @@ -81,9 +81,9 @@ PROPERTY_SOURCE(Fem::Constraint, App::DocumentObject) Constraint::Constraint() { - ADD_PROPERTY_TYPE(References,(nullptr,nullptr),"Constraint",(App::PropertyType)(App::Prop_None),"Elements where the constraint is applied"); - ADD_PROPERTY_TYPE(NormalDirection,(Base::Vector3d(0,0,1)),"Constraint",App::PropertyType(App::Prop_ReadOnly|App::Prop_Output),"Normal direction pointing outside of solid"); - ADD_PROPERTY_TYPE(Scale,(1),"Base",App::PropertyType(App::Prop_Output),"Scale used for drawing constraints"); //OvG: Add scale parameter inherited by all derived constraints + ADD_PROPERTY_TYPE(References, (nullptr, nullptr), "Constraint", (App::PropertyType)(App::Prop_None), "Elements where the constraint is applied"); + ADD_PROPERTY_TYPE(NormalDirection, (Base::Vector3d(0, 0, 1)), "Constraint", App::PropertyType(App::Prop_ReadOnly | App::Prop_Output), "Normal direction pointing outside of solid"); + ADD_PROPERTY_TYPE(Scale, (1), "Base", App::PropertyType(App::Prop_Output), "Scale used for drawing constraints"); //OvG: Add scale parameter inherited by all derived constraints References.setScope(App::LinkScope::Global); } @@ -146,9 +146,9 @@ void Constraint::onChanged(const App::Property* prop) BRepGProp_Face props(face); gp_Vec normal; gp_Pnt center; - double u1,u2,v1,v2; - props.Bounds(u1,u2,v1,v2); - props.Normal((u1+u2)/2.0,(v1+v2)/2.0,center,normal); + double u1, u2, v1, v2; + props.Bounds(u1, u2, v1, v2); + props.Normal((u1+u2)/2.0, (v1+v2)/2.0, center, normal); normal.Normalize(); NormalDirection.setValue(normal.X(), normal.Y(), normal.Z()); // One face is enough... @@ -298,8 +298,8 @@ bool Constraint::getPoints(std::vector &points, std::vector= 30) //OvG: Increase 10 units distance proportionately to lv for larger objects. { - *scale = this->calcDrawScaleFactor(lv,lu); //OvG: setup draw scale for constraint - stepsv = (int)round(lv / (10*( *scale))); + *scale = this->calcDrawScaleFactor(lv, lu); //OvG: setup draw scale for constraint + stepsv = (int)round(lv / (10 * (*scale))); stepsv = stepsv<3?3:stepsv; } else if (lv >= 20.0) diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index b386846ec4..bc00ca545f 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -1676,13 +1676,13 @@ void FemMesh::readNastran95(const std::string &Filename) } //1D - else if (line1.substr(0,6)=="CBAR") + else if (line1.substr(0, 6) == "CBAR") { elem = std::make_shared(); elem->read(line1, ""); } //2d - else if (line1.substr(0,6)=="CTRMEM") + else if (line1.substr(0, 6) == "CTRMEM") { //D06 //CTRMEM 322 1 179 180 185 diff --git a/src/Mod/MeshPart/App/CurveProjector.cpp b/src/Mod/MeshPart/App/CurveProjector.cpp index 1e79dd0b3a..563ebaa84c 100644 --- a/src/Mod/MeshPart/App/CurveProjector.cpp +++ b/src/Mod/MeshPart/App/CurveProjector.cpp @@ -104,17 +104,12 @@ CurveProjectorShape::CurveProjectorShape(const TopoDS_Shape &aShape, const MeshK void CurveProjectorShape::Do() { TopExp_Explorer Ex; - TopoDS_Shape Edge; - - for (Ex.Init(_Shape, TopAbs_EDGE); Ex.More(); Ex.Next()) - { - const TopoDS_Edge& aEdge = TopoDS::Edge(Ex.Current()); + for (Ex.Init(_Shape, TopAbs_EDGE); Ex.More(); Ex.Next()) { + const TopoDS_Edge& aEdge = TopoDS::Edge(Ex.Current()); //std::vector vSplitEdges; projectCurve(aEdge, mvEdgeSplitPoints[aEdge]); - } - } @@ -272,23 +267,19 @@ CurveProjectorSimple::CurveProjectorSimple(const TopoDS_Shape &aShape, const Mes void CurveProjectorSimple::Do() { TopExp_Explorer Ex; - TopoDS_Shape Edge; std::vector vEdgePolygon; for (Ex.Init(_Shape, TopAbs_EDGE); Ex.More(); Ex.Next()) { - const TopoDS_Edge& aEdge = TopoDS::Edge(Ex.Current()); + const TopoDS_Edge& aEdge = TopoDS::Edge(Ex.Current()); // GetSampledCurves(aEdge,vEdgePolygon,2000); //std::vector vSplitEdges; projectCurve(aEdge,vEdgePolygon, mvEdgeSplitPoints[aEdge]); - } - } - void CurveProjectorSimple::GetSampledCurves( const TopoDS_Edge& aEdge, std::vector& rclPoints, unsigned long ulNbOfPoints) { rclPoints.clear(); @@ -586,24 +577,17 @@ CurveProjectorWithToolMesh::CurveProjectorWithToolMesh(const TopoDS_Shape &aShap void CurveProjectorWithToolMesh::Do() { TopExp_Explorer Ex; - TopoDS_Shape Edge; std::vector cVAry; - std::vector vEdgePolygon; - for (Ex.Init(_Shape, TopAbs_EDGE); Ex.More(); Ex.Next()) { - const TopoDS_Edge& aEdge = TopoDS::Edge(Ex.Current()); - + const TopoDS_Edge& aEdge = TopoDS::Edge(Ex.Current()); makeToolMesh(aEdge,cVAry); - } ToolMesh.AddFacets(cVAry); - } - //projectToNeighbours(Handle(Geom_Curve) hCurve,float pos void CurveProjectorWithToolMesh::makeToolMesh( const TopoDS_Edge& aEdge,std::vector &cVAry ) diff --git a/src/Mod/MeshPart/App/MeshAlgos.cpp b/src/Mod/MeshPart/App/MeshAlgos.cpp index ae456eec8e..6035eb6cf7 100644 --- a/src/Mod/MeshPart/App/MeshAlgos.cpp +++ b/src/Mod/MeshPart/App/MeshAlgos.cpp @@ -24,7 +24,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ # ifdef FC_OS_LINUX -# include +# include # endif #endif @@ -206,7 +206,7 @@ MeshCore::MeshKernel* MeshAlgos::boolean(MeshCore::MeshKernel* pMesh1, self_intersects = gts_surface_is_self_intersecting (s1); if (self_intersects != NULL) { // if (verbose) -// gts_surface_print_stats (self_intersects, stderr); +// gts_surface_print_stats (self_intersects, stderr); // gts_surface_write (self_intersects, stdout); gts_object_destroy (GTS_OBJECT (self_intersects)); gts_object_destroy (GTS_OBJECT (s1)); @@ -216,7 +216,7 @@ MeshCore::MeshKernel* MeshAlgos::boolean(MeshCore::MeshKernel* pMesh1, self_intersects = gts_surface_is_self_intersecting (s2); if (self_intersects != NULL) { // if (verbose) -// gts_surface_print_stats (self_intersects, stderr); +// gts_surface_print_stats (self_intersects, stderr); // gts_surface_write (self_intersects, stdout); gts_object_destroy (GTS_OBJECT (self_intersects)); gts_object_destroy (GTS_OBJECT (s1)); @@ -234,7 +234,7 @@ MeshCore::MeshKernel* MeshAlgos::boolean(MeshCore::MeshKernel* pMesh1, is_open2 = gts_surface_volume (s2) < 0. ? true : false; si = gts_surface_inter_new (gts_surface_inter_class (), - s1, s2, tree1, tree2, is_open1, is_open2); + s1, s2, tree1, tree2, is_open1, is_open2); g_assert (gts_surface_inter_check (si, &closed)); if (!closed) { gts_object_destroy (GTS_OBJECT (s1)); @@ -245,9 +245,9 @@ MeshCore::MeshKernel* MeshAlgos::boolean(MeshCore::MeshKernel* pMesh1, } s3 = gts_surface_new (gts_surface_class (), - gts_face_class (), - gts_edge_class (), - gts_vertex_class ()); + gts_face_class (), + gts_edge_class (), + gts_vertex_class ()); if (Type==0) { // union gts_surface_inter_boolean (si, s3, GTS_1_OUT_2); gts_surface_inter_boolean (si, s3, GTS_2_OUT_1);