continue PCH on Part module

2019-05-01 16:10:38 +02:00
parent 4d8f85db72
commit dc1720a7f2
14 changed files with 100 additions and 63 deletions
--- a/src/Mod/Part/App/AppPartPy.cpp
+++ b/src/Mod/Part/App/AppPartPy.cpp
@@ -79,20 +79,19 @@
 # include <TopTools_ListIteratorOfListOfShape.hxx>
 # include <Precision.hxx>
 # include <Standard_Version.hxx>
+# include <BRepOffsetAPI_ThruSections.hxx>
+# include <BSplCLib.hxx>
+# include <GeomFill_AppSurf.hxx>
+# include <GeomFill_Line.hxx>
+# include <GeomFill_Pipe.hxx>
+# include <GeomFill_SectionGenerator.hxx>
+# include <NCollection_List.hxx>
+# include <BRepFill_Filling.hxx>
 #endif

 #include <CXX/Extensions.hxx>
 #include <CXX/Objects.hxx>

-#include <BRepOffsetAPI_ThruSections.hxx>
-#include <BSplCLib.hxx>
-#include <GeomFill_AppSurf.hxx>
-#include <GeomFill_Line.hxx>
-#include <GeomFill_Pipe.hxx>
-#include <GeomFill_SectionGenerator.hxx>
-#include <NCollection_List.hxx>
-#include <BRepFill_Filling.hxx>
-
 #include <Base/Console.h>
 #include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
--- a/src/Mod/Part/App/Attacher.cpp
+++ b/src/Mod/Part/App/Attacher.cpp
@@ -55,9 +55,9 @@
 # include <GProp_PrincipalProps.hxx>
 # include <BRepGProp.hxx>
 # include <GeomLib_IsPlanarSurface.hxx>
+# include <BRepLProp_SLProps.hxx>
+# include <GeomAPI_ProjectPointOnCurve.hxx>
 #endif
-#include <BRepLProp_SLProps.hxx>
-#include <GeomAPI_ProjectPointOnCurve.hxx>

 #include "Attacher.h"
 #include "AttachExtension.h"
--- a/src/Mod/Part/App/OpenCascadeAll.h
+++ b/src/Mod/Part/App/OpenCascadeAll.h
@@ -114,7 +114,10 @@
 #include <TopTools_HSequenceOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
+#include <TopTools_DataMapOfIntegerShape.hxx>
+#include <TopTools_DataMapOfIntegerListOfShape.hxx>

+#include <BOPAlgo_ArgumentAnalyzer.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepAdaptor_CompCurve.hxx>
 #include <BRepAdaptor_Curve.hxx>
@@ -126,8 +129,12 @@
 #include <BRepAlgoAPI_Fuse.hxx>
 #include <BRepAlgoAPI_Section.hxx>
 #if OCC_VERSION_HEX < 0x070300
-# include <BRepAlgo_Fuse.hxx>
+#include <BRepAlgo_Fuse.hxx>
 #endif
+#if OCC_VERSION_HEX >= 0x070300
+#include <BRepAlgoAPI_Defeaturing.hxx>
+#endif
+#include <BRepAlgo_NormalProjection.hxx>
 #include <BRepBndLib.hxx>
 #include <Bnd_Box.hxx>
 #include <BRepBuilderAPI.hxx>
@@ -140,22 +147,31 @@
 #include <BRepBuilderAPI_MakePolygon.hxx>
 #include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
+#include <BRepBuilderAPI_Sewing.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 #include <BRepClass_FaceClassifier.hxx>
+#if OCC_VERSION_HEX >= 0x060600
+#include <BRepClass3d.hxx>
+#endif
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepExtrema_MapOfIntegerPackedMapOfInteger.hxx>
+#if OCC_VERSION_HEX >= 0x060801
 #include <BRepExtrema_ShapeProximity.hxx>
+#endif
 #include <BRepFeat_SplitShape.hxx>
 #include <BRepFilletAPI_MakeChamfer.hxx>
 #include <BRepFilletAPI_MakeFillet.hxx>
 #include <BRepFill.hxx>
+#include <BRepFill_Filling.hxx>
 #include <BRepGProp.hxx>
