Merge branch 'FreeCAD:master' into master

src/Mod/Drawing/App/AppDrawing.cpp

@@ -12,17 +12,17 @@
 #include "PreCompiled.h"
 
 #include <Base/Console.h>
-#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
- 
-#include "FeaturePage.h"
-#include "FeatureView.h"
-#include "FeatureViewPart.h"
-#include "FeatureViewAnnotation.h"
-#include "FeatureViewSymbol.h"
-#include "FeatureProjection.h"
-#include "FeatureViewSpreadsheet.h"
+#include <Base/PyObjectBase.h>
+
 #include "FeatureClip.h"
+#include "FeaturePage.h"
+#include "FeatureProjection.h"
+#include "FeatureView.h"
+#include "FeatureViewAnnotation.h"
+#include "FeatureViewPart.h"
+#include "FeatureViewSpreadsheet.h"
+#include "FeatureViewSymbol.h"
 #include "PageGroup.h"
 
 

src/Mod/Drawing/App/AppDrawingPy.cpp

@@ -21,18 +21,17 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <boost/regex.hpp>
+#endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
-#include <Mod/Part/App/TopoShapePy.h>
-#include "ProjectionAlgos.h"
 #include <Base/Console.h>
 #include <Base/Interpreter.h>
 #include <Base/VectorPy.h>
-#include <boost/regex.hpp>
-
 #include <Mod/Part/App/OCCError.h>
+#include <Mod/Part/App/TopoShapePy.h>
+
+#include "ProjectionAlgos.h"
 
 
 using namespace std;

src/Mod/Drawing/App/CMakeLists.txt

@@ -59,6 +59,18 @@ SOURCE_GROUP("Mod" FILES ${Drawing_SRCS})
 SOURCE_GROUP("Features" FILES ${Features_SRCS})
 SOURCE_GROUP("Algorithms" FILES ${DrawingAlgos_SRCS})
 
