[MeshPart] improve PreCompiled.h handling

2022-12-07 23:07:41 +01:00
parent b8c83a1c62
commit 8d6ea90cee
7 changed files with 55 additions and 190 deletions
--- a/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp
+++ b/src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp
@@ -26,18 +26,20 @@
 # include <memory>
 # include <stdexcept>
 # include <vector>
+
 # include <TopoDS.hxx>
 # include <TopoDS_Edge.hxx>
 # include <TopoDS_Face.hxx>
+
+# include <boost/python.hpp>
+# include <boost/python/call.hpp>
+# include <boost/python/class.hpp>
+# include <boost/python/copy_const_reference.hpp>
+# include <boost/python/module.hpp>
+# include <boost/python/return_value_policy.hpp>
+# include <boost/python/wrapper.hpp>
 #endif

-#include <boost/python.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/wrapper.hpp>
-#include <boost/python/call.hpp>
-#include <boost/python/copy_const_reference.hpp>
-#include <boost/python/return_value_policy.hpp>
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 #include <Eigen/Sparse>
--- a/src/Mod/MeshPart/App/Mesher.cpp
+++ b/src/Mod/MeshPart/App/Mesher.cpp
@@ -23,6 +23,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <algorithm>
+
 # include <BRepMesh_IncrementalMesh.hxx>
 # include <BRepTools.hxx>
 # include <Standard_Version.hxx>
--- a/src/Mod/MeshPart/App/PreCompiled.cpp
+++ b/src/Mod/MeshPart/App/PreCompiled.cpp
@@ -20,5 +20,4 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
--- a/src/Mod/MeshPart/App/PreCompiled.h
+++ b/src/Mod/MeshPart/App/PreCompiled.h
@@ -20,7 +20,6 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef __PRECOMPILED__
 #define __PRECOMPILED__

@@ -36,193 +35,57 @@
 #ifdef _PreComp_

 // standard
+#include <cmath>
+#include <iostream>
+
+// STL
 #include <algorithm>
 #include <array>
-#include <bitset>
-#include <cassert>
-#include <cmath>
-#include <cstdio>
-#include <iostream>
 #include <map>
 #include <memory>
 #include <set>
 #include <sstream>
 #include <stdexcept>
-#include <string>
 #include <vector>

-// OpenCasCade =====================================================================================
-// Base
-#include <Standard_Failure.hxx>
-#include <Standard_GUID.hxx>
-#include <Standard_AbortiveTransaction.hxx>
-#include <Standard_Address.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_Byte.hxx>
-#include <Standard_Character.hxx>
-#include <Standard_ConstructionError.hxx>
-#include <Standard_CString.hxx>
-#include <Standard_ctype.hxx>
-#include <Standard_DefineHandle.hxx>
-#include <Standard_DimensionError.hxx>
-#include <Standard_DimensionMismatch.hxx>
-#include <Standard_DivideByZero.hxx>
-#include <Standard_DomainError.hxx>
-#include <Standard_ErrorHandler.hxx>
-#include <Standard_ExtCharacter.hxx>
-#include <Standard_ExtString.hxx>
-#include <Standard_Failure.hxx>
-#include <Standard_GUID.hxx>
-#include <Standard_ImmutableObject.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_InternalType.hxx>
-#include <Standard_IStream.hxx>
-#include <Standard_KindOfType.hxx>
-#include <Standard_LicenseError.hxx>
-#include <Standard_LicenseNotFound.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_math.hxx>
-#include <Standard_MultiplyDefined.hxx>
-#include <Standard_NegativeValue.hxx>
-#include <Standard_NoMoreObject.hxx>
-#include <Standard_NoSuchObject.hxx>
-#include <Standard_NotImplemented.hxx>
-#include <Standard_NullObject.hxx>
-#include <Standard_NullValue.hxx>
-#include <Standard_NumericError.hxx>
-#include <Standard_OId.hxx>
-#include <Standard_OStream.hxx>
-#include <Standard_OutOfMemory.hxx>
-#include <Standard_OutOfRange.hxx>
-#include <Standard_Overflow.hxx>
-#include <Standard_Persistent.hxx>
-#include <Standard_Persistent_proto.hxx>
-#include <Standard_PrimitiveTypes.hxx>
-#include <Standard_ProgramError.hxx>
-#include <Standard_RangeError.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_ShortReal.hxx>
-#include <Standard_SStream.hxx>
-#include <Standard_Static.hxx>
-#include <Standard_Storable.hxx>
-#include <Standard_Stream.hxx>
-#include <Standard_String.hxx>
-#include <Standard_TooManyUsers.hxx>
-#include <Standard_Transient.hxx>
-#include <Standard_Transient_proto.hxx>
-#include <Standard_Type.hxx>
-#include <Standard_TypeDef.hxx>
-#include <Standard_TypeMismatch.hxx>
-#include <Standard_Underflow.hxx>
-#include <Standard_UUID.hxx>
-#include <Standard_Version.hxx>
-#include <Standard_WayOfLife.hxx>
+// boost
+#include <boost/python.hpp>
+#include <boost/python/call.hpp>
+#include <boost/python/class.hpp>
+#include <boost/python/copy_const_reference.hpp>
+#include <boost/python/module.hpp>
+#include <boost/python/return_value_policy.hpp>
+#include <boost/python/wrapper.hpp>

+// OpenCasCade
 #include <Bnd_Box.hxx>
 #include <BndLib_Add3dCurve.hxx>
-#include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepBuilderAPI.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakePolygon.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
-#include <BRepCheck_Result.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepMesh_IncrementalMesh.hxx>
-#include <BRepPrimAPI_MakeBox.hxx>
-#include <BRepPrimAPI_MakeCylinder.hxx>
 #include <BRepTools.hxx>