+#include <BRepGProp_Face.hxx>
 #include <BRepLProp_CLProps.hxx>
 #include <BRepLProp_SLProps.hxx>
 #include <BRepLProp_CurveTool.hxx>
 #include <BRepLib.hxx>
 #include <BRepLib_FindSurface.hxx>
+#include <BRepLib_FuseEdges.hxx>
 #include <BRepOffsetAPI_MakeOffset.hxx>
 #include <BRepOffsetAPI_MakePipe.hxx>
 #include <BRepOffsetAPI_MakePipeShell.hxx>
@@ -179,6 +195,7 @@
 #include <BRep_Tool.hxx>
 #include <BRepTools_ShapeSet.hxx>
 #include <BRepTools_WireExplorer.hxx>
+#include <BRepTopAdaptor_FClass2d.hxx>
 #include <BRepBuilderAPI_Copy.hxx>
 #include <BRepCheck_Analyzer.hxx>
 #include <BRepCheck_Result.hxx>
@@ -241,6 +258,7 @@
 #include <Geom_CartesianPoint.hxx>
 #include <Geom_Line.hxx>
 #include <Geom_OffsetCurve.hxx>
+#include <Geom_RectangularTrimmedSurface.hxx>
 #include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <GeomAbs_CurveType.hxx>
@@ -284,6 +302,9 @@
 #include <GeomFill_LocationLaw.hxx>
 #include <GeomFill_Pipe.hxx>
 #include <GeomFill_Sweep.hxx>
+#include <GeomFill_AppSurf.hxx>
+#include <GeomFill_Line.hxx>
+#include <GeomFill_SectionGenerator.hxx>
 #include <GeomLib.hxx>
 #include <GeomLib_IsPlanarSurface.hxx>
 #include <GeomLProp_SLProps.hxx>
@@ -323,10 +344,13 @@

 #include <Approx_Curve3d.hxx>

+#include <BSplCLib.hxx>
+
 #include <GProp_PGProps.hxx>
 #include <GProp_PrincipalProps.hxx>
 #include <LProp_NotDefined.hxx>

+#include <HLRAppli_ReflectLines.hxx>
 #include <IntTools_FClass2d.hxx>
 #include <Law_Constant.hxx>
 #include <MMgt_TShared.hxx>
@@ -343,18 +367,23 @@
 // Shape
 #include <ShapeAlgo_AlgoContainer.hxx>
 #include <ShapeAnalysis.hxx>
+#include <ShapeAnalysis_Curve.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 #include <ShapeAnalysis_FreeBounds.hxx>
 #include <ShapeAnalysis_Shell.hxx>
 #include <ShapeAnalysis_Surface.hxx>
+#include <ShapeAnalysis_FreeBoundsProperties.hxx>
+#include <ShapeAnalysis_ShapeTolerance.hxx>
 #include <ShapeConstruct_Curve.hxx>
 #include <ShapeExtend_Explorer.hxx>
 #include <ShapeFix_Shape.hxx>
+#include <ShapeFix_ShapeTolerance.hxx>
 #include <ShapeFix_Wire.hxx>
 #include <ShapeUpgrade_ShellSewing.hxx>
 #include <ShapeUpgrade_RemoveInternalWires.hxx>

 // Import
+#include <APIHeaderSection_MakeHeader.hxx>
 #include <STEPControl_Controller.hxx>
 #include <STEPControl_Writer.hxx>
 #include <STEPControl_Reader.hxx>
@@ -366,6 +395,11 @@
 #include <IGESControl_Reader.hxx>
 #include <StlAPI_Writer.hxx>
 #include <Interface_Static.hxx>
+#include <Transfer_TransientProcess.hxx>
+#include <XSControl_TransferWriter.hxx>
+#include <XSControl_WorkSession.hxx>
+#include <BinTools.hxx>
+#include <BinTools_ShapeSet.hxx>


 #endif // __OpenCascadeAll__
--- a/src/Mod/Part/App/TopoShape.cpp
+++ b/src/Mod/Part/App/TopoShape.cpp
@@ -155,7 +155,6 @@
 #if OCC_VERSION_HEX < 0x070300
 # include <BRepAlgo_Fuse.hxx>
 #endif
-#endif
 # include <BinTools.hxx>
 # include <BinTools_ShapeSet.hxx>
 # include <Poly_Polygon3D.hxx>