+SET(DrawingComplete_SRCS
+    ${Drawing_SRCS}
+    ${DrawingAlgos_SRCS}
+    ${Features_SRCS}
+)
+
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${DrawingComplete_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(Drawing PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 add_library(Drawing SHARED ${Drawing_SRCS} ${Features_SRCS} ${DrawingAlgos_SRCS})
 target_link_libraries(Drawing ${Drawing_LIBS})
 

src/Mod/Drawing/App/DrawingExport.cpp

@@ -20,67 +20,44 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <sstream>
 # include <cmath>
+# include <sstream>
+
+# include <Approx_Curve3d.hxx>
+# include <BRep_Tool.hxx>
 # include <BRepAdaptor_Curve.hxx>
-# include <Geom_Circle.hxx>
+# include <BRepBuilderAPI_MakeEdge.hxx>
+# include <BRepLProp_CLProps.hxx>
+# include <Geom_BezierCurve.hxx>
+# include <Geom_BSplineCurve.hxx>
+# include <GeomConvert_BSplineCurveKnotSplitting.hxx>
+# include <GeomConvert_BSplineCurveToBezierCurve.hxx>
 # include <gp_Circ.hxx>
+# include <gp_Dir.hxx>
 # include <gp_Elips.hxx>
+# include <gp_Pnt.hxx>
+# include <gp_Vec.hxx>
+# include <Poly_Polygon3D.hxx>
+# include <Standard_Failure.hxx>
+# include <Standard_Version.hxx>
+# include <TColStd_Array1OfReal.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopoDS_Shape.hxx>
+# if OCC_VERSION_HEX < 0x070600
+#  include <BRepAdaptor_HCurve.hxx>
+# endif
 #endif
 
-#include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <HLRBRep_Algo.hxx>
-#include <TopoDS_Shape.hxx>
-#include <HLRTopoBRep_OutLiner.hxx>
-//#include <BRepAPI_MakeOutLine.hxx>
-#include <HLRAlgo_Projector.hxx>
-#include <HLRBRep_ShapeBounds.hxx>
-#include <HLRBRep_HLRToShape.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Vec.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_Triangulation.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <BRep_Tool.hxx>
-
-#include <BRepAdaptor_CompCurve.hxx>
-#include <Approx_Curve3d.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BezierCurve.hxx>
-#include <GeomConvert_BSplineCurveToBezierCurve.hxx>
-#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
-#include <Geom2d_BSplineCurve.hxx>
-#include <BRepLProp_CLProps.hxx>
-#include <Standard_Failure.hxx>
-#include <Standard_Version.hxx>
-#if OCC_VERSION_HEX < 0x070600
-#include <BRepAdaptor_HCurve.hxx>
-#endif
-
-#include "DrawingExport.h"
 #include <Base/Tools.h>
 #include <Base/Vector3D.h>
 
+#include "DrawingExport.h"
+
+
 #if OCC_VERSION_HEX >= 0x070600
 using BRepAdaptor_HCurve = BRepAdaptor_Curve;
 #endif

src/Mod/Drawing/App/DrawingExport.h

@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWING_EXPORT_H
 #define DRAWING_EXPORT_H
 
@@ -28,6 +27,7 @@
 #include <TopoDS_Edge.hxx>
 #include <Mod/Drawing/DrawingGlobal.h>
 
+
 class TopoDS_Shape;
 class BRepAdaptor_Curve;
 

src/Mod/Drawing/App/FeatureClip.cpp

@@ -20,28 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <iostream>
 # include <sstream>
 #endif
 
-
-#include <Base/Exception.h>
-#include <Base/Console.h>
-#include <Base/FileInfo.h>
-#include <App/Application.h>
-#include <boost/regex.hpp>
-#include <iostream>
-
 #include "FeatureClip.h"
 #include "FeatureView.h"
 
+
 using namespace Drawing;
 using namespace std;
 
-
 //===========================================================================
 // FeaturePage
 //===========================================================================
@@ -99,8 +90,8 @@ App::DocumentObjectExecReturn *FeatureClip::execute(void)
     svg << "<g clip-path=\"url(#" << Label.getValue() << ")\">" << endl;
 
     // get through the children and collect all the views
-    const std::vector<App::DocumentObject*> &Grp = Group.getValues();
-    for (std::vector<App::DocumentObject*>::const_iterator It= Grp.begin();It!=Grp.end();++It) {
+    const vector<App::DocumentObject*> &Grp = Group.getValues();
+    for (vector<App::DocumentObject*>::const_iterator It= Grp.begin();It!=Grp.end();++It) {
         if ((*It)->getTypeId().isDerivedFrom(Drawing::FeatureView::getClassTypeId())) {
             Drawing::FeatureView *View = static_cast<Drawing::FeatureView *>(*It);
             svg << View->ViewResult.getValue() << endl;

src/Mod/Drawing/App/FeatureClip.h

@@ -20,15 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _FeatureClip_h_
 #define _FeatureClip_h_
 
-
 #include <App/DocumentObjectGroup.h>
 #include <App/PropertyStandard.h>
 #include <Mod/Drawing/DrawingGlobal.h>
 
+
 namespace Drawing
 {
 

src/Mod/Drawing/App/FeaturePage.cpp

@@ -20,31 +20,28 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <fstream>
 # include <iostream>
+# include <iterator>
 # include <sstream>
+
+# include <boost/regex.hpp>
 #endif
 
-
-#include <Base/Exception.h>
+#include <App/Application.h>
 #include <Base/Console.h>
 #include <Base/FileInfo.h>
-#include <App/Application.h>
-#include <boost/regex.hpp>
-#include <iterator>
 
 #include "FeaturePage.h"
-#include "FeatureView.h"
 #include "FeatureClip.h"
+#include "FeatureView.h"
+
 
 using namespace Drawing;
 using namespace std;
 
-
 //===========================================================================
 // FeaturePage
 //===========================================================================

src/Mod/Drawing/App/FeaturePage.h

@@ -20,13 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _FeaturePage_h_
 #define _FeaturePage_h_
 
-
 #include <App/DocumentObjectGroup.h>
-#include <App/PropertyStandard.h>
 #include <App/PropertyFile.h>
 #include <Mod/Drawing/DrawingGlobal.h>
 
@@ -34,7 +31,6 @@
 namespace Drawing
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class DrawingExport FeaturePage: public App::DocumentObjectGroup

src/Mod/Drawing/App/FeatureProjection.cpp

@@ -20,36 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
+
 # include <BRep_Builder.hxx>
 # include <Standard_Failure.hxx>
 # include <TopoDS_Compound.hxx>
 #endif
 
-
-#include <Base/Writer.h>
-#include <Base/Reader.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-
 #include "FeatureProjection.h"
 #include "ProjectionAlgos.h"
 
+
 using namespace Drawing;
 
-
 PROPERTY_SOURCE(Drawing::FeatureProjection, Part::Feature)
 
-
 FeatureProjection::FeatureProjection() 
 {
     static const char *group = "Projection";
     ADD_PROPERTY_TYPE(Source ,(nullptr),group,App::Prop_None,"Shape to project");
-    ADD_PROPERTY_TYPE(Direction ,(Base::Vector3d(0,0,1)),group,App::Prop_None,"Projection direction");
+    ADD_PROPERTY_TYPE(Direction, (Base::Vector3d(0, 0, 1)), group, App::Prop_None,
+                      "Projection direction");
     ADD_PROPERTY_TYPE(VCompound        ,(true),group,App::Prop_None,"Projection parameter");
     ADD_PROPERTY_TYPE(Rg1LineVCompound ,(true),group,App::Prop_None,"Projection parameter");
     ADD_PROPERTY_TYPE(RgNLineVCompound ,(true),group,App::Prop_None,"Projection parameter");

src/Mod/Drawing/App/FeatureProjection.h

@@ -20,22 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWING_FEATUREPROJECTION
 #define DRAWING_FEATUREPROJECTION
 
-
 #include <App/DocumentObject.h>
-#include <App/PropertyStandard.h>
-#include <App/PropertyGeo.h>
-#include <Mod/Part/App/PartFeature.h>
+#include <App/PropertyLinks.h>
 #include <Mod/Drawing/DrawingGlobal.h>
+#include <Mod/Part/App/PartFeature.h>
 
 
 namespace Drawing
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class DrawingExport FeatureProjection : public Part::Feature

src/Mod/Drawing/App/FeatureView.cpp

@@ -20,24 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
 # include <Standard_Failure.hxx>
 #endif
 
-
-#include <Base/Writer.h>
-#include <Base/Reader.h>
 #include <Base/Exception.h>
-#include <Base/FileInfo.h>
 
 #include "FeatureView.h"
 
-using namespace Drawing;
 
+using namespace Drawing;
 
 //===========================================================================
 // FeatureView
@@ -46,21 +40,25 @@ using namespace Drawing;
 PROPERTY_SOURCE(Drawing::FeatureView, App::DocumentObject)
 
 
-
 FeatureView::FeatureView(void) 
 {
-    static const char *group = "Drawing view";
-    ADD_PROPERTY_TYPE(X ,(0),group,App::Prop_None,"X position of the view on the drawing in modelling units (mm)");
-    ADD_PROPERTY_TYPE(Y ,(0),group,App::Prop_None,"Y position of the view on the drawing in modelling units (mm)");
-    ADD_PROPERTY_TYPE(Scale ,(1.0),group,App::Prop_None,"Scale factor of the view");
-    ADD_PROPERTY_TYPE(Rotation ,(0),group,App::Prop_None,"Rotation of the view in degrees counterclockwise");
+    static const char* group = "Drawing view";
+    ADD_PROPERTY_TYPE(X, (0), group, App::Prop_None,
+                      "X position of the view on the drawing in modelling units (mm)");
+    ADD_PROPERTY_TYPE(Y, (0), group, App::Prop_None,
+                      "Y position of the view on the drawing in modelling units (mm)");
+    ADD_PROPERTY_TYPE(Scale, (1.0), group, App::Prop_None, "Scale factor of the view");
+    ADD_PROPERTY_TYPE(Rotation, (0), group, App::Prop_None,
+                      "Rotation of the view in degrees counterclockwise");
     // The 'Visible' property is handled by the view provider exclusively. It has the 'Output' flag set to
     // avoid to call the execute() method. The view provider touches the page object, instead.
-    App::PropertyType propType = static_cast<App::PropertyType>(App::Prop_Hidden|App::Prop_Output);
-    ADD_PROPERTY_TYPE(Visible, (true),group,propType,"Control whether view is visible in page object");
+    App::PropertyType propType =
+        static_cast<App::PropertyType>(App::Prop_Hidden | App::Prop_Output);
+    ADD_PROPERTY_TYPE(Visible, (true), group, propType,
+                      "Control whether view is visible in page object");
 
     App::PropertyType type = (App::PropertyType)(App::Prop_Hidden);
-    ADD_PROPERTY_TYPE(ViewResult ,(nullptr),group,type,"Resulting SVG fragment of that view");
+    ADD_PROPERTY_TYPE(ViewResult, (nullptr), group, type, "Resulting SVG fragment of that view");
 }
 
 FeatureView::~FeatureView()
@@ -73,7 +71,8 @@ App::DocumentObjectExecReturn *FeatureView::recompute(void)
         return App::DocumentObject::recompute();
     }
     catch (Standard_Failure& e) {
-        App::DocumentObjectExecReturn* ret = new App::DocumentObjectExecReturn(e.GetMessageString());
+        App::DocumentObjectExecReturn* ret =
+            new App::DocumentObjectExecReturn(e.GetMessageString());
         if (ret->Why.empty()) ret->Why = "Unknown OCC exception";
         return ret;
     }

src/Mod/Drawing/App/FeatureView.h

@@ -20,24 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _FeatureView_h_
 #define _FeatureView_h_
 
-
 #include <App/DocumentObject.h>
-#include <App/PropertyStandard.h>
-#include <App/PropertyGeo.h>
 #include <App/FeaturePython.h>
+#include <App/PropertyStandard.h>
 #include <Mod/Drawing/DrawingGlobal.h>
 
 
 namespace Drawing
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class DrawingExport FeatureView : public App::DocumentObject

src/Mod/Drawing/App/FeatureViewAnnotation.cpp

@@ -20,24 +20,18 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <iomanip>
 # include <sstream>
 #endif
 
-#include <iomanip>
-
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-
 #include "FeatureViewAnnotation.h"
 
+
 using namespace Drawing;
 using namespace std;
 
-
 //===========================================================================
 // FeatureViewAnnotation
 //===========================================================================
@@ -51,7 +45,8 @@ FeatureViewAnnotation::FeatureViewAnnotation(void)
 
     ADD_PROPERTY_TYPE(Text ,(""),vgroup,App::Prop_None,"The text to be displayed");
     ADD_PROPERTY_TYPE(Font ,("Sans"),vgroup,App::Prop_None,"The name of the font to use");
-    ADD_PROPERTY_TYPE(TextColor,(0.0f,0.0f,0.0f),vgroup,App::Prop_None,"The color of the text");
+    ADD_PROPERTY_TYPE(TextColor, (0.0f, 0.0f, 0.0f), vgroup, App::Prop_None,
+                      "The color of the text");
 }
 
 FeatureViewAnnotation::~FeatureViewAnnotation()
@@ -60,7 +55,7 @@ FeatureViewAnnotation::~FeatureViewAnnotation()
 
 App::DocumentObjectExecReturn *FeatureViewAnnotation::execute(void)
 {
-  std::stringstream result,hr,hg,hb;
+  stringstream result,hr,hg,hb;
     const App::Color& c = TextColor.getValue();
     hr << hex << setfill('0') << setw(2) << (int)(255.0*c.r);
     hg << hex << setfill('0') << setw(2) << (int)(255.0*c.g);
@@ -74,7 +69,7 @@ App::DocumentObjectExecReturn *FeatureViewAnnotation::execute(void)
             << " fill=\"#" << hr.str() << hg.str() << hb.str() << "\">" << endl;
 
     int index=0;
-    for (std::vector<std::string>::const_iterator it = Text.getValues().begin(); it != Text.getValues().end(); ++it) {
+    for (vector<string>::const_iterator it = Text.getValues().begin(); it != Text.getValues().end(); ++it) {
         result << "<tspan x=\"0\" dy=\"1em\">" << it->c_str() << "</tspan>" << endl;
         index++;
     }

src/Mod/Drawing/App/FeatureViewAnnotation.h

@@ -20,23 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _FeatureViewAnnotation_h_
 #define _FeatureViewAnnotation_h_
 
-
 #include <App/DocumentObject.h>
-#include <App/PropertyLinks.h>
-#include "FeatureView.h"
 #include <App/FeaturePython.h>
+#include <App/PropertyLinks.h>
+
+#include "FeatureView.h"
 
 
 namespace Drawing
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class DrawingExport FeatureViewAnnotation : public FeatureView

src/Mod/Drawing/App/FeatureViewPart.cpp

@@ -20,56 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
+# include <TopoDS_Shape.hxx>
 #endif
 
-
-#include <HLRBRep_Algo.hxx>
-#include <TopoDS_Shape.hxx>
-#include <HLRTopoBRep_OutLiner.hxx>
-//#include <BRepAPI_MakeOutLine.hxx>
-#include <HLRAlgo_Projector.hxx>
-#include <HLRBRep_ShapeBounds.hxx>
-#include <HLRBRep_HLRToShape.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_Triangulation.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <BRep_Tool.hxx>
-
-
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
 #include <Mod/Part/App/PartFeature.h>
 
 #include "FeatureViewPart.h"
 #include "ProjectionAlgos.h"
 
+
 using namespace Drawing;
 using namespace std;
 
-
 //===========================================================================
 // FeatureViewPart
 //===========================================================================
 
-App::PropertyFloatConstraint::Constraints FeatureViewPart::floatRange = {0.01,5.0,0.05};
+App::PropertyFloatConstraint::Constraints FeatureViewPart::floatRange = {0.01, 5.0, 0.05};
 
 PROPERTY_SOURCE(Drawing::FeatureViewPart, Drawing::FeatureView)
 

src/Mod/Drawing/App/FeatureViewPart.h

@@ -20,23 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _FeatureViewPart_h_
 #define _FeatureViewPart_h_
 
-
 #include <App/DocumentObject.h>
-#include <App/PropertyLinks.h>
-#include "FeatureView.h"
 #include <App/FeaturePython.h>
+#include <App/PropertyLinks.h>
+
+#include "FeatureView.h"
 
 
 namespace Drawing
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class DrawingExport FeatureViewPart : public FeatureView

src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp

@@ -20,25 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <iomanip>
 # include <sstream>
 #endif
 
-#include <iomanip>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <App/Property.h>
-#include <App/PropertyStandard.h>
 #include <App/PropertyUnits.h>
-#include "FeatureViewSpreadsheet.h"
+#include <Base/Exception.h>
 #include <Mod/Spreadsheet/App/Cell.h>
 #include <Mod/Spreadsheet/App/Sheet.h>
 
+#include "FeatureViewSpreadsheet.h"
+
+
 using namespace Drawing;
-using namespace std;
 
 //===========================================================================
 // FeatureViewSpreadsheet
@@ -98,35 +94,38 @@ App::DocumentObjectExecReturn *FeatureViewSpreadsheet::execute(void)
     std::vector<std::string> columns;
     std::vector<int> rows;
     try {
-        for (unsigned int i=0; i<scellstart.length(); ++i) {
+        for (unsigned int i = 0; i < scellstart.length(); ++i) {
             if (isdigit(scellstart[i])) {
-                columns.push_back(scellstart.substr(0,i));
-                rows.push_back(std::atoi(scellstart.substr(i,scellstart.length()-1).c_str()));
+                columns.push_back(scellstart.substr(0, i));
+                rows.push_back(std::atoi(scellstart.substr(i, scellstart.length() - 1).c_str()));
             }
         }
-        for (unsigned int i=0; i<scellend.length(); ++i) {
+        for (unsigned int i = 0; i < scellend.length(); ++i) {
             if (isdigit(scellend[i])) {
                 std::string startcol = columns.back();
-                std::string endcol = scellend.substr(0,i);
+                std::string endcol = scellend.substr(0, i);
                 bool valid = false;
-                for (std::vector<std::string>::const_iterator j = availcolumns.begin(); j != availcolumns.end(); ++j) {
-                    if ( (*j) == startcol) {
-                        if ( (*j) != endcol) {
+                for (std::vector<std::string>::const_iterator j = availcolumns.begin();
+                     j != availcolumns.end(); ++j) {
+                    if ((*j) == startcol) {
+                        if ((*j) != endcol) {
                             valid = true;
                         }
-                    } else {
+                    }
+                    else {
                         if (valid) {
-                            if ( (*j) == endcol) {
+                            if ((*j) == endcol) {
                                 columns.push_back((*j));
                                 valid = false;
-                            } else {
+                            }
+                            else {
                                 columns.push_back((*j));
                             }
                         }
                     }
                 }
-                int endrow = std::atoi(scellend.substr(i,scellend.length()-1).c_str());
-                for (int j=rows.back()+1; j<=endrow; ++j) {
+                int endrow = std::atoi(scellend.substr(i, scellend.length() - 1).c_str());
+                for (int j = rows.back() + 1; j <= endrow; ++j) {
                     rows.push_back(j);
                 }
             }
@@ -139,12 +138,13 @@ App::DocumentObjectExecReturn *FeatureViewSpreadsheet::execute(void)
     std::string ViewName = Label.getValue();
     std::stringstream result,hr,hg,hb;
     const App::Color& c = Color.getValue();
-    hr << hex << setfill('0') << setw(2) << (int)(255.0*c.r);
-    hg << hex << setfill('0') << setw(2) << (int)(255.0*c.g);
-    hb << hex << setfill('0') << setw(2) << (int)(255.0*c.b);
-    result  << "<g id=\"" << ViewName << "\" transform=\"translate(" << X.getValue() << "," << Y.getValue() << ")"
-            << " rotate(" << Rotation.getValue() << ")"
-            << " scale(" << Scale.getValue() << ")\">" << endl;
+    hr << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * c.r);
+    hg << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * c.g);
+    hb << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * c.b);
+    result << "<g id=\"" << ViewName << "\" transform=\"translate(" << X.getValue() << ","
+           << Y.getValue() << ")"
+           << " rotate(" << Rotation.getValue() << ")"
+           << " scale(" << Scale.getValue() << ")\">" << std::endl;
 
     // fill the cells
     float rowoffset = 0.0;
@@ -154,9 +154,10 @@ App::DocumentObjectExecReturn *FeatureViewSpreadsheet::execute(void)
     std::string celltext;
     Spreadsheet::Sheet* sheet = static_cast<Spreadsheet::Sheet*>(link); 
     std::vector<std::string> skiplist;   
-    for (std::vector<std::string>::const_iterator col = columns.begin(); col != columns.end(); ++col) {
+    for (std::vector<std::string>::const_iterator col = columns.begin(); col != columns.end();
+         ++col) {
         // create a group for each column
-        result << "  <g id=\"" << ViewName << "_col" << (*col) << "\">" << endl;
+        result << "  <g id=\"" << ViewName << "_col" << (*col) << "\">" << std::endl;
         for (std::vector<int>::const_iterator row = rows.begin(); row != rows.end(); ++row) {
             // get cell size
             std::stringstream srow;
@@ -186,26 +187,26 @@ App::DocumentObjectExecReturn *FeatureViewSpreadsheet::execute(void)
             std::string textstyle = "";
             Spreadsheet::Cell* cell = sheet->getCell(address);
             if (cell) {
-                App::Color f,b;
+                App::Color f, b;
                 std::set<std::string> st;
                 int colspan, rowspan;
                 if (cell->getBackground(b)) {
-                    std::stringstream br,bg,bb;
-                    br << hex << setfill('0') << setw(2) << (int)(255.0*b.r);
-                    bg << hex << setfill('0') << setw(2) << (int)(255.0*b.g);
-                    bb << hex << setfill('0') << setw(2) << (int)(255.0*b.b);
+                    std::stringstream br, bg, bb;
+                    br << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * b.r);
+                    bg << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * b.g);
+                    bb << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * b.b);
                     bcolor = "#" + br.str() + bg.str() + bb.str();
                 }
                 if (cell->getForeground(f)) {
-                    std::stringstream fr,fg,fb;
-                    fr << hex << setfill('0') << setw(2) << (int)(255.0*f.r);
-                    fg << hex << setfill('0') << setw(2) << (int)(255.0*f.g);
-                    fb << hex << setfill('0') << setw(2) << (int)(255.0*f.b);
+                    std::stringstream fr, fg, fb;
+                    fr << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * f.r);
+                    fg << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * f.g);
+                    fb << std::hex << std::setfill('0') << std::setw(2) << (int)(255.0 * f.b);
                     fcolor = "#" + fr.str() + fg.str() + fb.str();
                 }
                 if (cell->getStyle(st)) {
                     for (std::set<std::string>::const_iterator i = st.begin(); i != st.end(); ++i) {
-                         if ((*i) == "bold")
+                        if ((*i) == "bold")
                             textstyle = textstyle + "font-weight: bold; ";
                         else if ((*i) == "italic")
                             textstyle = textstyle + "font-style: italic; ";
@@ -213,15 +214,15 @@ App::DocumentObjectExecReturn *FeatureViewSpreadsheet::execute(void)
                             textstyle = textstyle + "text-decoration: underline; ";
                     }
                 }
-                if (cell->getSpans(rowspan,colspan)) {
-                    for (int i=0; i<colspan; ++i) {
-                        for (int j=0; j<rowspan; ++j) {
-                            App::CellAddress nextcell(address.row()+j,address.col()+i);
+                if (cell->getSpans(rowspan, colspan)) {
+                    for (int i = 0; i < colspan; ++i) {
+                        for (int j = 0; j < rowspan; ++j) {
+                            App::CellAddress nextcell(address.row() + j, address.col() + i);
                             if (i > 0)
                                 cellwidth = cellwidth + sheet->getColumnWidth(nextcell.col());
                             if (j > 0)
                                 cellheight = cellheight + sheet->getRowHeight(nextcell.row());
-                            if ( (i > 0) || (j > 0) )
+                            if ((i > 0) || (j > 0))
                                 skiplist.push_back(nextcell.toString());
                         }
                     }
@@ -230,27 +231,35 @@ App::DocumentObjectExecReturn *FeatureViewSpreadsheet::execute(void)
             }
             // skip cell if found in skiplist
             if (std::find(skiplist.begin(), skiplist.end(), address.toString()) == skiplist.end()) {
-                result << "    <rect x=\"" << coloffset << "\" y=\"" << rowoffset << "\" width=\"" << cellwidth 
-                       << "\" height=\"" << cellheight << "\" style=\"fill:" << bcolor << ";stroke-width:"
-                       << LineWidth.getValue()/Scale.getValue() << ";stroke:#" << hr.str() << hg.str() << hb.str() << ";\" />" << endl;
+                result << "    <rect x=\"" << coloffset << "\" y=\"" << rowoffset << "\" width=\""
+                       << cellwidth << "\" height=\"" << cellheight << "\" style=\"fill:" << bcolor
+                       << ";stroke-width:" << LineWidth.getValue() / Scale.getValue() << ";stroke:#"
+                       << hr.str() << hg.str() << hb.str() << ";\" />" << std::endl;
                 if (alignment & Spreadsheet::Cell::ALIGNMENT_LEFT)
-                    result << "    <text style=\"" << textstyle << "\" x=\"" << coloffset + FontSize.getValue()/2 << "\" y=\"" << rowoffset + 0.75 * cellheight << "\" font-family=\"" ;
+                    result << "    <text style=\"" << textstyle << "\" x=\""
+                           << coloffset + FontSize.getValue() / 2 << "\" y=\""
+                           << rowoffset + 0.75 * cellheight << "\" font-family=\"";
                 if (alignment & Spreadsheet::Cell::ALIGNMENT_HCENTER)
-                    result << "    <text text-anchor=\"middle\" style=\"" << textstyle << "\" x=\"" << coloffset + cellwidth/2 << "\" y=\"" << rowoffset + 0.75 * cellheight << "\" font-family=\"" ;
+                    result << "    <text text-anchor=\"middle\" style=\"" << textstyle << "\" x=\""
+                           << coloffset + cellwidth / 2 << "\" y=\""
+                           << rowoffset + 0.75 * cellheight << "\" font-family=\"";
                 if (alignment & Spreadsheet::Cell::ALIGNMENT_RIGHT)
-                    result << "    <text text-anchor=\"end\" style=\"" << textstyle << "\" x=\"" << coloffset + (cellwidth - FontSize.getValue()/2) << "\" y=\"" << rowoffset + 0.75 * cellheight << "\" font-family=\"" ;
-                result << Font.getValue() << "\"" << " font-size=\"" << FontSize.getValue() << "\""
-                       << " fill=\"" << fcolor << "\">" << celltext << "</text>" << endl;
+                    result << "    <text text-anchor=\"end\" style=\"" << textstyle << "\" x=\""
+                           << coloffset + (cellwidth - FontSize.getValue() / 2) << "\" y=\""
+                           << rowoffset + 0.75 * cellheight << "\" font-family=\"";
+                result << Font.getValue() << "\""
+                       << " font-size=\"" << FontSize.getValue() << "\""
+                       << " fill=\"" << fcolor << "\">" << celltext << "</text>" << std::endl;
             }
             rowoffset = rowoffset + cellheight;
         }
-        result << "  </g>" << endl;
+        result << "  </g>" << std::endl;
         rowoffset = 0.0;
         coloffset = coloffset + cellwidth;
     }
 
     // close the containing group
-    result << "</g>" << endl;
+    result << "</g>" << std::endl;
 
     // Apply the resulting fragment
     ViewResult.setValue(result.str().c_str());

src/Mod/Drawing/App/FeatureViewSpreadsheet.h

@@ -20,15 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _FeatureViewSpreadsheet_h_
 #define _FeatureViewSpreadsheet_h_
 
-
 #include <App/DocumentObject.h>
 #include <App/PropertyLinks.h>
+
 #include "FeatureView.h"
 
+
 namespace Drawing
 {
 

src/Mod/Drawing/App/FeatureViewSymbol.cpp

@@ -20,26 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <iomanip>
+# include <iterator>
 # include <sstream>
+
+# include <boost/regex.hpp>
 #endif
 
-#include <iomanip>
-#include <iterator>
-#include <boost/regex.hpp>
-
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-
 #include "FeatureViewSymbol.h"
 
+
 using namespace Drawing;
 using namespace std;
 
-
 //===========================================================================
 // FeatureViewSymbol
 //===========================================================================

src/Mod/Drawing/App/FeatureViewSymbol.h

@@ -20,23 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _FeatureViewSymbol_h_
 #define _FeatureViewSymbol_h_
 
-
 #include <App/DocumentObject.h>
-#include <App/PropertyLinks.h>
-#include "FeatureView.h"
 #include <App/FeaturePython.h>
+#include <App/PropertyStandard.h>
+
+#include "FeatureView.h"
 
 
 namespace Drawing
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class DrawingExport FeatureViewSymbol : public FeatureView

src/Mod/Drawing/App/PageGroup.cpp

@@ -20,17 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
 #endif
 
 #include "PageGroup.h"
 
-using namespace Drawing;
 
+using namespace Drawing;
 
 //===========================================================================
 // PageGroup

src/Mod/Drawing/App/PageGroup.h

@@ -20,15 +20,10 @@
  *                                                                         *
  ***************************************************************************/
 
- 
-
-
 #ifndef _PageGroup_h_
 #define _PageGroup_h_
 
-
 #include <App/DocumentObjectGroup.h>
-#include <App/PropertyStandard.h>
 #include <App/PropertyLinks.h>
 #include <Mod/Drawing/DrawingGlobal.h>
 
@@ -36,7 +31,6 @@
 namespace Drawing
 {
 
-
 /** Base class of all View Features in the drawing module
  */
 class DrawingExport PageGroup : public App::DocumentObjectGroup

src/Mod/Drawing/App/PreCompiled.h

@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWING_PRECOMPILED_H
 #define DRAWING_PRECOMPILED_H
 
@@ -29,188 +28,50 @@
 #ifdef _PreComp_
 
 // standard
+#include <fstream>
+#include <iomanip>
 #include <iostream>
+#include <iterator>
+#include <iterator>
 #include <sstream>
-#include <cstdio>
-#include <cassert>
-#include <string>
-#include <map>
-#include <vector>
-#include <set>
-#include <bitset>
 
+// boost
+#include <boost/regex.hpp>
 
-// OpenCasCade =====================================================================================
-// Base
-#include <Standard_Version.hxx>
-#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_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_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_Storable.hxx>
-#include <Standard_Stream.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_WayOfLife.hxx>
-#if OCC_VERSION_HEX < 0x060700
-#include <Standard_ctype.hxx>
-#include <Standard_OId.hxx>
-#endif
-
- 
-#include <TCollection_ExtendedString.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TColStd_SequenceOfExtendedString.hxx>
-
+// OpenCasCade
+#include <Approx_Curve3d.hxx>
 #include <BRep_Builder.hxx>
+#include <BRep_Tool.hxx>
 #include <BRepAdaptor_Curve.hxx>
-#include <BRepAdaptor_Surface.hxx>
-#include <BRepBuilderAPI.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
-#include <BRepBuilderAPI_MakePolygon.hxx>
-#include <BRepTools.hxx>
-#include <BRepTools_ShapeSet.hxx>
-#include <BRepBuilderAPI_Copy.hxx>
-#include <BRepCheck_Analyzer.hxx>
-#include <BRepCheck_Result.hxx>
-#include <BRepCheck_ListIteratorOfListOfStatus.hxx>
-
-#include <BRepTools.hxx>
-#include <Standard_DefineHandle.hxx> 
-#include <GCE2d_MakeSegment.hxx>
-#include <GCPnts_TangentialDeflection.hxx>
-#include <Geom_Axis2Placement.hxx>
-#include <Geom_CartesianPoint.hxx>
-#include <Geom_Line.hxx>
-#include <Geom_Surface.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 <BRepLProp_CLProps.hxx>
+#include <BRepMesh_IncrementalMesh.hxx>
+#include <BRepLib.hxx>
 #include <Geom_BezierCurve.hxx>
-#include <Geom_BezierSurface.hxx>
 #include <Geom_BSplineCurve.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Geom_Circle.hxx>
-#include <Geom_ConicalSurface.hxx>
-#include <Geom_CylindricalSurface.hxx>
-#include <Geom_Ellipse.hxx>
-#include <Geom_Hyperbola.hxx>
-#include <Geom_SphericalSurface.hxx>
-#include <Geom_SurfaceOfLinearExtrusion.hxx>
-#include <Geom_SurfaceOfRevolution.hxx>
-#include <Geom_Parabola.hxx>
-#include <Geom_Plane.hxx>
-#include <Geom_ToroidalSurface.hxx>
-#include <GeomTools_Curve2dSet.hxx>
-#include <gp_Ax2d.hxx>
+#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
+#include <GeomConvert_BSplineCurveToBezierCurve.hxx>
+#include <gp_Ax2.hxx>
 #include <gp_Circ.hxx>
-#include <gp_Circ2d.hxx>
-#include <gp_Cone.hxx>
-#include <gp_Cylinder.hxx>
-#include <gp_Dir2d.hxx>
+#include <gp_Dir.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 <Quantity_NameOfColor.hxx>
-#include <Quantity_PhysicalQuantity.hxx>
-#include <Quantity_TypeOfColor.hxx>
-#include <Standard_Boolean.hxx>
-#include <Standard_CString.hxx>
-#include <Standard_ErrorHandler.hxx>
-#include <Standard_Integer.hxx>
-#include <Standard_IStream.hxx>
-#include <Standard_Macro.hxx>
-#include <Standard_NotImplemented.hxx>
-#include <Standard_OStream.hxx>
-#include <Standard_Real.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <TColgp_HArray1OfPnt2d.hxx>
-#include <TCollection_AsciiString.hxx>
-#include <TColStd_HSequenceOfTransient.hxx>
-#include <TColStd_MapIteratorOfMapOfTransient.hxx>
-#include <TColStd_MapOfTransient.hxx>
+#include <HLRBRep_Algo.hxx>
+#include <HLRBRep_HLRToShape.hxx>
+#include <HLRAlgo_Projector.hxx>
+#include <Poly_Polygon3D.hxx>
+#include <Standard_Failure.hxx>
+#include <Standard_Version.hxx>
+#include <TColStd_Array1OfReal.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Edge.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopoDS_ListIteratorOfListOfShape.hxx>
 #include <TopoDS_Shape.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TopTools_HSequenceOfShape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <UnitsAPI.hxx>
-#include <BRepPrimAPI_MakeBox.hxx>
-#include <BRepPrimAPI_MakeCylinder.hxx>
+#if OCC_VERSION_HEX < 0x070600
+# include <BRepAdaptor_HCurve.hxx>
+#endif
 
 #endif // _PreComp_
 #endif
-

src/Mod/Drawing/App/ProjectionAlgos.cpp

@@ -20,62 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
-# include <BRepAdaptor_Curve.hxx>
-# include <Geom_Circle.hxx>
-# include <gp_Circ.hxx>
-# include <gp_Elips.hxx>
+
+# include <BRepLib.hxx>
+# include <BRepMesh_IncrementalMesh.hxx>
+# include <gp_Ax2.hxx>
+# include <gp_Dir.hxx>
+# include <gp_Pnt.hxx>
+# include <HLRBRep_Algo.hxx>
+# include <HLRBRep_HLRToShape.hxx>
+# include <HLRAlgo_Projector.hxx>
+# include <TopExp_Explorer.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Shape.hxx>
 #endif
 
-#include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>
-#include <BRepBuilderAPI_Transform.hxx>
-#include <HLRBRep_Algo.hxx>
-#include <TopoDS_Shape.hxx>
-#include <HLRTopoBRep_OutLiner.hxx>
-#include <HLRAlgo_Projector.hxx>
-#include <HLRBRep_ShapeBounds.hxx>
-#include <HLRBRep_HLRToShape.hxx>
-#include <gp_Ax2.hxx>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include <gp_Vec.hxx>
-#include <Poly_Polygon3D.hxx>
-#include <Poly_Triangulation.hxx>
-#include <Poly_PolygonOnTriangulation.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <BRep_Tool.hxx>
-#include <BRepMesh_IncrementalMesh.hxx>
-#include <BRepLib.hxx>
-#include <BRepAdaptor_CompCurve.hxx>
-#include <Approx_Curve3d.hxx>
-#include <Geom_BSplineCurve.hxx>
-#include <Geom_BezierCurve.hxx>
-#include <GeomConvert_BSplineCurveToBezierCurve.hxx>
-#include <GeomConvert_BSplineCurveKnotSplitting.hxx>
-#include <Geom2d_BSplineCurve.hxx>
-
 #include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Tools.h>
-#include <Mod/Part/App/PartFeature.h>
 
 #include "ProjectionAlgos.h"
 #include "DrawingExport.h"
 
+
 using namespace Drawing;
 using namespace std;
 
@@ -84,7 +51,6 @@ using namespace std;
 //===========================================================================
 
 
-
 ProjectionAlgos::ProjectionAlgos(const TopoDS_Shape &Input, const Base::Vector3d &Dir)
   : Input(Input), Direction(Dir)
 {

src/Mod/Drawing/App/ProjectionAlgos.h

@@ -20,14 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef _ProjectionAlgos_h_
 #define _ProjectionAlgos_h_
 
-#include <Mod/Drawing/DrawingGlobal.h>
-#include <Base/Vector3D.h>
-#include <TopoDS_Shape.hxx>
 #include <string>
+#include <TopoDS_Shape.hxx>
+
+#include <Base/Vector3D.h>
+#include <Mod/Drawing/DrawingGlobal.h>
+
 
 class BRepAdaptor_Curve;
 

src/Mod/Drawing/Gui/AppDrawingGui.cpp

@@ -26,6 +26,7 @@
 #include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
+
 #include "Workbench.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderView.h"

src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp

@@ -22,29 +22,25 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QFileInfo>
-# include <QIcon>
-# include <QImage>
 # include <sstream>
+
+# include <QFileInfo>
 #endif
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
+#include <App/DocumentObjectPy.h>
+#include <Base/Exception.h>
+#include <Base/FileInfo.h>
+#include <Base/Stream.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/MainWindow.h>
 
-#include "DrawingView.h"
 #include <Mod/Drawing/App/FeaturePage.h>
 #include <Mod/Drawing/App/FeatureViewPart.h>
 #include <Mod/Drawing/App/ProjectionAlgos.h>
 #include <Mod/Part/App/PartFeature.h>
 
-#include <Base/Console.h>
-#include <Base/Exception.h>
-#include <Base/FileInfo.h>
-#include <Base/Stream.h>
-#include <App/Application.h>
-#include <App/DocumentObjectPy.h>
-#include <Gui/MainWindow.h>
-#include <Gui/BitmapFactory.h>
+#include "DrawingView.h"
+
 
 namespace DrawingGui {
 class Module : public Py::ExtensionModule<Module>

src/Mod/Drawing/Gui/CMakeLists.txt

@@ -64,6 +64,18 @@ SET(DrawingGuiTaskDlgs_SRCS
 )
 SOURCE_GROUP("TaskDialogs" FILES ${DrawingGuiTaskDlgs_SRCS})
 
+SET(DrawingGuiComplete_SRCS
+    ${DrawingGui_SRCS}
+    ${DrawingGuiView_SRCS}
+    ${DrawingGuiViewProvider_SRCS}
+)
+
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${DrawingGuiComplete_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(DrawingGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 SET(DrawingGuiIcon_SVG
     Resources/icons/DrawingWorkbench.svg
 )

src/Mod/Drawing/Gui/Command.cpp

@@ -12,6 +12,8 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
+# include <vector>
+
 # include <QCoreApplication>
 # include <QDir>
 # include <QFile>
@@ -20,30 +22,25 @@
 # include <QRegExp>
 #endif
 
-#include <vector>
-
-#include <Base/Tools.h>
 #include <App/Document.h>
 #include <App/PropertyGeo.h>
-
+#include <Base/Tools.h>
 #include <Gui/Action.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
-#include <Gui/Selection.h>
-#include <Gui/MainWindow.h>
 #include <Gui/FileDialog.h>
-
-#include <Mod/Part/App/PartFeature.h>
+#include <Gui/MainWindow.h>
+#include <Gui/Selection.h>
 #include <Mod/Drawing/App/FeaturePage.h>
+#include <Mod/Part/App/PartFeature.h>
 #include <Mod/Spreadsheet/App/Sheet.h>
 
-
-#include "DrawingView.h"
 #include "TaskDialog.h"
 #include "TaskOrthoViews.h"
 
+
 using namespace DrawingGui;
 using namespace std;
 

src/Mod/Drawing/Gui/DrawingView.cpp

@@ -20,12 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <cmath>
+
 # include <QAction>
 # include <QApplication>
-# include <QBuffer>
 # include <QContextMenuEvent>
 # include <QFileInfo>
 # include <QFileDialog>
@@ -37,34 +37,26 @@
 # include <QListWidget>
 # include <QMenu>
 # include <QMessageBox>
-# include <QMouseEvent>
 # include <QPainter>
 # include <QPaintEvent>
 # include <QPrinter>
 # include <QPrintDialog>
 # include <QPrintPreviewDialog>
-# include <QPrintPreviewWidget>
-# include <QScrollArea>
-# include <QSlider>
-# include <QStatusBar>
-# include <QSvgRenderer>
-# include <QSvgWidget>
 # include <QWheelEvent>
-# include <cmath>
+
 #endif
 
-#include "DrawingView.h"
-#include <Base/Parameter.h>
-#include <Base/Stream.h>
-#include <Base/gzstream.h>
-#include <Base/PyObjectBase.h>
 #include <App/Application.h>
 #include <App/Document.h>
+#include <Base/Parameter.h>
 #include <Gui/Document.h>
-#include <Gui/ViewProvider.h>
 #include <Gui/FileDialog.h>
+#include <Gui/ViewProvider.h>
 #include <Gui/WaitCursor.h>
 
+#include "DrawingView.h"
+
+
 using namespace DrawingGui;
 
 SvgView::SvgView(QWidget *parent)

src/Mod/Drawing/Gui/DrawingView.h

@@ -20,15 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_DRAWINGVIEW_H
 #define DRAWINGGUI_DRAWINGVIEW_H
 
-#include <Gui/MDIView.h>
-#include <Mod/Drawing/DrawingGlobal.h>
 #include <QGraphicsView>
 #include <QPrinter>
 
+#include <Gui/MDIView.h>
+#include <Mod/Drawing/DrawingGlobal.h>
+
+
 QT_BEGIN_NAMESPACE
 class QSlider;
 class QAction;

src/Mod/Drawing/Gui/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h" 

src/Mod/Drawing/Gui/PreCompiled.h

@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_PRECOMPILED_H
 #define DRAWINGGUI_PRECOMPILED_H
 
@@ -32,31 +31,38 @@
 
 #ifdef _PreComp_
 
-// standard
-#include <iostream>
-#include <cassert>
-#include <cmath>
-
 // STL
+#include <cmath>
+#include <sstream>
 #include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
-#include <algorithm>
-#include <stack>
-#include <queue>
-#include <bitset>
 
-#ifdef FC_OS_WIN32
-# include <windows.h>
-#endif
-
-
-// Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
+// Qt
+#include <QAction>
+#include <QApplication>
+#include <QCheckBox>
+#include <QContextMenuEvent>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QGLWidget>
+#include <QGraphicsRectItem>
+#include <QGraphicsSvgItem>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QMenu>
+#include <QMessageBox>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QPrintPreviewDialog>
+#include <QRegExp>
+#include <QTimer>
+#include <QWheelEvent>
 
 #endif //_PreComp_
 

src/Mod/Drawing/Gui/TaskDialog.cpp

@@ -20,46 +20,43 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QCheckBox>
 # include <QMessageBox>
 #endif
 
-
-#include <Standard_math.hxx>
-#include "TaskDialog.h"
 #include <Gui/Application.h>
 #include <Gui/Command.h>
-#include <Gui/Selection.h>
 #include <Gui/Document.h>
+#include <Gui/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 #include <Mod/Part/App/PartFeature.h>
 
+#include "TaskDialog.h"
+
+
 using namespace DrawingGui;
 
-
 /* TRANSLATOR DrawingGui::TaskProjection */
-
-TaskProjection::TaskProjection()
-{
-    QString texts[10] = 
-    {
-        tr("Visible sharp edges"),
-        tr("Visible smooth edges"),
-        tr("Visible sewn edges"),
-        tr("Visible outline edges"),
-        tr("Visible isoparameters"),
-        tr("Hidden sharp edges"),
-        tr("Hidden smooth edges"),
-        tr("Hidden sewn edges"),
-        tr("Hidden outline edges"),
-        tr("Hidden isoparameters")
-    };
-    widget = new QWidget();
+
+TaskProjection::TaskProjection()
+{
+    QString texts[10] = 
+    {
+        tr("Visible sharp edges"),
+        tr("Visible smooth edges"),
+        tr("Visible sewn edges"),
+        tr("Visible outline edges"),
+        tr("Visible isoparameters"),
+        tr("Hidden sharp edges"),
+        tr("Hidden smooth edges"),
+        tr("Hidden sewn edges"),
+        tr("Hidden outline edges"),
+        tr("Hidden isoparameters")
+    };
+    widget = new QWidget();
     QVBoxLayout *mainLayout = new QVBoxLayout;
 
     for (int i=0; i<10; i++) {
@@ -73,19 +70,19 @@ TaskProjection::TaskProjection()
 
     widget->setLayout(mainLayout);
 
-    taskbox = new Gui::TaskView::TaskBox(
-        QPixmap(), tr("Project shapes"), false, nullptr);
-    taskbox->groupLayout()->addWidget(widget);
-    Content.push_back(taskbox);
-}
-
-TaskProjection::~TaskProjection()
-{
-    // automatically deleted in the sub-class
-}
-
-bool TaskProjection::accept()
-{
+    taskbox = new Gui::TaskView::TaskBox(
+        QPixmap(), tr("Project shapes"), false, nullptr);
+    taskbox->groupLayout()->addWidget(widget);
+    Content.push_back(taskbox);
+}
+
+TaskProjection::~TaskProjection()
+{
+    // automatically deleted in the sub-class
+}
+
+bool TaskProjection::accept()
+{
     Gui::Document* document = Gui::Application::Instance->activeDocument();
     if (!document) {
         QMessageBox::warning(widget, tr("No active document"),
@@ -139,7 +136,7 @@ bool TaskProjection::accept()
     }
     Gui::Command::updateActive();
     Gui::Command::commitCommand();
-    return true;
-}
-
-#include "moc_TaskDialog.cpp"
+    return true;
+}
+
+#include "moc_TaskDialog.cpp"

src/Mod/Drawing/Gui/TaskDialog.h

@@ -20,14 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_TASKDIALOG
 #define DRAWINGGUI_TASKDIALOG
 
 #include <QWidget>
+
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 
+
 class QCheckBox;
 
 namespace DrawingGui

src/Mod/Drawing/Gui/TaskOrthoViews.cpp

@@ -22,21 +22,19 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <QCheckBox>
 # include <QLineEdit>
 # include <QMenu>
 #endif
 
-#include "TaskOrthoViews.h"
-#include "ui_TaskOrthoViews.h"
-
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
-#include <Gui/Command.h>
 #include <Gui/Control.h>
-#include <Mod/Part/App/PartFeature.h>
 #include <Mod/Drawing/App/FeaturePage.h>
+#include <Mod/Part/App/PartFeature.h>
+
+#include "TaskOrthoViews.h"
+#include "ui_TaskOrthoViews.h"
 
 
 using namespace Gui;

src/Mod/Drawing/Gui/TaskOrthoViews.h

@@ -23,19 +23,19 @@
 #ifndef GUI_TASKVIEW_TASKORTHOVIEWS_H
 #define GUI_TASKVIEW_TASKORTHOVIEWS_H
 
-#include <Gui/TaskView/TaskView.h>
-#include <Gui/TaskView/TaskDialog.h>
-#include <Base/BoundBox.h>
-
 #include <gp_Ax2.hxx>
 #include <vector>
+
+#include <QCheckBox>
+
 #include <boost_signals2.hpp>
 
+#include <Base/BoundBox.h>
+#include <Gui/TaskView/TaskDialog.h>
+#include <Gui/TaskView/TaskView.h>
 #include <Mod/Drawing/App/FeatureViewPart.h>
 
 
-
-
 namespace DrawingGui {
 class Ui_TaskOrthoViews;
 

src/Mod/Drawing/Gui/ViewProviderPage.cpp

@@ -20,32 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QAction>
 # include <QMenu>
 # include <QTimer>
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <Base/Sequencer.h>
-#include <App/Application.h>
-#include <App/Document.h>
 #include <App/DocumentObject.h>
 #include <Gui/Application.h>
-#include <Gui/Selection.h>
-#include <Gui/MainWindow.h>
 #include <Gui/BitmapFactory.h>
+#include <Gui/MainWindow.h>
 #include <Gui/ViewProviderDocumentObjectGroup.h>
-
+#include <Mod/Drawing/App/FeaturePage.h>
 
 #include "ViewProviderPage.h"
-#include <Mod/Drawing/App/FeaturePage.h>
+
 
 using namespace DrawingGui;
 

src/Mod/Drawing/Gui/ViewProviderPage.h

@@ -20,16 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_VIEWPROVIDERPAGE_H
 #define DRAWINGGUI_VIEWPROVIDERPAGE_H
 
 #include <QPointer>
-#include <Gui/ViewProviderFeature.h>
+
 #include <Gui/ViewProviderDocumentObjectGroup.h>
 
 #include "DrawingView.h"
 
+
 namespace Drawing{
     class FeaturePage;
 }

src/Mod/Drawing/Gui/ViewProviderView.cpp

@@ -20,24 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-#endif
-
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include <Base/Console.h>
-#include <Base/Parameter.h>
-#include <Base/Exception.h>
-#include <Base/Sequencer.h>
-#include <App/Application.h>
-#include <App/Document.h>
 #include <App/DocumentObject.h>
-#include <Gui/Selection.h>
-
-#include <Mod/Drawing/App/FeatureView.h>
 #include <Mod/Drawing/App/FeatureClip.h>
+#include <Mod/Drawing/App/FeatureView.h>
+
 #include "ViewProviderView.h"
 
 

src/Mod/Drawing/Gui/ViewProviderView.h

@@ -20,11 +20,9 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWINGGUI_VIEWPROVIDERVIEW_H
 #define DRAWINGGUI_VIEWPROVIDERVIEW_H
 
-#include <Gui/ViewProviderFeature.h>
 #include <Gui/ViewProviderDocumentObjectGroup.h>
 
 

src/Mod/Drawing/Gui/Workbench.cpp

@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <qobject.h>
-#endif
-
-#include "Workbench.h"
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
 
+#include "Workbench.h"
+
+
 using namespace DrawingGui;
 
 #if 0 // needed for Qt's lupdate utility

src/Mod/Drawing/Gui/Workbench.h

@@ -20,12 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef DRAWING_WORKBENCH_H
 #define DRAWING_WORKBENCH_H
 
 #include <Gui/Workbench.h>
 
+
 namespace DrawingGui {
 
 /**

src/Mod/Image/App/CMakeLists.txt

@@ -28,6 +28,12 @@ set(Image_SRCS
     AppImage.cpp
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Image_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(Image PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 add_library(Image SHARED ${Image_SRCS})
 target_link_libraries(Image ${Image_LIBS})
 

src/Mod/Image/App/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"

src/Mod/Image/App/PreCompiled.h

@@ -28,21 +28,11 @@
 #ifdef _PreComp_
 /// point at which warnings of overly long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER
-#	pragma warning( disable : 4251 )
-#	pragma warning( disable : 4503 )
-#	pragma warning( disable : 4786 )  // specifier longer then 255 chars
+# pragma warning(disable : 4005)
+# pragma warning(disable : 4251)
+# pragma warning(disable : 4503)
+# pragma warning(disable : 4786)// specifier longer then 255 chars
 #endif
 
-// standard
-#include <iostream>
-#include <sstream>
-#include <cstdio>
-#include <cassert>
-#include <string>
-#include <map>
-#include <vector>
-#include <set>
-#include <bitset>
-
 #endif // _PreComp_
 #endif

src/Mod/Image/Gui/CMakeLists.txt

@@ -59,6 +59,12 @@ SET(ImageGui_SRCS
     XpmImages.h
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${ImageGui_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(ImageGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 SET(ImageGuiIcon_SVG
     Resources/icons/ImageWorkbench.svg
 )

src/Mod/Image/Gui/ImageView.cpp

@@ -18,6 +18,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cmath>
+
 # include <QAction>
 # include <QApplication>
 # include <QMenu>

src/Mod/Image/Gui/OpenGLImageBox.cpp

@@ -19,6 +19,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <cmath>
+
 # include <QDebug>
 # include <QMessageBox>
 # include <QOpenGLContext>

src/Mod/Image/Gui/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"

src/Mod/Image/Gui/PreCompiled.h

@@ -35,34 +35,17 @@
 
 #ifdef _PreComp_
 
-// standard
-#include <cassert>
+// STL
 #include <cmath>
-#include <iostream>
 #include <sstream>
 
-// STL
-#include <algorithm>
-#include <bitset>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-#include <stack>
-#include <string>
-#include <vector>
-
-#ifdef FC_OS_WIN32
-# include <windows.h>
-#endif
-
 // Inventor
-# include <Inventor/nodes/SoCoordinate3.h>
-# include <Inventor/nodes/SoFaceSet.h>
-# include <Inventor/nodes/SoMaterial.h>
-# include <Inventor/nodes/SoSeparator.h>
-# include <Inventor/nodes/SoTexture2.h>
-# include <Inventor/nodes/SoTextureCoordinate2.h>
+#include <Inventor/nodes/SoCoordinate3.h>
+#include <Inventor/nodes/SoFaceSet.h>
+#include <Inventor/nodes/SoMaterial.h>
+#include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/nodes/SoTexture2.h>
+#include <Inventor/nodes/SoTextureCoordinate2.h>
 
 // Qt Toolkit
 #ifndef __QtAll__

src/Mod/Image/Gui/ViewProviderImagePlane.cpp

@@ -21,18 +21,18 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
+# include <QFileInfo>
+# include <QImage>
+# include <QString>
+
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoFaceSet.h>
 # include <Inventor/nodes/SoMaterial.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTexture2.h>
 # include <Inventor/nodes/SoTextureCoordinate2.h>
-# include <QFileInfo>
-# include <QImage>
-# include <QString>
 #endif
 
 #include <App/Document.h>

src/Mod/Inspection/App/CMakeLists.txt

@@ -36,10 +36,15 @@ set(Inspection_Scripts
     ../Init.py
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Inspection_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(Inspection PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 add_library(Inspection SHARED ${Inspection_SRCS} ${Inspection_Scripts})
 target_link_libraries(Inspection ${Inspection_LIBS})
 
-
 fc_target_copy_resource_flat(Inspection
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}/Mod/Inspection

src/Mod/Inspection/App/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h" 

src/Mod/Inspection/App/PreCompiled.h

@@ -19,51 +19,38 @@
  *   Suite 330, Boston, MA  02111-1307, USA                                *
  *                                                                         *
  ***************************************************************************/
-
-
+ 
 #ifndef APP_PRECOMPILED_H
 #define APP_PRECOMPILED_H
 
 #include <FCConfig.h>
 
 #ifdef _MSC_VER
-# pragma warning(disable : 4290)
-# pragma warning(disable : 4275)
+# pragma warning(disable : 4005)
+# pragma warning(disable : 4251)
+# pragma warning(disable : 4503)
+# pragma warning(disable : 4786)// specifier longer then 255 chars
 #endif
 
 #ifdef _PreComp_
 
-// standard
-#include <cstdio>
-#include <cassert>
-#include <iostream>
+// STL
 #include <numeric>
 
-// STL
-#include <algorithm>
-#include <iostream>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-#include <sstream>
-#include <stack>
-#include <string>
-#include <vector>
-
 // OCC
-#include <gp_Pnt.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepGProp_Face.hxx>
+#include <gp_Pnt.hxx>
+#include <TopExp.hxx>
 #include <TopoDS.hxx>
 
 // Qt
-#include <QtConcurrentMap>
 #include <QEventLoop>
 #include <QFuture>
 #include <QFutureWatcher>
+#include <QtConcurrentMap>
 
 #endif //_PreComp_
 

src/Mod/Inspection/Gui/CMakeLists.txt

@@ -45,6 +45,12 @@ set(InspectionGui_Scripts
     ../InitGui.py
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${InspectionGui_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(InspectionGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 SET(InspectionGuiIcon_SVG
     Resources/icons/InspectionWorkbench.svg
 )

src/Mod/Inspection/Gui/Command.cpp

@@ -21,7 +21,6 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <Inventor/events/SoButtonEvent.h>
 #endif

src/Mod/Inspection/Gui/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h" 

src/Mod/Inspection/Gui/PreCompiled.h

@@ -20,67 +20,46 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef GUI_PRECOMPILED_H
 #define GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
 
-#ifdef FC_OS_WIN32
-# ifndef NOMINMAX
-# define NOMINMAX
-# endif
-#endif
-
 #ifdef _MSC_VER
-#   pragma warning(disable : 4005)
+# pragma warning(disable : 4005)
+# pragma warning(disable : 4251)
+# pragma warning(disable : 4503)
+# pragma warning(disable : 4786)// specifier longer then 255 chars
 #endif
 
 #ifdef _PreComp_
 
-// standard
-#include <cstdio>
-#include <cassert>
-
 // STL
-#include <algorithm>
-#include <iostream>
-#include <list>
-#include <map>
-#include <queue>
-#include <set>
-#include <sstream>
-#include <stack>
-#include <string>
-#include <vector>
-
-#ifdef FC_OS_WIN32
-# include <windows.h>
-#endif
+#include <cfloat>
 
 // Inventor
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/actions/SoRayPickAction.h>
 #include <Inventor/actions/SoSearchAction.h>
 #include <Inventor/details/SoFaceDetail.h>
+#include <Inventor/errors/SoDebugError.h>
 #include <Inventor/events/SoButtonEvent.h>
 #include <Inventor/events/SoKeyboardEvent.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
-#include <Inventor/lists/SoPickedPointList.h> 
 #include <Inventor/nodes/SoCoordinate3.h>
 #include <Inventor/nodes/SoDrawStyle.h>
 #include <Inventor/nodes/SoIndexedFaceSet.h>
+#include <Inventor/nodes/SoIndexedLineSet.h>
 #include <Inventor/nodes/SoMaterial.h>
 #include <Inventor/nodes/SoMaterialBinding.h>
 #include <Inventor/nodes/SoNormal.h>
 #include <Inventor/nodes/SoPointSet.h>
 #include <Inventor/nodes/SoShapeHints.h>
-#include <Inventor/errors/SoDebugError.h>
 
-// Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
+// Qt
+#include <QApplication>
+#include <QMenu>
+#include <QMessageBox>
 
 #endif  //_PreComp_
 

src/Mod/Mesh/App/Core/Degeneration.h

@@ -23,7 +23,6 @@
 #ifndef MESH_DEGENERATION_H
 #define MESH_DEGENERATION_H
 
-#include <bitset>
 #include <string>
 #include <vector>
 

src/Mod/Mesh/App/PreCompiled.h

@@ -51,7 +51,6 @@
 #endif
 // STL
 #include <algorithm>
-#include <bitset>
 #include <iostream>
 #include <iomanip>
 #include <list>
@@ -63,16 +62,14 @@
 #include <string>
 #include <vector>
 
-#ifdef FC_OS_WIN32
-#include <io.h>
-#endif
-
+// boost
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/tokenizer.hpp>
 #include <boost/regex.hpp>
 
+// Xerces
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/XercesVersion.hpp>
 #include <xercesc/dom/DOM.hpp>

src/Mod/Mesh/Gui/CMakeLists.txt

@@ -144,6 +144,12 @@ SET(MeshGui_SRCS
     Workbench.h
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${MeshGui_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(MeshGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 SET(MeshGuiIcon_SVG
     Resources/icons/MeshWorkbench.svg
 )

src/Mod/Mesh/Gui/Doxygen.cpp

@@ -20,6 +20,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "PreCompiled.h"
 
 /*! \namespace MeshGui
     \brief The namespace of the Mesh Graphical interface layer library

src/Mod/Mesh/Gui/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"

src/Mod/Mesh/Gui/PreCompiled.h

@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef MESHGUI_PRECOMPILED_H
 #define MESHGUI_PRECOMPILED_H
 
@@ -42,29 +41,18 @@
 #ifdef FC_USE_GTS
 #  include <gts.h>
 #endif
+
 // standard
-#include <cstdio>
-#include <cassert>
 #include <ios>
 
 // STL
 #include <algorithm>
-#include <bitset>
-#include <iostream>
-#include <fstream>
 #include <list>
 #include <map>
-#include <queue>
-#include <set>
 #include <sstream>
-#include <stack>
 #include <string>
 #include <vector>
 
-#ifdef FC_OS_WIN32
-# include <windows.h>
-#endif
-
 // Qt Toolkit
 #ifndef __QtAll__
 # include <Gui/QtAll.h>
@@ -73,14 +61,8 @@
 // Inventor
 #ifndef __InventorAll__
 # include <Gui/InventorAll.h>
-# include <Inventor/annex/ForeignFiles/SoSTLFileKit.h>
 #endif
 
-#elif defined(FC_OS_WIN32)
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <Windows.h>
 #endif  //_PreComp_
 
 #endif // MESHGUI_PRECOMPILED_H

src/Mod/Raytracing/App/PreCompiled.h

@@ -28,19 +28,16 @@
 #ifdef _PreComp_
 
 // STL
-#include <fstream>
 #include <sstream>
 #include <vector>
 
 // OpenCascade View
 #include <BRepMesh_IncrementalMesh.hxx>
-#include <gp_Pnt.hxx>
 #include <ShapeAnalysis_ShapeContents.hxx>
 #include <Standard.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Face.hxx>
-#include <TopoDS_Shape.hxx>
 
 #endif //_PreComp_
 

src/Mod/Raytracing/Gui/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h" 

src/Mod/Raytracing/Gui/PreCompiled.h

@@ -39,11 +39,9 @@
 # include <windows.h>
 #endif
 
-// OpenCasCade Base
-#include <Standard_Failure.hxx>
-
-// OpenCascade View
+// OpenCascade
 #include <gp_Vec.hxx>
+#include <Standard_Failure.hxx>
 
 // Qt Toolkit
 # include <QAction>

src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp

@@ -22,35 +22,30 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <TColgp_Array1OfPnt.hxx>
 # include <Geom_BSplineSurface.hxx>
+# include <TColgp_Array1OfPnt.hxx>
 #endif
 
 #include <Base/Console.h>
 #include <Base/Converter.h>
-#include <Base/Interpreter.h>
-#include <Base/PyObjectBase.h>
 #include <Base/GeometryPyCXX.h>
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
+#include <Base/Interpreter.h>
 #include <Mod/Part/App/BSplineSurfacePy.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshPy.h>
 #include <Mod/Points/App/PointsPy.h>
+#if defined(HAVE_PCL_FILTERS)
+# include <pcl/filters/passthrough.h>
+# include <pcl/filters/voxel_grid.h>
+# include <pcl/point_types.h>
+#endif
 
 #include "ApproxSurface.h"
 #include "BSplineFitting.h"
-#include "SurfaceTriangulation.h"
 #include "RegionGrowing.h"
-#include "Segmentation.h"
 #include "SampleConsensus.h"
-#if defined(HAVE_PCL_FILTERS)
-#include <pcl/filters/passthrough.h>
-#include <pcl/filters/voxel_grid.h>
-#include <pcl/point_types.h>
-#endif
+#include "Segmentation.h"
+#include "SurfaceTriangulation.h"
+
 
 /*
 Dependency of pcl components:

src/Mod/ReverseEngineering/App/ApproxSurface.cpp

@@ -20,24 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#include <math_Gauss.hxx>
-#include <math_Householder.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Precision.hxx>
+#ifndef _PreComp_
+# include <QFuture>
+# include <QFutureWatcher>
+# include <QtConcurrentMap>
 
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QtConcurrentMap>
+# include <Geom_BSplineSurface.hxx>
+# include <math_Gauss.hxx>
+# include <math_Householder.hxx>
+# include <Precision.hxx>
+#endif
 
-#include <Mod/Mesh/App/Core/Approximation.h>
 #include <Base/Sequencer.h>
-#include <Base/Tools2D.h>
 #include <Base/Tools.h>
+#include <Mod/Mesh/App/Core/Approximation.h>
 
 #include "ApproxSurface.h"
 
+
 using namespace Reen;
 namespace bp = boost::placeholders;
 

src/Mod/ReverseEngineering/App/ApproxSurface.h

@@ -20,21 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_APPROXSURFACE_H
 #define REEN_APPROXSURFACE_H
 
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array2OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_Array1OfReal.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <math_Matrix.hxx>
 
 #include <Base/Vector3D.h>
 #include <Mod/ReverseEngineering/ReverseEngineeringGlobal.h>
 
+
 namespace Base {
 class SequencerLauncher;
 }

src/Mod/ReverseEngineering/App/BSplineFitting.cpp

@@ -20,16 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #if defined(HAVE_PCL_OPENNURBS)
 #ifndef _PreComp_
+# include <map>
+
 # include <Geom_BSplineSurface.hxx>
 # include <TColgp_Array2OfPnt.hxx>
-# include <TColStd_Array2OfReal.hxx>
 # include <TColStd_Array1OfInteger.hxx>
 # include <TColStd_Array1OfReal.hxx>
-# include <map>
+# include <TColStd_Array2OfReal.hxx>
 #endif
 
 #include <Mod/Points/App/PointsPy.h>

src/Mod/ReverseEngineering/App/BSplineFitting.h

@@ -20,14 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_BSPLINEFITTING_H
 #define REEN_BSPLINEFITTING_H
 
 #if defined(HAVE_PCL_OPENNURBS)
-#include <Geom_BSplineSurface.hxx>
-#include <Base/Vector3D.h>
-#include <vector>
+# include <vector>
+
+# include <Base/Vector3D.h>
+# include <Geom_BSplineSurface.hxx>
+
 
 namespace Reen {
 

src/Mod/ReverseEngineering/App/CMakeLists.txt

@@ -72,10 +72,15 @@ SET(Reen_SRCS
     PreCompiled.h
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Reen_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(ReverseEngineering PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 add_library(ReverseEngineering SHARED ${Reen_SRCS})
 target_link_libraries(ReverseEngineering ${Reen_LIBS})
 
-
 SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering)
 SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering)
 

src/Mod/ReverseEngineering/App/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"

src/Mod/ReverseEngineering/App/PreCompiled.h

@@ -20,51 +20,43 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED__
 #define __PRECOMPILED__
 
 #include <FCConfig.h>
 
 #ifdef _MSC_VER
-#   pragma warning(disable : 4181)
-#   pragma warning(disable : 4267)
-#   pragma warning(disable : 4275)
-#   pragma warning(disable : 4305)
-#   pragma warning(disable : 4522)
+# pragma warning(disable : 4181)
+# pragma warning(disable : 4267)
+# pragma warning(disable : 4275)
+# pragma warning(disable : 4305)
+# pragma warning(disable : 4522)
 #endif
 
 // pcl headers include <boost/bind.hpp> instead of <boost/bind/bind.hpp>
 #ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS
-#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+# define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #endif
 
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
-#include <sstream>
-#include <cstdio>
-#include <cassert>
-#include <string>
 #include <map>
-#include <vector>
-#include <set>
-#include <bitset>
+
+// boost
+#include <boost/math/special_functions/fpclassify.hpp>
 
 // OpenCasCade
+#include <Geom_BSplineSurface.hxx>
 #include <math_Gauss.hxx>
 #include <math_Householder.hxx>
-#include <math_Matrix.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
+#include <Precision.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array2OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <TopoDS_Face.hxx>
 
-#endif
+// Qt
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QtConcurrentMap>
+
 #endif // _PreComp_
-
+#endif

src/Mod/ReverseEngineering/App/RegionGrowing.cpp

@@ -20,24 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <boost/math/special_functions/fpclassify.hpp>
+#endif
+
+#include <Mod/Points/App/Points.h>
 
 #include "RegionGrowing.h"
-#include <Mod/Points/App/Points.h>
-#include <Base/Exception.h>
-#include <boost/math/special_functions/fpclassify.hpp>
+
 
 #if defined(HAVE_PCL_FILTERS)
-#include <pcl/filters/passthrough.h>
-#include <pcl/point_types.h>
+# include <pcl/filters/passthrough.h>
+# include <pcl/point_types.h>
 #endif
 #if defined(HAVE_PCL_SEGMENTATION)
-#include <pcl/search/search.h>
-#include <pcl/search/kdtree.h>
-#include <pcl/features/normal_3d.h>
-#include <pcl/segmentation/region_growing.h>
-#include <pcl/filters/extract_indices.h>
+# include <pcl/search/search.h>
+# include <pcl/search/kdtree.h>
+# include <pcl/features/normal_3d.h>
+# include <pcl/segmentation/region_growing.h>
+# include <pcl/filters/extract_indices.h>
 
 using namespace std;
 using namespace Reen;

src/Mod/ReverseEngineering/App/RegionGrowing.h

@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_REGIONGROWING_H
 #define REEN_REGIONGROWING_H
 
-#include <Base/Vector3D.h>
-#include <vector>
 #include <list>
+#include <vector>
+
+#include <Base/Vector3D.h>
+
 
 namespace Points {class PointKernel;}
 

src/Mod/ReverseEngineering/App/SampleConsensus.cpp

@@ -20,22 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <boost/math/special_functions/fpclassify.hpp>
+#endif
+
+#include <Base/Exception.h>
+#include <Mod/Points/App/Points.h>
 
 #include "SampleConsensus.h"
-#include <Mod/Points/App/Points.h>
-#include <Base/Exception.h>
-#include <boost/math/special_functions/fpclassify.hpp>
+
 
 #if defined(HAVE_PCL_SAMPLE_CONSENSUS)
-#include <pcl/point_types.h>
-#include <pcl/features/normal_3d.h>
-#include <pcl/sample_consensus/ransac.h>
-#include <pcl/sample_consensus/sac_model_plane.h>
-#include <pcl/sample_consensus/sac_model_sphere.h>
-#include <pcl/sample_consensus/sac_model_cylinder.h>
-#include <pcl/sample_consensus/sac_model_cone.h>
+# include <pcl/point_types.h>
+# include <pcl/features/normal_3d.h>
+# include <pcl/sample_consensus/ransac.h>
+# include <pcl/sample_consensus/sac_model_cone.h>
+# include <pcl/sample_consensus/sac_model_cylinder.h>
+# include <pcl/sample_consensus/sac_model_plane.h>
+# include <pcl/sample_consensus/sac_model_sphere.h>
 
 using namespace std;
 using namespace Reen;

src/Mod/ReverseEngineering/App/SampleConsensus.h

@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_SAMPLECONSENSUS_H
 #define REEN_SAMPLECONSENSUS_H
 
-#include <Base/Vector3D.h>
 #include <vector>
 
+#include <Base/Vector3D.h>
+
+
 namespace Points {class PointKernel;}
 
 namespace Reen {

src/Mod/ReverseEngineering/App/Segmentation.cpp

@@ -20,29 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "Segmentation.h"
 #include <Mod/Points/App/Points.h>
-#include <Base/Exception.h>
+
+#include "Segmentation.h"
+
 
 #if defined(HAVE_PCL_FILTERS)
-#include <pcl/filters/extract_indices.h>
-#include <pcl/filters/passthrough.h>
-#include <pcl/features/normal_3d.h>
+# include <pcl/filters/extract_indices.h>
+# include <pcl/filters/passthrough.h>
+# include <pcl/features/normal_3d.h>
 #endif
 
 #if defined(HAVE_PCL_SAMPLE_CONSENSUS)
-#include <pcl/sample_consensus/method_types.h>
-#include <pcl/sample_consensus/model_types.h>
+# include <pcl/sample_consensus/method_types.h>
+# include <pcl/sample_consensus/model_types.h>
 #endif
 
 #if defined(HAVE_PCL_SEGMENTATION)
-#include <pcl/ModelCoefficients.h>
-#include <pcl/io/pcd_io.h>
-#include <pcl/point_types.h>
-#include <pcl/segmentation/sac_segmentation.h>
+# include <pcl/io/pcd_io.h>
+# include <pcl/ModelCoefficients.h>
+# include <pcl/point_types.h>
+# include <pcl/segmentation/sac_segmentation.h>
 #endif
 
 using namespace std;

src/Mod/ReverseEngineering/App/Segmentation.h

@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_SEGMENTATION_H
 #define REEN_SEGMENTATION_H
 
-#include <Base/Vector3D.h>
-#include <vector>
 #include <list>
+#include <vector>
+
+#include <Base/Vector3D.h>
+
 
 namespace Points {class PointKernel;}
 

src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp

@@ -20,40 +20,39 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "SurfaceTriangulation.h"
+#include <Base/Exception.h>
 #include <Mod/Points/App/Points.h>
 #include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
 #include <Mod/Mesh/App/Core/Elements.h>
 #include <Mod/Mesh/App/Core/MeshKernel.h>
-#include <Base/Exception.h>
+
+#include "SurfaceTriangulation.h"
+
 
 // http://svn.pointclouds.org/pcl/tags/pcl-1.5.1/test/
 #if defined(HAVE_PCL_SURFACE)
-#include <pcl/pcl_config.h>
-#include <pcl/point_types.h>
-#include <pcl/features/normal_3d.h>
-#include <pcl/surface/mls.h>
-#include <pcl/point_traits.h>
-#include <pcl/surface/gp3.h>
-#include <pcl/surface/grid_projection.h>
-#include <pcl/surface/poisson.h>
-//#include <pcl/surface/convex_hull.h>
-//#include <pcl/surface/concave_hull.h>
-#include <pcl/surface/organized_fast_mesh.h>
-#include <pcl/surface/marching_cubes_rbf.h>
-#include <pcl/surface/marching_cubes_hoppe.h>
-#include <pcl/surface/ear_clipping.h>
-#include <pcl/common/common.h>
-#include <pcl/common/io.h>
-#include <boost/random.hpp>
-#include <boost/math/special_functions/fpclassify.hpp>
+# include <boost/random.hpp>
+# include <boost/math/special_functions/fpclassify.hpp>
+# include <pcl/pcl_config.h>
+# include <pcl/point_types.h>
+# include <pcl/features/normal_3d.h>
+# include <pcl/surface/mls.h>
+# include <pcl/point_traits.h>
+# include <pcl/surface/gp3.h>
+# include <pcl/surface/grid_projection.h>
+# include <pcl/surface/poisson.h>
+# include <pcl/surface/organized_fast_mesh.h>
+# include <pcl/surface/marching_cubes_rbf.h>
+# include <pcl/surface/marching_cubes_hoppe.h>
+# include <pcl/surface/ear_clipping.h>
+# include <pcl/common/common.h>
+# include <pcl/common/io.h>
 
 #ifndef PCL_REVISION_VERSION
-#define PCL_REVISION_VERSION 0
+# define PCL_REVISION_VERSION 0
 #endif
 
 using namespace pcl;
@@ -765,4 +764,3 @@ void MeshConversion::convert(const pcl::PolygonMesh& pclMesh, Mesh::MeshObject&
 }
 
 #endif // HAVE_PCL_SURFACE
-

src/Mod/ReverseEngineering/App/SurfaceTriangulation.h

@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_SURFACETRIANGULATION_H
 #define REEN_SURFACETRIANGULATION_H
 
-#include <Base/Vector3D.h>
 #include <vector>
 
+#include <Base/Vector3D.h>
+
+
 namespace Points {class PointKernel;}
 namespace Mesh {class MeshObject;}
 namespace pcl {struct PolygonMesh;}

src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp

@@ -27,10 +27,8 @@
 #include <Base/PyObjectBase.h>
 #include <Gui/Application.h>
 #include <Gui/Language/Translator.h>
-#include "Workbench.h"
 
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
+#include "Workbench.h"
 
 
 // use a different name to CreateCommand()

src/Mod/ReverseEngineering/Gui/CMakeLists.txt

@@ -61,10 +61,15 @@ SET(ReverseEngineeringGuiIcon_SVG
     Resources/icons/ReverseEngineeringWorkbench.svg
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${ReenGui_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(ReverseEngineeringGui PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 add_library(ReverseEngineeringGui SHARED ${ReenGui_SRCS} ${ReverseEngineeringGuiIcon_SVG})
 target_link_libraries(ReverseEngineeringGui ${ReenGui_LIBS})
 
-
 SET_BIN_DIR(ReverseEngineeringGui ReverseEngineeringGui /Mod/ReverseEngineering)
 SET_PYTHON_PREFIX_SUFFIX(ReverseEngineeringGui)
 

src/Mod/ReverseEngineering/Gui/Command.cpp

@@ -20,49 +20,43 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <sstream>
 # include <QApplication>
 # include <QMessageBox>
+
 # include <BRep_Builder.hxx>
 # include <BRepBuilderAPI_MakePolygon.hxx>
 # include <TopoDS_Compound.hxx>
 #endif
 
-#include <sstream>
-
-#include <Mod/Part/App/TopoShape.h>
-#include <Mod/Part/App/PartFeature.h>
-#include <Mod/Part/App/FaceMakerCheese.h>
-#include <Mod/Part/App/Geometry.h>
-#include <Mod/Part/App/Tools.h>
-#include <Mod/Points/App/Structured.h>
-#include <Mod/Mesh/App/Mesh.h>
-#include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Mesh/App/Core/Approximation.h>
-#include <Mod/Mesh/App/Core/Algorithm.h>
-
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
+#include <Base/CoordinateSystem.h>
+#include <Base/Tools.h>
 #include <Gui/Application.h>
 #include <Gui/Command.h>
 #include <Gui/Control.h>
 #include <Gui/MainWindow.h>
-#include <Gui/FileDialog.h>
 #include <Gui/Selection.h>
-#include <Base/Builder3D.h>
-#include <Base/CoordinateSystem.h>
-#include <Base/Converter.h>
-#include <Base/Tools.h>
+#include <Mod/Part/App/FaceMakerCheese.h>
+#include <Mod/Part/App/Geometry.h>
+#include <Mod/Part/App/PartFeature.h>
+#include <Mod/Part/App/Tools.h>
+#include <Mod/Points/App/Structured.h>
+#include <Mod/ReverseEngineering/App/ApproxSurface.h>
+#include <Mod/Mesh/App/Core/Approximation.h>
+#include <Mod/Mesh/App/Core/Algorithm.h>
+#include <Mod/Mesh/App/MeshFeature.h>
 
-#include "../App/ApproxSurface.h"
 #include "FitBSplineSurface.h"
 #include "Poisson.h"
 #include "Segmentation.h"
 #include "SegmentationManual.h"
 
+
 using namespace std;
 
 DEF_STD_CMD_A(CmdApproxSurface)

src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp

@@ -20,35 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <algorithm>
 # include <QMessageBox>
-# include <QTextStream>
 #endif
 
-#include "ui_FitBSplineSurface.h"
-#include "FitBSplineSurface.h"
-
-#include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/Command.h>
-#include <Gui/Document.h>
-#include <Gui/Selection.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-
-#include <Base/Interpreter.h>
-#include <Base/Converter.h>
-#include <Base/CoordinateSystem.h>
-#include <App/Application.h>
 #include <App/ComplexGeoData.h>
 #include <App/Document.h>
 #include <App/Placement.h>
+#include <Base/Converter.h>
+#include <Base/CoordinateSystem.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
+#include <Gui/Selection.h>
+#include <Gui/WaitCursor.h>
 #include <Mod/Mesh/App/Core/Approximation.h>
 
+#include "ui_FitBSplineSurface.h"
+#include "FitBSplineSurface.h"
+
 
 using namespace ReenGui;
 

src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h

@@ -20,13 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REENGUI_FITBSPLINESURFACE_H
 #define REENGUI_FITBSPLINESURFACE_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-#include <App/DocumentObserver.h>
+#include <Gui/TaskView/TaskView.h>
+
 
 namespace ReenGui {
 

src/Mod/ReverseEngineering/Gui/Poisson.cpp

@@ -20,29 +20,19 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QMessageBox>
-# include <QTextStream>
 #endif
 
+#include <App/Document.h>
+#include <Gui/BitmapFactory.h>
+#include <Gui/Command.h>
+#include <Gui/WaitCursor.h>
+
 #include "ui_Poisson.h"
 #include "Poisson.h"
 
-#include <Gui/Application.h>
-#include <Gui/BitmapFactory.h>
-#include <Gui/Command.h>
-#include <Gui/Document.h>
-#include <Gui/Selection.h>
-#include <Gui/ViewProvider.h>
-#include <Gui/WaitCursor.h>
-
-#include <Base/Interpreter.h>
-#include <App/Application.h>
-#include <App/Document.h>
-
 
 using namespace ReenGui;
 

src/Mod/ReverseEngineering/Gui/Poisson.h

@@ -20,13 +20,12 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REENGUI_POISSON_H
 #define REENGUI_POISSON_H
 
-#include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
-#include <App/DocumentObserver.h>
+#include <Gui/TaskView/TaskView.h>
+
 
 namespace ReenGui {
 

src/Mod/ReverseEngineering/Gui/PreCompiled.cpp

@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"

src/Mod/ReverseEngineering/Gui/PreCompiled.h

@@ -26,35 +26,32 @@
 #include <FCConfig.h>
 
 #ifdef _MSC_VER
-#   pragma warning(disable : 4275)
+# pragma warning(disable : 4181)
+# pragma warning(disable : 4267)
+# pragma warning(disable : 4275)
+# pragma warning(disable : 4305)
+# pragma warning(disable : 4522)
 #endif
 
-
 #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 <sstream>
 
-#ifdef FC_OS_WIN32
-# include <windows.h>
-#endif
+// OpenCasCade
+#include <BRep_Builder.hxx>
+#include <BRepBuilderAPI_MakePolygon.hxx>
+#include <Geom_Plane.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <Standard_Failure.hxx>
+#include <TopoDS_Compound.hxx>
+#include <TopoDS_Wire.hxx>
 
 // Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
+#include <QApplication>
+#include <QMessageBox>
+#include <QPushButton>
 
 #endif //_PreComp_
 

src/Mod/ReverseEngineering/Gui/Segmentation.cpp

@@ -20,37 +20,36 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <sstream>
+
 # include <BRep_Builder.hxx>
 # include <BRepBuilderAPI_MakePolygon.hxx>
-# include <GeomAPI_ProjectPointOnSurf.hxx>
 # include <Geom_Plane.hxx>
+# include <GeomAPI_ProjectPointOnSurf.hxx>
 # include <Standard_Failure.hxx>
 # include <TopoDS_Compound.hxx>
 # include <TopoDS_Wire.hxx>
 #endif
 
-#include "Segmentation.h"
-#include "ui_Segmentation.h"
-#include <Base/Console.h>
 #include <App/Application.h>
 #include <App/Document.h>
 #include <App/DocumentObjectGroup.h>
+#include <Base/Console.h>
 #include <Gui/WaitCursor.h>
-
 #include <Mod/Mesh/App/Core/Approximation.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
-#include <Mod/Mesh/App/Core/Segmentation.h>
 #include <Mod/Mesh/App/Core/Curvature.h>
+#include <Mod/Mesh/App/Core/Segmentation.h>
 #include <Mod/Mesh/App/Core/Smoothing.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshFeature.h>
-#include <Mod/Part/App/PartFeature.h>
 #include <Mod/Part/App/FaceMakerCheese.h>
+#include <Mod/Part/App/PartFeature.h>
+
+#include "Segmentation.h"
+#include "ui_Segmentation.h"
+
 
 using namespace ReverseEngineeringGui;
 

src/Mod/ReverseEngineering/Gui/Segmentation.h

@@ -20,15 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REVERSEENGINEERINGGUI_SEGMENTATION_H
 #define REVERSEENGINEERINGGUI_SEGMENTATION_H
 
+#include <memory>
+
 #include <QWidget>
+
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
-#include <App/DocumentObserver.h>
-#include <memory>
+
 
 // forward declarations
 namespace Mesh { class Feature; }

src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp

@@ -20,32 +20,27 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <QPushButton>
 #endif
 
-#include "SegmentationManual.h"
-#include "ui_SegmentationManual.h"
 #include <App/Document.h>
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/Selection.h>
-
 #include <Mod/Mesh/App/Core/Approximation.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
 #include <Mod/Mesh/App/Core/Segmentation.h>
-#include <Mod/Mesh/App/Core/Curvature.h>
-#include <Mod/Mesh/App/Core/Smoothing.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshFeature.h>
 #include <Mod/Mesh/Gui/ViewProvider.h>
 
-using namespace ReverseEngineeringGui;
+#include "SegmentationManual.h"
+#include "ui_SegmentationManual.h"
 
 
+using namespace ReverseEngineeringGui;
+
 SegmentationManual::SegmentationManual(QWidget* parent, Qt::WindowFlags fl)
   : QWidget(parent, fl)
   , ui(new Ui_SegmentationManual)

src/Mod/ReverseEngineering/Gui/SegmentationManual.h

@@ -20,15 +20,17 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REVERSEENGINEERINGGUI_SEGMENTATIONMANUAL_H
 #define REVERSEENGINEERINGGUI_SEGMENTATIONMANUAL_H
 
+#include <memory>
+
 #include <QDialog>
+
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/TaskView/TaskView.h>
 #include <Mod/Mesh/Gui/MeshSelection.h>
-#include <memory>
+
 
 namespace ReverseEngineeringGui {
 class Ui_SegmentationManual;

src/Mod/ReverseEngineering/Gui/Workbench.cpp

@@ -20,17 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <qobject.h>
-#endif
-
-#include "Workbench.h"
 #include <Gui/MenuManager.h>
 #include <Gui/ToolBarManager.h>
 
+#include "Workbench.h"
+
+
 using namespace ReverseEngineeringGui;
 
 #if 0 // needed for Qt's lupdate utility

src/Mod/Robot/App/CMakeLists.txt

@@ -75,6 +75,12 @@ SET(Robot_SRCS
     ${Python_SRCS}
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Robot_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(Robot PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 # FIXME: The bundled KDL has some extensions which makes it incompatible
 # to an installed KDL. To fix the issue two things must be done:
 # * revert the changes (and look for an alternative)