-#include <BRepTools_ShapeSet.hxx>
-
-#include <GCE2d_MakeSegment.hxx>
-#include <GCPnts_TangentialDeflection.hxx>
+#include <GCPnts_AbscissaPoint.hxx>
 #include <GCPnts_UniformDeflection.hxx>
 #include <GCPnts_UniformAbscissa.hxx>
-#include <Geom_Axis2Placement.hxx>
-#include <Geom_BezierCurve.hxx>
-#include <Geom_BezierSurface.hxx>
-#include <Geom_BSplineCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
-#include <Geom_CartesianPoint.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_ConicalSurface.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Hyperbola.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Parabola.hxx>
+#include <Geom_Curve.hxx>
 #include <Geom_Plane.hxx>
-#include <Geom_SphericalSurface.hxx>
 #include <Geom_Surface.hxx>
-#include <Geom_SurfaceOfLinearExtrusion.hxx>
-#include <Geom_SurfaceOfRevolution.hxx>
-#include <Geom_ToroidalSurface.hxx>
-#include <Geom2d_BezierCurve.hxx>
-#include <Geom2d_BSplineCurve.hxx>
-#include <Geom2d_Curve.hxx>
-#include <Geom2d_TrimmedCurve.hxx>
-#include <Geom2dAdaptor_Curve.hxx>
-#include <GeomAbs_CurveType.hxx>
-#include <GeomAdaptor_Curve.hxx>
 #include <GeomAPI_IntCS.hxx>
-#include <GeomTools_Curve2dSet.hxx>
-#include <gp_Ax2d.hxx>
-#include <gp_Circ.hxx>
-#include <gp_Circ2d.hxx>
-#include <gp_Cone.hxx>
-#include <gp_Cylinder.hxx>
-#include <gp_Dir2d.hxx>
-#include <gp_Elips.hxx>
-#include <gp_Hypr.hxx>
-#include <gp_Lin2d.hxx>
-#include <gp_Lin.hxx>
-#include <gp_Parab.hxx>
-#include <gp_Pnt2d.hxx>
-#include <gp_Pnt.hxx>
 #include <gp_Pln.hxx>
-#include <gp_Sphere.hxx>
-#include <gp_Torus.hxx>
-#include <gp_Vec.hxx>
-#include <gp_Vec2d.hxx>
-
-#include <Precision.hxx>
 #include <Poly_Triangulation.hxx>
-#include <Quantity_NameOfColor.hxx>
-#include <Quantity_PhysicalQuantity.hxx>
-#include <Quantity_TypeOfColor.hxx>
-
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColgp_HArray1OfPnt2d.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
+#include <Standard_Failure.hxx>
+#include <Standard_Version.hxx>
 #include <TColStd_Array1OfReal.hxx>
-#include <TColStd_HSequenceOfTransient.hxx>
-#include <TColStd_MapIteratorOfMapOfTransient.hxx>
-#include <TColStd_MapOfTransient.hxx>
-#include <TColStd_SequenceOfExtendedString.hxx>
-#include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopLoc_Location.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopoDS_ListIteratorOfListOfShape.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-
-#include <UnitsAPI.hxx>

 #endif // _PreComp_
 #endif
-
--- a/src/Mod/MeshPart/Gui/CurveOnMesh.cpp
+++ b/src/Mod/MeshPart/Gui/CurveOnMesh.cpp
@@ -27,7 +27,19 @@
 # include <QPointer>
 # include <QStatusBar>
 # include <QTimer>
+
+# include <gp_Pnt.hxx>
+# include <TColgp_Array1OfPnt.hxx>
+# include <GeomAPI_PointsToBSpline.hxx>
+# include <Geom_BSplineCurve.hxx>
+# include <BRep_Tool.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
 # include <BRepBuilderAPI_MakePolygon.hxx>
+# include <BRepMesh_IncrementalMesh.hxx>
+# include <Poly_Polygon3D.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Wire.hxx>
+
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
@@ -67,17 +79,7 @@
 #define HAVE_ATANH
 #endif

-#include <gp_Pnt.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <GeomAPI_PointsToBSpline.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Standard_Failure.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Wire.hxx>
+

 /* XPM */
 static const char *cursor_curveonmesh[]={
--- a/src/Mod/MeshPart/Gui/PreCompiled.cpp
+++ b/src/Mod/MeshPart/Gui/PreCompiled.cpp
@@ -20,5 +20,4 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
--- a/src/Mod/MeshPart/Gui/PreCompiled.h
+++ b/src/Mod/MeshPart/Gui/PreCompiled.h
@@ -20,7 +20,6 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef __PRECOMPILED_GUI__
 #define __PRECOMPILED_GUI__

@@ -34,34 +33,34 @@

 #ifdef _PreComp_

-// standard
-#include <iostream>
-#include <cassert>
-#include <cmath>
-
 // STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
-#include <algorithm>
-#include <stack>
-#include <queue>
-#include <bitset>
+#include <cfloat>
+#include <sstream>

 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif

-
 // Qt Toolkit
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
 #endif

 // OCCT
+#include <BRep_Builder.hxx>
+#include <BRep_Tool.hxx>
+#include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakePolygon.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <Geom_BSplineCurve.hxx>
+#include <GeomAPI_PointsToBSpline.hxx>
+#include <gp_Pnt.hxx>
+#include <Poly_Polygon3D.hxx>
+#include <TColgp_Array1OfPnt.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Compound.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Wire.hxx>

 #endif //_PreComp_