@@ -178,6 +177,7 @@
 #if OCC_VERSION_HEX >= 0x070300
 #include <BRepAlgoAPI_Defeaturing.hxx>
 #endif
+#endif // _PreComp_

 #include <Base/Builder3D.h>
 #include <Base/FileInfo.h>
--- a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp
@@ -22,9 +22,11 @@


 #include "PreCompiled.h"
+#ifndef _PreComp_
 #include <BRep_Builder.hxx>
 #include <Standard_Failure.hxx>
 #include <TopoDS_CompSolid.hxx>
+#endif

 #include "OCCError.h"
 #include "TopoShape.h"
--- a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp
@@ -24,6 +24,7 @@
 #include "PreCompiled.h"

 #include "TopoShape.h"
+#ifndef _PreComp_
 #include <BRep_Builder.hxx>
 #include <Standard_Failure.hxx>
 #include <TopoDS_Compound.hxx>
@@ -31,6 +32,7 @@
 #include <ShapeAnalysis_FreeBounds.hxx>
 #include <Precision.hxx>
 #include <TopExp_Explorer.hxx>
+#endif

 #include "OCCError.h"

--- a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp
@@ -63,17 +63,16 @@
 # include <ShapeAnalysis_Edge.hxx>
 # include <Standard_Failure.hxx>
 # include <Standard_Version.hxx>
+# include <BRepGProp.hxx>
+# include <GProp_GProps.hxx>
+# include <GCPnts_AbscissaPoint.hxx>
+# include <GCPnts_UniformAbscissa.hxx>
+# include <GCPnts_UniformDeflection.hxx>
+# include <GCPnts_TangentialDeflection.hxx>
+# include <GCPnts_QuasiUniformAbscissa.hxx>
+# include <GCPnts_QuasiUniformDeflection.hxx>
 #endif

-#include <BRepGProp.hxx>
-#include <GProp_GProps.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
-#include <GCPnts_UniformAbscissa.hxx>
-#include <GCPnts_UniformDeflection.hxx>
-#include <GCPnts_TangentialDeflection.hxx>
-#include <GCPnts_QuasiUniformAbscissa.hxx>
-#include <GCPnts_QuasiUniformDeflection.hxx>
-
 #include <Base/Vector3D.h>
 #include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
--- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp
@@ -60,18 +60,17 @@
 # include <TColgp_Array1OfPnt2d.hxx>
 # include <TopExp_Explorer.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
+# include <BRepTopAdaptor_FClass2d.hxx>
+# include <BRepPrimAPI_MakeHalfSpace.hxx>
+# include <BRepGProp.hxx>
+# include <GProp_GProps.hxx>
+# include <GProp_PrincipalProps.hxx>
+# include <BRepLProp_SurfaceTool.hxx>
+# include <BRepGProp_Face.hxx>
+# include <GeomLProp_SLProps.hxx>
+# include <BRep_Tool.hxx>
 #endif

-#include <BRepTopAdaptor_FClass2d.hxx>
-#include <BRepPrimAPI_MakeHalfSpace.hxx>
-#include <BRepGProp.hxx>
-#include <GProp_GProps.hxx>
-#include <GProp_PrincipalProps.hxx>
-#include <BRepLProp_SurfaceTool.hxx>
-#include <BRepGProp_Face.hxx>
-#include <GeomLProp_SLProps.hxx>
-#include <BRep_Tool.hxx>
-
 #include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>

--- a/src/Mod/Part/App/TopoShapePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapePyImp.cpp
@@ -58,16 +58,15 @@
 # include <TopLoc_Location.hxx>
 # include <TopExp.hxx>
 # include <Precision.hxx>
+# include <HLRAppli_ReflectLines.hxx>
+# include <BRepGProp.hxx>
+# include <GProp_GProps.hxx>
+# include <BRepAlgo_NormalProjection.hxx>
+# include <ShapeAnalysis_ShapeTolerance.hxx>
+# include <ShapeFix_ShapeTolerance.hxx>
+# include <Standard_Version.hxx>
 #endif

