From dbff8faef6706677c6525bc613bf2619c2ea1d98 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 11 Nov 2022 13:39:28 +0100 Subject: [PATCH] [Mesh] Feature*: remove unused includes - also some sorting --- src/Mod/Mesh/App/Core/Grid.h | 7 ++-- src/Mod/Mesh/App/FeatureMeshCurvature.cpp | 14 +------ src/Mod/Mesh/App/FeatureMeshCurvature.h | 4 +- src/Mod/Mesh/App/FeatureMeshDefects.cpp | 12 ++---- src/Mod/Mesh/App/FeatureMeshDefects.h | 4 +- src/Mod/Mesh/App/FeatureMeshExport.cpp | 14 ++----- src/Mod/Mesh/App/FeatureMeshExport.h | 5 +-- src/Mod/Mesh/App/FeatureMeshImport.cpp | 13 +------ src/Mod/Mesh/App/FeatureMeshImport.h | 3 +- src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp | 16 ++------ src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h | 6 +-- src/Mod/Mesh/App/FeatureMeshSetOperations.cpp | 16 +------- src/Mod/Mesh/App/FeatureMeshSetOperations.h | 6 +-- src/Mod/Mesh/App/FeatureMeshSolid.cpp | 15 ++------ src/Mod/Mesh/App/FeatureMeshSolid.h | 3 +- src/Mod/Mesh/App/FeatureMeshTransform.cpp | 37 ++++++++----------- src/Mod/Mesh/App/FeatureMeshTransform.h | 6 +-- .../App/FeatureMeshTransformDemolding.cpp | 29 +++++---------- .../Mesh/App/FeatureMeshTransformDemolding.h | 7 +--- 19 files changed, 61 insertions(+), 156 deletions(-) diff --git a/src/Mod/Mesh/App/Core/Grid.h b/src/Mod/Mesh/App/Core/Grid.h index da9e198181..432a518c44 100644 --- a/src/Mod/Mesh/App/Core/Grid.h +++ b/src/Mod/Mesh/App/Core/Grid.h @@ -20,16 +20,16 @@ * * ***************************************************************************/ - #ifndef MESH_GRID_H #define MESH_GRID_H #include -#include "MeshKernel.h" -#include #include +#include "MeshKernel.h" + + #define MESH_CT_GRID 256 // Default value for number of elements per grid #define MESH_MAX_GRIDS 100000 // Default value for maximum number of grids #define MESH_CT_GRID_PER_AXIS 20 @@ -41,7 +41,6 @@ class MeshKernel; class MeshGeomFacet; class MeshGrid; -//#define MESHGRID_BBOX_EXTENSION 1.0e-3f #define MESHGRID_BBOX_EXTENSION 10.0f /** diff --git a/src/Mod/Mesh/App/FeatureMeshCurvature.cpp b/src/Mod/Mesh/App/FeatureMeshCurvature.cpp index 6cd65cc75b..b9cbcde7da 100644 --- a/src/Mod/Mesh/App/FeatureMeshCurvature.cpp +++ b/src/Mod/Mesh/App/FeatureMeshCurvature.cpp @@ -20,22 +20,12 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include -#include -#include -#include -#include "FeatureMeshCurvature.h" -#include "MeshFeature.h" #include "Core/Curvature.h" -#include "Core/Elements.h" -#include "Core/Iterator.h" +#include "FeatureMeshCurvature.h" +#include "MeshFeature.h" using namespace Mesh; diff --git a/src/Mod/Mesh/App/FeatureMeshCurvature.h b/src/Mod/Mesh/App/FeatureMeshCurvature.h index 16b155f479..ef48569285 100644 --- a/src/Mod/Mesh/App/FeatureMeshCurvature.h +++ b/src/Mod/Mesh/App/FeatureMeshCurvature.h @@ -20,17 +20,15 @@ * * ***************************************************************************/ - #ifndef FeatureMeshCurvature_H #define FeatureMeshCurvature_H #include #include -#include -#include "Mesh.h" #include "MeshProperties.h" + namespace Mesh { diff --git a/src/Mod/Mesh/App/FeatureMeshDefects.cpp b/src/Mod/Mesh/App/FeatureMeshDefects.cpp index 2f64dca44f..2445fd2662 100644 --- a/src/Mod/Mesh/App/FeatureMeshDefects.cpp +++ b/src/Mod/Mesh/App/FeatureMeshDefects.cpp @@ -20,18 +20,14 @@ * * ***************************************************************************/ - - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif +#include +#include "Core/Degeneration.h" +#include "Core/Triangulation.h" #include "FeatureMeshDefects.h" -#include "Core/Degeneration.h" -#include "Core/TopoAlgorithm.h" -#include "Core/Triangulation.h" -#include + using namespace Mesh; diff --git a/src/Mod/Mesh/App/FeatureMeshDefects.h b/src/Mod/Mesh/App/FeatureMeshDefects.h index e584dd1d88..133cfda957 100644 --- a/src/Mod/Mesh/App/FeatureMeshDefects.h +++ b/src/Mod/Mesh/App/FeatureMeshDefects.h @@ -20,14 +20,14 @@ * * ***************************************************************************/ - #ifndef MESH_FEATURE_MESH_DEFECTS_H #define MESH_FEATURE_MESH_DEFECTS_H -#include #include + #include "MeshFeature.h" + namespace Mesh { diff --git a/src/Mod/Mesh/App/FeatureMeshExport.cpp b/src/Mod/Mesh/App/FeatureMeshExport.cpp index 512a13b13e..0ac9ae5007 100644 --- a/src/Mod/Mesh/App/FeatureMeshExport.cpp +++ b/src/Mod/Mesh/App/FeatureMeshExport.cpp @@ -20,19 +20,11 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif -#include -#include -#include #include "FeatureMeshExport.h" #include "MeshFeature.h" -#include "Core/MeshIO.h" - using namespace Mesh; using namespace MeshCore; @@ -41,9 +33,9 @@ PROPERTY_SOURCE(Mesh::Export, App::DocumentObject) Export::Export() { - ADD_PROPERTY(Source ,(nullptr)); - ADD_PROPERTY(FileName,("")); - ADD_PROPERTY(Format ,("")); + ADD_PROPERTY(Source, (nullptr)); + ADD_PROPERTY(FileName, ("")); + ADD_PROPERTY(Format, ("")); } short Export::mustExecute() const diff --git a/src/Mod/Mesh/App/FeatureMeshExport.h b/src/Mod/Mesh/App/FeatureMeshExport.h index 7aeef97ce5..e3b91fd54d 100644 --- a/src/Mod/Mesh/App/FeatureMeshExport.h +++ b/src/Mod/Mesh/App/FeatureMeshExport.h @@ -20,15 +20,14 @@ * * ***************************************************************************/ - #ifndef MESH_FEATUREMESHEXPORT_H #define MESH_FEATUREMESHEXPORT_H #include -#include #include + #ifndef MESH_GLOBAL_H -#include +# include #endif namespace Mesh diff --git a/src/Mod/Mesh/App/FeatureMeshImport.cpp b/src/Mod/Mesh/App/FeatureMeshImport.cpp index 8d50eaaa19..b16d173df8 100644 --- a/src/Mod/Mesh/App/FeatureMeshImport.cpp +++ b/src/Mod/Mesh/App/FeatureMeshImport.cpp @@ -20,18 +20,10 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif -#include -#include -#include #include "FeatureMeshImport.h" -#include "Core/MeshIO.h" - using namespace Mesh; using namespace MeshCore; @@ -39,9 +31,8 @@ using namespace MeshCore; PROPERTY_SOURCE(Mesh::Import, Mesh::Feature) -Mesh::Import::Import() -{ - ADD_PROPERTY(FileName,("")); +Mesh::Import::Import() { + ADD_PROPERTY(FileName, ("")); } short Mesh::Import::mustExecute() const diff --git a/src/Mod/Mesh/App/FeatureMeshImport.h b/src/Mod/Mesh/App/FeatureMeshImport.h index 69e6b42d6e..94563df83e 100644 --- a/src/Mod/Mesh/App/FeatureMeshImport.h +++ b/src/Mod/Mesh/App/FeatureMeshImport.h @@ -20,15 +20,14 @@ * * ***************************************************************************/ - #ifndef FEATURE_MESH_IMPORT_H #define FEATURE_MESH_IMPORT_H #include "MeshFeature.h" -#include #include + namespace Mesh { diff --git a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp index 4c6b51345b..43b79759ff 100644 --- a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp +++ b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.cpp @@ -20,20 +20,12 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif -#include -#include -#include #include #include "Core/Algorithm.h" #include "Core/Evaluation.h" -#include "Core/Iterator.h" -#include "Core/Visitor.h" #include "FeatureMeshSegmentByMesh.h" @@ -46,10 +38,10 @@ PROPERTY_SOURCE(Mesh::SegmentByMesh, Mesh::Feature) SegmentByMesh::SegmentByMesh() { - ADD_PROPERTY(Source ,(nullptr)); - ADD_PROPERTY(Tool ,(nullptr)); - ADD_PROPERTY(Base ,(0.0,0.0,0.0)); - ADD_PROPERTY(Normal ,(0.0,0.0,1.0)); + ADD_PROPERTY(Source, (nullptr)); + ADD_PROPERTY(Tool, (nullptr)); + ADD_PROPERTY(Base, (0.0, 0.0, 0.0)); + ADD_PROPERTY(Normal, (0.0, 0.0, 1.0)); } short SegmentByMesh::mustExecute() const diff --git a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h index b872b70531..9d733bf17b 100644 --- a/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h +++ b/src/Mod/Mesh/App/FeatureMeshSegmentByMesh.h @@ -20,17 +20,13 @@ * * ***************************************************************************/ - #ifndef FEATURE_MESH_SEGMENTBYMESH_H #define FEATURE_MESH_SEGMENTBYMESH_H -#include +#include #include "MeshFeature.h" -#include -#include - namespace Mesh { diff --git a/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp b/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp index 1798aaf378..65fa4be42c 100644 --- a/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp +++ b/src/Mod/Mesh/App/FeatureMeshSetOperations.cpp @@ -20,21 +20,9 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif -#include -#include -#include - -#include "Core/MeshKernel.h" -#include "Core/Algorithm.h" -#include "Core/Evaluation.h" #include "Core/Iterator.h" -#include "Core/Visitor.h" - #include "Core/SetOperations.h" #include "FeatureMeshSetOperations.h" @@ -48,8 +36,8 @@ PROPERTY_SOURCE(Mesh::SetOperations, Mesh::Feature) SetOperations::SetOperations() { - ADD_PROPERTY(Source1 ,(nullptr)); - ADD_PROPERTY(Source2 ,(nullptr)); + ADD_PROPERTY(Source1, (nullptr)); + ADD_PROPERTY(Source2, (nullptr)); ADD_PROPERTY(OperationType, ("union")); } diff --git a/src/Mod/Mesh/App/FeatureMeshSetOperations.h b/src/Mod/Mesh/App/FeatureMeshSetOperations.h index 37f28d65ca..1b3f09e82a 100644 --- a/src/Mod/Mesh/App/FeatureMeshSetOperations.h +++ b/src/Mod/Mesh/App/FeatureMeshSetOperations.h @@ -20,17 +20,13 @@ * * ***************************************************************************/ - #ifndef FEATURE_MESH_SETOPERATIONS_H #define FEATURE_MESH_SETOPERATIONS_H -#include +#include #include "MeshFeature.h" -#include -#include - namespace Mesh { diff --git a/src/Mod/Mesh/App/FeatureMeshSolid.cpp b/src/Mod/Mesh/App/FeatureMeshSolid.cpp index 0af36b856c..f23026de0a 100644 --- a/src/Mod/Mesh/App/FeatureMeshSolid.cpp +++ b/src/Mod/Mesh/App/FeatureMeshSolid.cpp @@ -20,23 +20,16 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif -#include -#include -#include #include #include "FeatureMeshSolid.h" -#include "Mesh.h" namespace Mesh { - const App::PropertyIntegerConstraint::Constraints intSampling = {0,INT_MAX,1}; - const App::PropertyLength::Constraints floatRange = {0.0,FLT_MAX,1.0}; + const App::PropertyIntegerConstraint::Constraints intSampling = {0, INT_MAX, 1}; + const App::PropertyLength::Constraints floatRange = {0.0, FLT_MAX, 1.0}; } using namespace Mesh; @@ -46,8 +39,8 @@ PROPERTY_SOURCE(Mesh::Sphere, Mesh::Feature) Sphere::Sphere() { - ADD_PROPERTY(Radius ,(5.0)); - ADD_PROPERTY(Sampling ,(50)); + ADD_PROPERTY(Radius, (5.0)); + ADD_PROPERTY(Sampling, (50)); Radius.setConstraints(&floatRange); Sampling.setConstraints(&intSampling); } diff --git a/src/Mod/Mesh/App/FeatureMeshSolid.h b/src/Mod/Mesh/App/FeatureMeshSolid.h index 2895f5baff..e0c3964cc4 100644 --- a/src/Mod/Mesh/App/FeatureMeshSolid.h +++ b/src/Mod/Mesh/App/FeatureMeshSolid.h @@ -20,14 +20,13 @@ * * ***************************************************************************/ - #ifndef FEATURE_MESH_SOLID_H #define FEATURE_MESH_SOLID_H #include "MeshFeature.h" #include -#include + namespace Mesh { diff --git a/src/Mod/Mesh/App/FeatureMeshTransform.cpp b/src/Mod/Mesh/App/FeatureMeshTransform.cpp index 7c8debd743..776c937ecc 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransform.cpp +++ b/src/Mod/Mesh/App/FeatureMeshTransform.cpp @@ -20,47 +20,40 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif -#include -#include -#include #include -using Base::Matrix4D; + #include "FeatureMeshTransform.h" -#include -#include +using Base::Matrix4D; using namespace Mesh; using namespace MeshCore; PROPERTY_SOURCE(Mesh::Transform, Mesh::Feature) - Transform::Transform() { - ADD_PROPERTY(Source ,(nullptr)); - ADD_PROPERTY(Position,(Matrix4D())); + ADD_PROPERTY(Source, (nullptr)); + ADD_PROPERTY(Position, (Matrix4D())); } -App::DocumentObjectExecReturn *Transform::execute() +App::DocumentObjectExecReturn* Transform::execute() { /* - Feature *pcFirst = dynamic_cast(Source.getValue()); - if(!pcFirst || pcFirst->isError()) - return new App::DocumentObjectExecReturn("Unknown Error"); + Feature* pcFirst = dynamic_cast(Source.getValue()); + if (!pcFirst || pcFirst->isError()) + return new App::DocumentObjectExecReturn("Unknown Error"); - Matrix4D Matrix =Position.getValue(); + Matrix4D Matrix = Position.getValue(); - - MeshCore::MeshKernel *pcKernel = new MeshCore::MeshKernel(pcFirst->Mesh.getValue()); // Result Meshkernel - pcKernel->Transform(Matrix); - Mesh.setValue(pcKernel); + + MeshCore::MeshKernel* pcKernel = + new MeshCore::MeshKernel(pcFirst->Mesh.getValue());// Result Meshkernel + pcKernel->Transform(Matrix); + Mesh.setValue(pcKernel); */ - return App::DocumentObject::StdReturn; + return App::DocumentObject::StdReturn; } diff --git a/src/Mod/Mesh/App/FeatureMeshTransform.h b/src/Mod/Mesh/App/FeatureMeshTransform.h index 6c51ceb084..8402621d52 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransform.h +++ b/src/Mod/Mesh/App/FeatureMeshTransform.h @@ -20,14 +20,12 @@ * * ***************************************************************************/ - #ifndef FEATURE_MESH_TRANSFORM_H #define FEATURE_MESH_TRANSFORM_H -#include "MeshFeature.h" - #include -#include + +#include "MeshFeature.h" namespace Mesh diff --git a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.cpp b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.cpp index 8f9ae08245..9a6e8492c5 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.cpp +++ b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.cpp @@ -20,21 +20,10 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include -#include -#include -#include -#include #include "FeatureMeshTransformDemolding.h" -#include "Core/MeshIO.h" - using namespace Mesh; using namespace MeshCore; @@ -44,21 +33,21 @@ PROPERTY_SOURCE(Mesh::TransformDemolding, Mesh::Transform) TransformDemolding::TransformDemolding() { - ADD_PROPERTY(Source,(nullptr)); - ADD_PROPERTY(Rotation,(0.0)); - ADD_PROPERTY(Axis,(0.0,0.0,1.0)); + ADD_PROPERTY(Source, (nullptr)); + ADD_PROPERTY(Rotation, (0.0)); + ADD_PROPERTY(Axis, (0.0, 0.0, 1.0)); } App::DocumentObjectExecReturn *TransformDemolding::execute() -{/* +{ /* Feature *pcFirst = dynamic_cast(Source.getValue()); - if(!pcFirst || pcFirst->isError()) - return new App::DocumentObjectExecReturn("Unknown Error"); + if (!pcFirst || pcFirst->isError()) + return new App::DocumentObjectExecReturn("Unknown Error"); - MeshCore::MeshKernel *pcKernel = new MeshCore::MeshKernel(pcFirst->Mesh.getValue()); // Result Meshkernel - Base::Matrix4D trans(Base::Vector3f(0,0,0), Axis.getValue(), Rotation.getValue() ); + MeshCore::MeshKernel* pcKernel = new MeshCore::MeshKernel(pcFirst->Mesh.getValue()); // Result Meshkernel + Base::Matrix4D trans(Base::Vector3f(0, 0, 0), Axis.getValue(), Rotation.getValue()); //Matrix4D trans; - //trans.rotLine( Axis.getValue(), Rotation.getValue() ); + //trans.rotLine(Axis.getValue(), Rotation.getValue()); pcKernel->Transform(trans); Mesh.setValue(pcKernel); */ diff --git a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h index eafd295e86..4c63f47465 100644 --- a/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h +++ b/src/Mod/Mesh/App/FeatureMeshTransformDemolding.h @@ -20,15 +20,12 @@ * * ***************************************************************************/ - #ifndef FEATURE_MESH_TRANSFORM_DEMOLDING_H #define FEATURE_MESH_TRANSFORM_DEMOLDING_H -#include "FeatureMeshTransform.h" - #include -#include -#include + +#include "FeatureMeshTransform.h" namespace Mesh