-#include <HLRAppli_ReflectLines.hxx>
-#include <BRepGProp.hxx>
-#include <GProp_GProps.hxx>
-#include <BRepAlgo_NormalProjection.hxx>
-#include <ShapeAnalysis_ShapeTolerance.hxx>
-#include <ShapeFix_ShapeTolerance.hxx>
-#include <Standard_Version.hxx>
-

 #include <Base/GeometryPyCXX.h>
 #include <Base/Matrix.h>
--- a/src/Mod/Part/App/TopoShapeShellPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeShellPyImp.cpp
@@ -27,6 +27,7 @@
 # include <BRep_Builder.hxx>
 # include <BRepCheck_Analyzer.hxx>
 # include <BRepGProp.hxx>
+# include <BRepPrimAPI_MakeHalfSpace.hxx>
 # include <GProp_GProps.hxx>
 # include <GProp_PrincipalProps.hxx>
 # include <TopoDS.hxx>
@@ -35,7 +36,6 @@
 # include <ShapeAnalysis_Shell.hxx>
 #endif

-#include <BRepPrimAPI_MakeHalfSpace.hxx>

 #include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>
--- a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp
@@ -34,7 +34,7 @@
 #include <GProp_PrincipalProps.hxx>
 #include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRepLib.hxx>
-# include <Precision.hxx>
+#include <Precision.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Solid.hxx>
--- a/src/Mod/Part/App/TopoShapeWirePyImp.cpp
+++ b/src/Mod/Part/App/TopoShapeWirePyImp.cpp
@@ -36,17 +36,16 @@
 # include <TopoDS.hxx>
 # include <TopoDS_Wire.hxx>
 # include <gp_Ax1.hxx>
+# include <BRepGProp.hxx>
+# include <GProp_GProps.hxx>
+# include <GProp_PrincipalProps.hxx>
+# include <GCPnts_UniformAbscissa.hxx>
+# include <GCPnts_UniformDeflection.hxx>
+# include <GCPnts_TangentialDeflection.hxx>
+# include <GCPnts_QuasiUniformAbscissa.hxx>
+# include <GCPnts_QuasiUniformDeflection.hxx>
 #endif

-#include <BRepGProp.hxx>
-#include <GProp_GProps.hxx>
-#include <GProp_PrincipalProps.hxx>
-#include <GCPnts_UniformAbscissa.hxx>
-#include <GCPnts_UniformDeflection.hxx>
-#include <GCPnts_TangentialDeflection.hxx>
-#include <GCPnts_QuasiUniformAbscissa.hxx>
-#include <GCPnts_QuasiUniformDeflection.hxx>
-
 #include <Base/VectorPy.h>
 #include <Base/GeometryPyCXX.h>

--- a/src/Mod/Part/App/edgecluster.cpp
+++ b/src/Mod/Part/App/edgecluster.cpp
@@ -23,19 +23,21 @@


 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <TopExp_Explorer.hxx>
+# include <TopAbs_ShapeEnum.hxx>
+# include <BRep_Tool.hxx>
+# include <TopExp.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Shape.hxx>
+# include <TopoDS_Vertex.hxx>
+# include <TopoDS_Compound.hxx>
+# include <BRepAdaptor_Curve.hxx>
+# include <GCPnts_QuasiUniformDeflection.hxx>
+# include <BRep_Builder.hxx>
+#endif

 #include "edgecluster.h"
-#include <TopExp_Explorer.hxx>
-#include <TopAbs_ShapeEnum.hxx>
-#include <BRep_Tool.hxx>
-#include <TopExp.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Compound.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <GCPnts_QuasiUniformDeflection.hxx>
-#include <BRep_Builder.hxx>


 using namespace Part;
--- a/src/Mod/Part/App/modelRefine.cpp
+++ b/src/Mod/Part/App/modelRefine.cpp
@@ -22,7 +22,7 @@


 #include "PreCompiled.h"
-#include <Base/Tools.h>
+#ifndef _PreComp_
 #include <algorithm>
 #include <iterator>
 #include <Geom_Surface.hxx>
@@ -65,6 +65,8 @@
 #include <BRepGProp.hxx>
 #include <GProp_GProps.hxx>
 #include <Standard_Version.hxx>
+#endif
+#include <Base/Tools.h>
 #include <Base/Console.h>
 #include "modelRefine.h"