From 3c4375986e146e9c80a2b01031b653ee801f112e Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 8 Dec 2022 22:11:33 +0100 Subject: [PATCH 01/19] TD: [skip ci] fix build failure with boost >= 1.78 on Windows --- src/Mod/TechDraw/App/AppTechDrawPy.cpp | 2 +- src/Mod/TechDraw/App/DrawUtil.cpp | 2 +- src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp | 2 +- src/Mod/TechDraw/App/PreCompiled.h | 2 +- src/boost_regex.hpp | 16 ++++++++++++++++ 5 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 src/boost_regex.hpp diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp index 9ad5c027a0..3330332779 100644 --- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp +++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp @@ -34,7 +34,7 @@ #include #endif -#include +#include #include #include diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp index 1d011c010b..617b3fc805 100644 --- a/src/Mod/TechDraw/App/DrawUtil.cpp +++ b/src/Mod/TechDraw/App/DrawUtil.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp index 5636538f63..d5f75ba42a 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp @@ -26,7 +26,7 @@ #ifndef _PreComp_ #include #include -#include +#include #endif #include diff --git a/src/Mod/TechDraw/App/PreCompiled.h b/src/Mod/TechDraw/App/PreCompiled.h index 5ac70f8e99..8d30795913 100644 --- a/src/Mod/TechDraw/App/PreCompiled.h +++ b/src/Mod/TechDraw/App/PreCompiled.h @@ -47,7 +47,7 @@ // boost #include #include -#include +#include #include #include #include diff --git a/src/boost_regex.hpp b/src/boost_regex.hpp new file mode 100644 index 0000000000..ed25454ac3 --- /dev/null +++ b/src/boost_regex.hpp @@ -0,0 +1,16 @@ +#ifndef FREECAD_REGEX_HPP_WORKAROUND +#define FREECAD_REGEX_HPP_WORKAROUND + +#include + +#if BOOST_VERSION >= 107800 + +// Workaround for boost >= 1.78 +#ifdef WIN32 +#include +#endif + +#endif +#include + +#endif // #ifndef FREECAD_REGEX_HPP_WORKAROUND From e63b0cbc047d3dc3cd07dfa0f14151331f9abece Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 9 Dec 2022 00:16:44 +0100 Subject: [PATCH 02/19] [Win installer] update file deletion list - ported from the 0-20 branch --- src/WindowsInstaller/Delete.bat | 183 +++++++++++++++++--------------- 1 file changed, 95 insertions(+), 88 deletions(-) diff --git a/src/WindowsInstaller/Delete.bat b/src/WindowsInstaller/Delete.bat index d13583974a..5451b525c7 100644 --- a/src/WindowsInstaller/Delete.bat +++ b/src/WindowsInstaller/Delete.bat @@ -1,88 +1,95 @@ -del bin\assistant.exe -del bin\Coin4d.dll -del bin\designer.exe -del bin\freetyped.dll -del bin\libcrypto-3d.dll -del bin\libEGLd.dll -del bin\libGLESv2d.dll -del bin\linguist.exe -del bin\qdoc.exe -del bin\Qt53DAnimationd.dll -del bin\Qt53DCored.dll -del bin\Qt53DExtrasd.dll -del bin\Qt53DInputd.dll -del bin\Qt53DLogicd.dll -del bin\Qt53DQuickAnimationd.dll -del bin\Qt53DQuickd.dll -del bin\Qt53DQuickExtrasd.dll -del bin\Qt53DQuickInputd.dll -del bin\Qt53DQuickRenderd.dll -del bin\Qt53DQuickScene2Dd.dll -del bin\Qt53DRenderd.dll -del bin\Qt5Bluetoothd.dll -del bin\Qt5Bodymovind.dll -del bin\Qt5Chartsd.dll -del bin\Qt5Concurrentd.dll -del bin\Qt5Cored.dll -del bin\Qt5DataVisualizationd.dll -del bin\Qt5DBusd.dll -del bin\Qt5DesignerComponentsd.dll -del bin\Qt5Designerd.dll -del bin\Qt5Gamepadd.dll -del bin\Qt5Guid.dll -del bin\Qt5Helpd.dll -del bin\Qt5Locationd.dll -del bin\Qt5Multimediad.dll -del bin\Qt5MultimediaQuickd.dll -del bin\Qt5MultimediaWidgetsd.dll -del bin\Qt5NetworkAuthd.dll -del bin\Qt5Networkd.dll -del bin\Qt5Nfcd.dll -del bin\Qt5OpenGLd.dll -del bin\Qt5Pdfd.dll -del bin\Qt5PdfWidgetsd.dll -del bin\Qt5Positioningd.dll -del bin\Qt5PositioningQuickd.dll -del bin\Qt5PrintSupportd.dll -del bin\Qt5Purchasingd.dll -del bin\Qt5Qmld.dll -del bin\Qt5QmlModelsd.dll -del bin\Qt5QmlWorkerScriptd.dll -del bin\Qt5Quick3DAssetImportd.dll -del bin\Qt5Quick3Dd.dll -del bin\Qt5Quick3DRenderd.dll -del bin\Qt5Quick3DRuntimeRenderd.dll -del bin\Qt5Quick3DUtilsd.dll -del bin\Qt5QuickControls2d.dll -del bin\Qt5Quickd.dll -del bin\Qt5QuickParticlesd.dll -del bin\Qt5QuickShapesd.dll -del bin\Qt5QuickTemplates2d.dll -del bin\Qt5QuickTestd.dll -del bin\Qt5QuickWidgetsd.dll -del bin\Qt5RemoteObjectsd.dll -del bin\Qt5Scriptd.dll -del bin\Qt5ScriptToolsd.dll -del bin\Qt5Scxmld.dll -del bin\Qt5Sensorsd.dll -del bin\Qt5SerialBusd.dll -del bin\Qt5SerialPortd.dll -del bin\Qt5Sqld.dll -del bin\Qt5Svgd.dll -del bin\Qt5Testd.dll -del bin\Qt5TextToSpeechd.dll -del bin\Qt5VirtualKeyboardd.dll -del bin\Qt5WebChanneld.dll -del bin\Qt5WebEngineCored.dll -del bin\Qt5WebEngined.dll -del bin\Qt5WebEngineWidgetsd.dll -del bin\Qt5WebSocketsd.dll -del bin\Qt5WebViewd.dll -del bin\Qt5Widgetsd.dll -del bin\Qt5WinExtrasd.dll -del bin\Qt5Xmld.dll -del bin\Qt5XmlPatternsd.dll -del bin\QtWebEngineProcessd.exe -del bin\Quarter1d.dll -del bin\xerces-c_3_2D.dll -del bin\zlibd.dll +del /S *_d.* +del /S *_debug.* +del /S *.pyc +del /S *.pdb +del /S boost*-gd-*.dll +cd bin +del assistant.exe +del Coin4d.dll +del designer.exe +del freetyped.dll +del libcrypto-3d.dll +del libEGLd.dll +del libGLESv2d.dll +del libssl-3d.dll +del linguist.exe +del qdoc.exe +del Qt53DAnimationd.dll +del Qt53DCored.dll +del Qt53DExtrasd.dll +del Qt53DInputd.dll +del Qt53DLogicd.dll +del Qt53DQuickAnimationd.dll +del Qt53DQuickd.dll +del Qt53DQuickExtrasd.dll +del Qt53DQuickInputd.dll +del Qt53DQuickRenderd.dll +del Qt53DQuickScene2Dd.dll +del Qt53DRenderd.dll +del Qt5Bluetoothd.dll +del Qt5Bodymovind.dll +del Qt5Chartsd.dll +del Qt5Concurrentd.dll +del Qt5Cored.dll +del Qt5DataVisualizationd.dll +del Qt5DBusd.dll +del Qt5DesignerComponentsd.dll +del Qt5Designerd.dll +del Qt5Gamepadd.dll +del Qt5Guid.dll +del Qt5Helpd.dll +del Qt5Locationd.dll +del Qt5Multimediad.dll +del Qt5MultimediaQuickd.dll +del Qt5MultimediaWidgetsd.dll +del Qt5NetworkAuthd.dll +del Qt5Networkd.dll +del Qt5Nfcd.dll +del Qt5OpenGLd.dll +del Qt5Pdfd.dll +del Qt5PdfWidgetsd.dll +del Qt5Positioningd.dll +del Qt5PositioningQuickd.dll +del Qt5PrintSupportd.dll +del Qt5Purchasingd.dll +del Qt5Qmld.dll +del Qt5QmlModelsd.dll +del Qt5QmlWorkerScriptd.dll +del Qt5Quick3DAssetImportd.dll +del Qt5Quick3Dd.dll +del Qt5Quick3DRenderd.dll +del Qt5Quick3DRuntimeRenderd.dll +del Qt5Quick3DUtilsd.dll +del Qt5QuickControls2d.dll +del Qt5Quickd.dll +del Qt5QuickParticlesd.dll +del Qt5QuickShapesd.dll +del Qt5QuickTemplates2d.dll +del Qt5QuickTestd.dll +del Qt5QuickWidgetsd.dll +del Qt5RemoteObjectsd.dll +del Qt5Scriptd.dll +del Qt5ScriptToolsd.dll +del Qt5Scxmld.dll +del Qt5Sensorsd.dll +del Qt5SerialBusd.dll +del Qt5SerialPortd.dll +del Qt5Sqld.dll +del Qt5Svgd.dll +del Qt5Testd.dll +del Qt5TextToSpeechd.dll +del Qt5VirtualKeyboardd.dll +del Qt5WebChanneld.dll +del Qt5WebEngineCored.dll +del Qt5WebEngined.dll +del Qt5WebEngineWidgetsd.dll +del Qt5WebSocketsd.dll +del Qt5WebViewd.dll +del Qt5Widgetsd.dll +del Qt5WinExtrasd.dll +del Qt5Xmld.dll +del Qt5XmlPatternsd.dll +del QtWebEngineProcessd.exe +del Quarter1d.dll +del xerces-c_3_2D.dll +del zlibd.dll From 3c5243035f42aba5ccd5a74f70f08a251c29b350 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 9 Dec 2022 00:58:49 +0100 Subject: [PATCH 03/19] [Spread] fix compilation issues with qtcolorpicker.cpp - "signals" is no longer accepted by Qt - in QColorDialog::getColor the third argument must not be a nullptr --- src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp | 72 ++++++++++++----------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp index 39c1ba6d1f..b746fad689 100644 --- a/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp +++ b/src/Mod/Spreadsheet/Gui/qtcolorpicker.cpp @@ -45,30 +45,32 @@ ** ****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "PreCompiled.h" +#ifndef _PreComp_ +# include + +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +#endif -#include #include + #include "qtcolorpicker.h" + /*! \class QtColorPicker \brief The QtColorPicker class provides a widget for selecting @@ -149,7 +151,7 @@ class ColorPickerButton : public QFrame public: ColorPickerButton(QWidget *parent); -signals: +Q_SIGNALS: void clicked(); protected: @@ -180,7 +182,7 @@ public: void setSelected(bool); bool isSelected() const; -signals: +Q_SIGNALS: void clicked(); void selected(); @@ -223,7 +225,7 @@ public: void setLastSel(const QColor & col); -signals: +Q_SIGNALS: void selected(const QColor &); void hid(); @@ -836,16 +838,16 @@ void ColorPickerPopup::showEvent(QShowEvent *) { bool foundSelected = false; for (int i = 0; i < grid->columnCount(); ++i) { - for (int j = 0; j < grid->rowCount(); ++j) { - QWidget *w = widgetAt[j][i]; - if (w && w->inherits("ColorPickerItem")) { - if (((ColorPickerItem *)w)->isSelected()) { - w->setFocus(); - foundSelected = true; - break; + for (int j = 0; j < grid->rowCount(); ++j) { + QWidget* w = widgetAt[j][i]; + if (w && w->inherits("ColorPickerItem")) { + if (((ColorPickerItem*)w)->isSelected()) { + w->setFocus(); + foundSelected = true; + break; + } + } } - } - } } if (!foundSelected) { @@ -905,9 +907,11 @@ void ColorPickerPopup::getColorFromDialog() //QRgb rgb = QColorDialog::getRgba(lastSel.rgba(), &ok, parentWidget()); QColor col; if (Gui::DialogOptions::dontUseNativeColorDialog()){ - col = QColorDialog::getColor(lastSel, parentWidget(), nullptr, QColorDialog::ShowAlphaChannel|QColorDialog::DontUseNativeDialog); + col = QColorDialog::getColor(lastSel, parentWidget(), QString(), + QColorDialog::ShowAlphaChannel | QColorDialog::DontUseNativeDialog); } else { - col = QColorDialog::getColor(lastSel, parentWidget(), nullptr, QColorDialog::ShowAlphaChannel); + col = QColorDialog::getColor(lastSel, parentWidget(), QString(), + QColorDialog::ShowAlphaChannel); } if (!col.isValid()) return; From f709f39ce78e71471ac364133c0aa31011428034 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 9 Dec 2022 01:22:35 +0100 Subject: [PATCH 04/19] [Iamge] Gui: enable precompiled header --- src/Gui/QtAll.h | 9 +++++- src/Mod/Image/Gui/CMakeLists.txt | 6 ++++ src/Mod/Image/Gui/ImageView.cpp | 1 + src/Mod/Image/Gui/OpenGLImageBox.cpp | 1 + src/Mod/Image/Gui/PreCompiled.cpp | 1 - src/Mod/Image/Gui/PreCompiled.h | 31 +++++--------------- src/Mod/Image/Gui/ViewProviderImagePlane.cpp | 8 ++--- 7 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/Gui/QtAll.h b/src/Gui/QtAll.h index ae889cd7f3..bbca63b93c 100644 --- a/src/Gui/QtAll.h +++ b/src/Gui/QtAll.h @@ -26,6 +26,7 @@ // QtCore #include #include +#include #include #include #include @@ -109,8 +110,12 @@ #include #include #include +#include +#include +#include #include -#include +#include +#include #include #include #include @@ -141,6 +146,7 @@ #include #include #include +#include #include #include #include @@ -149,6 +155,7 @@ #include #include #include +#include #include #include #include diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt index 914b160bb2..48818d3d6a 100644 --- a/src/Mod/Image/Gui/CMakeLists.txt +++ b/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 ) diff --git a/src/Mod/Image/Gui/ImageView.cpp b/src/Mod/Image/Gui/ImageView.cpp index ff192ca290..3ed10ac863 100644 --- a/src/Mod/Image/Gui/ImageView.cpp +++ b/src/Mod/Image/Gui/ImageView.cpp @@ -18,6 +18,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ # include + # include # include # include diff --git a/src/Mod/Image/Gui/OpenGLImageBox.cpp b/src/Mod/Image/Gui/OpenGLImageBox.cpp index fa6d014a67..4649e2a3ab 100644 --- a/src/Mod/Image/Gui/OpenGLImageBox.cpp +++ b/src/Mod/Image/Gui/OpenGLImageBox.cpp @@ -19,6 +19,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ # include + # include # include # include diff --git a/src/Mod/Image/Gui/PreCompiled.cpp b/src/Mod/Image/Gui/PreCompiled.cpp index 7b200a1bf2..820dcebfee 100644 --- a/src/Mod/Image/Gui/PreCompiled.cpp +++ b/src/Mod/Image/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Image/Gui/PreCompiled.h b/src/Mod/Image/Gui/PreCompiled.h index 041a38eee1..b335400317 100644 --- a/src/Mod/Image/Gui/PreCompiled.h +++ b/src/Mod/Image/Gui/PreCompiled.h @@ -35,34 +35,17 @@ #ifdef _PreComp_ -// standard -#include +// STL #include -#include #include -// STL -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef FC_OS_WIN32 -# include -#endif - // Inventor -# include -# include -# include -# include -# include -# include +#include +#include +#include +#include +#include +#include // Qt Toolkit #ifndef __QtAll__ diff --git a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp index 49a7ff97ae..a1c4fbdb07 100644 --- a/src/Mod/Image/Gui/ViewProviderImagePlane.cpp +++ b/src/Mod/Image/Gui/ViewProviderImagePlane.cpp @@ -21,18 +21,18 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ # include +# include +# include +# include + # include # include # include # include # include # include -# include -# include -# include #endif #include From 3f7ea7bb277d4b9c4fcb62aac6bd256e1181e220 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 9 Dec 2022 02:54:12 +0100 Subject: [PATCH 05/19] [Robot] Gui: enable precompiled header --- src/Mod/Robot/Gui/CMakeLists.txt | 7 ++++++- src/Mod/Robot/Gui/PreCompiled.cpp | 1 - src/Mod/Robot/Gui/PreCompiled.h | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index 5bd908f3a5..e8ee4133d1 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -119,11 +119,16 @@ SET(RobotGui_SRCS ${RobotGui_SRCS_TaskDlg} ) +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${RobotGui_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(RobotGui PreCompiled.h PreCompiled.cpp PCH_SRCS) +endif(FREECAD_USE_PCH) + SET(RobotGuiIcon_SVG Resources/icons/RobotWorkbench.svg ) - add_library(RobotGui SHARED ${RobotGui_SRCS} ${RobotGuiIcon_SVG}) target_link_libraries(RobotGui ${RobotGui_LIBS}) diff --git a/src/Mod/Robot/Gui/PreCompiled.cpp b/src/Mod/Robot/Gui/PreCompiled.cpp index 7cd1cae80f..cde4369c5b 100644 --- a/src/Mod/Robot/Gui/PreCompiled.cpp +++ b/src/Mod/Robot/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h index e0dad2e726..eb2a061446 100644 --- a/src/Mod/Robot/Gui/PreCompiled.h +++ b/src/Mod/Robot/Gui/PreCompiled.h @@ -50,10 +50,6 @@ // STL #include -#ifdef FC_OS_WIN32 -# include -#endif - // Qt #include #include From 0d92058fb814671b4e10d679f38bc4dd5ffd6032 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 9 Dec 2022 02:44:30 +0100 Subject: [PATCH 06/19] [Robot] App: enable precompiled header --- src/Mod/Robot/App/CMakeLists.txt | 6 ++++++ src/Mod/Robot/App/PreCompiled.cpp | 1 - src/Mod/Robot/App/PreCompiled.h | 8 ++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index 56fe62b934..c6a17d7158 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/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) diff --git a/src/Mod/Robot/App/PreCompiled.cpp b/src/Mod/Robot/App/PreCompiled.cpp index 1e5d389dd2..942976f8be 100644 --- a/src/Mod/Robot/App/PreCompiled.cpp +++ b/src/Mod/Robot/App/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Robot/App/PreCompiled.h b/src/Mod/Robot/App/PreCompiled.h index 564b76b41c..2885f0a1c9 100644 --- a/src/Mod/Robot/App/PreCompiled.h +++ b/src/Mod/Robot/App/PreCompiled.h @@ -38,13 +38,9 @@ #ifdef _PreComp_ -// standard -#include -#include -#include +// STL +#include #include -#include -#include // kdl_cp #include "kdl_cp/chain.hpp" From 8d6255b0e8d8c8650985634c6ed622bbf8957b29 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 9 Dec 2022 14:43:59 +0100 Subject: [PATCH 07/19] Base: refactor InventorBuilder --- src/Base/Builder3D.cpp | 27 +++++++++++++++++++++++++++ src/Base/Builder3D.h | 15 +++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/Base/Builder3D.cpp b/src/Base/Builder3D.cpp index f2d77f8c8f..40c2ac8f55 100644 --- a/src/Base/Builder3D.cpp +++ b/src/Base/Builder3D.cpp @@ -546,6 +546,33 @@ void PolygonOffsetItem::write(InventorOutput& out) const // ----------------------------------------------------------------------------- +Coordinate3Item::Coordinate3Item(const std::vector& points) + : points(points) +{ +} + +void Coordinate3Item::write(InventorOutput& out) const +{ + beginPoint(out); + InventorFieldWriter writer; + writer.write("point", points, out); + endPoint(out); +} + +void Coordinate3Item::beginPoint(InventorOutput& out) const +{ + out.writeLine("Coordinate3 {"); + out.increaseIndent(); +} + +void Coordinate3Item::endPoint(InventorOutput& out) const +{ + out.decreaseIndent(); + out.writeLine("}"); +} + +// ----------------------------------------------------------------------------- + void PointSetItem::write(InventorOutput& out) const { out.writeLine("PointSet { }"); diff --git a/src/Base/Builder3D.h b/src/Base/Builder3D.h index 83587a1101..788271528e 100644 --- a/src/Base/Builder3D.h +++ b/src/Base/Builder3D.h @@ -354,6 +354,21 @@ private: PolygonOffset offset; }; +/*! + * \brief The Coordinate3Item class supports the SoCoordinate3 node. + */ +class BaseExport Coordinate3Item : public NodeItem +{ +public: + Coordinate3Item(const std::vector& points); + void write(InventorOutput& out) const override; + +private: + void beginPoint(InventorOutput& out) const; + void endPoint(InventorOutput& out) const; + std::vector points; +}; + /*! * \brief The PointSetItem class supports the SoPointSet node. */ From 13b0b89160954d4a0eeeefcffdca2791921ce05d Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 9 Dec 2022 18:48:27 +0100 Subject: [PATCH 08/19] [Image] App: enable precompiled header - despite there are actually no header, this is nevertheless sensible, see the discussion in #7990 --- src/Mod/Image/App/CMakeLists.txt | 6 ++++++ src/Mod/Image/App/PreCompiled.cpp | 1 - src/Mod/Image/App/PreCompiled.h | 18 ++++-------------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/Mod/Image/App/CMakeLists.txt b/src/Mod/Image/App/CMakeLists.txt index 500ed9f8c7..5f4096855a 100644 --- a/src/Mod/Image/App/CMakeLists.txt +++ b/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}) diff --git a/src/Mod/Image/App/PreCompiled.cpp b/src/Mod/Image/App/PreCompiled.cpp index 7b200a1bf2..820dcebfee 100644 --- a/src/Mod/Image/App/PreCompiled.cpp +++ b/src/Mod/Image/App/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Image/App/PreCompiled.h b/src/Mod/Image/App/PreCompiled.h index bd443e6e15..44ab746777 100644 --- a/src/Mod/Image/App/PreCompiled.h +++ b/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 -#include -#include -#include -#include -#include -#include -#include -#include - #endif // _PreComp_ #endif From 454dddb8baefce7882f324da631893491b65388e Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 9 Dec 2022 19:05:32 +0100 Subject: [PATCH 09/19] [PD] App: precompiled header fixes - use same naming scheme ans CMakeLists structure as for all other WBs --- src/Mod/PartDesign/App/AppPartDesign.cpp | 2 +- src/Mod/PartDesign/App/AppPartDesignPy.cpp | 2 +- src/Mod/PartDesign/App/CMakeLists.txt | 14 +++++++------- src/Mod/PartDesign/App/PreCompiled.cpp | 1 - src/Mod/PartDesign/__init__.py | 6 +++--- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Mod/PartDesign/App/AppPartDesign.cpp b/src/Mod/PartDesign/App/AppPartDesign.cpp index 87ed33c03b..3ced52cdb8 100644 --- a/src/Mod/PartDesign/App/AppPartDesign.cpp +++ b/src/Mod/PartDesign/App/AppPartDesign.cpp @@ -63,7 +63,7 @@ extern PyObject* initModule(); } /* Python entry */ -PyMOD_INIT_FUNC(_PartDesign) +PyMOD_INIT_FUNC(PartDesign) { // load dependent module try { diff --git a/src/Mod/PartDesign/App/AppPartDesignPy.cpp b/src/Mod/PartDesign/App/AppPartDesignPy.cpp index a9473d999e..68b1d059cc 100644 --- a/src/Mod/PartDesign/App/AppPartDesignPy.cpp +++ b/src/Mod/PartDesign/App/AppPartDesignPy.cpp @@ -32,7 +32,7 @@ namespace PartDesign { class Module : public Py::ExtensionModule { public: - Module() : Py::ExtensionModule("_PartDesign") + Module() : Py::ExtensionModule("PartDesign") { add_varargs_method("makeFilletArc",&Module::makeFilletArc, "makeFilletArc(...) -- Fillet arc." diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index d74a77c1d5..278a57e3c5 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -144,16 +144,16 @@ SET(PartDesign_SRCS ${Python_SRCS} ) +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${PartDesign_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(PartDesign PreCompiled.h PreCompiled.cpp PCH_SRCS) +endif(FREECAD_USE_PCH) + add_library(PartDesign SHARED ${PartDesign_SRCS}) target_link_libraries(PartDesign ${PartDesign_LIBS}) -if(FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PartDesign_CPP_SRCS ${PartDesign_SRCS}) - ADD_MSVC_PRECOMPILED_HEADER(PartDesign PreCompiled.h PreCompiled.cpp PartDesign_CPP_SRCS) -endif(FREECAD_USE_PCH) - -SET_BIN_DIR(PartDesign _PartDesign /Mod/PartDesign) +SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign) SET_PYTHON_PREFIX_SUFFIX(PartDesign) INSTALL(TARGETS PartDesign DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/PartDesign/App/PreCompiled.cpp b/src/Mod/PartDesign/App/PreCompiled.cpp index 7cd1cae80f..cde4369c5b 100644 --- a/src/Mod/PartDesign/App/PreCompiled.cpp +++ b/src/Mod/PartDesign/App/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/PartDesign/__init__.py b/src/Mod/PartDesign/__init__.py index 29a70ae509..20855033ff 100644 --- a/src/Mod/PartDesign/__init__.py +++ b/src/Mod/PartDesign/__init__.py @@ -1,3 +1,3 @@ -import _PartDesign -makeFilletArc = _PartDesign.makeFilletArc - +import PartDesign +makeFilletArc = PartDesign.makeFilletArc + From 1046bd14a8650a7054279558a4b246e731f78c63 Mon Sep 17 00:00:00 2001 From: wwmayer Date: Fri, 9 Dec 2022 23:38:59 +0100 Subject: [PATCH 10/19] Revert "[PD] App: precompiled header fixes" --- src/Mod/PartDesign/App/AppPartDesign.cpp | 2 +- src/Mod/PartDesign/App/AppPartDesignPy.cpp | 2 +- src/Mod/PartDesign/App/CMakeLists.txt | 14 +++++++------- src/Mod/PartDesign/App/PreCompiled.cpp | 1 + src/Mod/PartDesign/__init__.py | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Mod/PartDesign/App/AppPartDesign.cpp b/src/Mod/PartDesign/App/AppPartDesign.cpp index 3ced52cdb8..87ed33c03b 100644 --- a/src/Mod/PartDesign/App/AppPartDesign.cpp +++ b/src/Mod/PartDesign/App/AppPartDesign.cpp @@ -63,7 +63,7 @@ extern PyObject* initModule(); } /* Python entry */ -PyMOD_INIT_FUNC(PartDesign) +PyMOD_INIT_FUNC(_PartDesign) { // load dependent module try { diff --git a/src/Mod/PartDesign/App/AppPartDesignPy.cpp b/src/Mod/PartDesign/App/AppPartDesignPy.cpp index 68b1d059cc..a9473d999e 100644 --- a/src/Mod/PartDesign/App/AppPartDesignPy.cpp +++ b/src/Mod/PartDesign/App/AppPartDesignPy.cpp @@ -32,7 +32,7 @@ namespace PartDesign { class Module : public Py::ExtensionModule { public: - Module() : Py::ExtensionModule("PartDesign") + Module() : Py::ExtensionModule("_PartDesign") { add_varargs_method("makeFilletArc",&Module::makeFilletArc, "makeFilletArc(...) -- Fillet arc." diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index 278a57e3c5..d74a77c1d5 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -144,16 +144,16 @@ SET(PartDesign_SRCS ${Python_SRCS} ) -if(FREECAD_USE_PCH) - add_definitions(-D_PreComp_) - GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${PartDesign_SRCS}) - ADD_MSVC_PRECOMPILED_HEADER(PartDesign PreCompiled.h PreCompiled.cpp PCH_SRCS) -endif(FREECAD_USE_PCH) - add_library(PartDesign SHARED ${PartDesign_SRCS}) target_link_libraries(PartDesign ${PartDesign_LIBS}) -SET_BIN_DIR(PartDesign PartDesign /Mod/PartDesign) +if(FREECAD_USE_PCH) + add_definitions(-D_PreComp_) + GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PartDesign_CPP_SRCS ${PartDesign_SRCS}) + ADD_MSVC_PRECOMPILED_HEADER(PartDesign PreCompiled.h PreCompiled.cpp PartDesign_CPP_SRCS) +endif(FREECAD_USE_PCH) + +SET_BIN_DIR(PartDesign _PartDesign /Mod/PartDesign) SET_PYTHON_PREFIX_SUFFIX(PartDesign) INSTALL(TARGETS PartDesign DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/PartDesign/App/PreCompiled.cpp b/src/Mod/PartDesign/App/PreCompiled.cpp index cde4369c5b..7cd1cae80f 100644 --- a/src/Mod/PartDesign/App/PreCompiled.cpp +++ b/src/Mod/PartDesign/App/PreCompiled.cpp @@ -20,4 +20,5 @@ * * ***************************************************************************/ + #include "PreCompiled.h" diff --git a/src/Mod/PartDesign/__init__.py b/src/Mod/PartDesign/__init__.py index 20855033ff..29a70ae509 100644 --- a/src/Mod/PartDesign/__init__.py +++ b/src/Mod/PartDesign/__init__.py @@ -1,3 +1,3 @@ -import PartDesign -makeFilletArc = PartDesign.makeFilletArc - +import _PartDesign +makeFilletArc = _PartDesign.makeFilletArc + From 7acc1eca608144a6f727c765ef2f0d17db656b55 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 9 Dec 2022 21:27:00 +0100 Subject: [PATCH 11/19] [Mesh] App: remove unused/unnecessary headers --- src/Mod/Mesh/App/Core/Degeneration.h | 1 - src/Mod/Mesh/App/PreCompiled.h | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Mod/Mesh/App/Core/Degeneration.h b/src/Mod/Mesh/App/Core/Degeneration.h index de4e7e4033..2cb5d58e8c 100644 --- a/src/Mod/Mesh/App/Core/Degeneration.h +++ b/src/Mod/Mesh/App/Core/Degeneration.h @@ -23,7 +23,6 @@ #ifndef MESH_DEGENERATION_H #define MESH_DEGENERATION_H -#include #include #include diff --git a/src/Mod/Mesh/App/PreCompiled.h b/src/Mod/Mesh/App/PreCompiled.h index 06f08490e9..9cce876f6d 100644 --- a/src/Mod/Mesh/App/PreCompiled.h +++ b/src/Mod/Mesh/App/PreCompiled.h @@ -51,7 +51,6 @@ #endif // STL #include -#include #include #include #include @@ -63,16 +62,14 @@ #include #include -#ifdef FC_OS_WIN32 -#include -#endif - +// boost #include #include #include #include #include +// Xerces #include #include #include From b4bd8d9f6c2bde1e6b1d342671cee4c01d043c20 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 10 Dec 2022 00:51:34 +0100 Subject: [PATCH 12/19] [Mesh] Gui: enable precompiled header --- src/Gui/InventorAll.h | 2 ++ src/Mod/Mesh/Gui/CMakeLists.txt | 6 ++++++ src/Mod/Mesh/Gui/Doxygen.cpp | 1 + src/Mod/Mesh/Gui/PreCompiled.cpp | 1 - src/Mod/Mesh/Gui/PreCompiled.h | 20 +------------------- 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/Gui/InventorAll.h b/src/Gui/InventorAll.h index b0310a850d..4e13c0b63f 100644 --- a/src/Gui/InventorAll.h +++ b/src/Gui/InventorAll.h @@ -66,6 +66,7 @@ #include #include #include +#include #include #include #include @@ -90,6 +91,7 @@ #include #include #include +#include #include #include #include diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 372a2f8ac4..50ad208c61 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/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 ) diff --git a/src/Mod/Mesh/Gui/Doxygen.cpp b/src/Mod/Mesh/Gui/Doxygen.cpp index 3b0465cba4..8d9d4f7f0c 100644 --- a/src/Mod/Mesh/Gui/Doxygen.cpp +++ b/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 diff --git a/src/Mod/Mesh/Gui/PreCompiled.cpp b/src/Mod/Mesh/Gui/PreCompiled.cpp index ccf2b83403..a634963fef 100644 --- a/src/Mod/Mesh/Gui/PreCompiled.cpp +++ b/src/Mod/Mesh/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h index 1c782f3a10..fd81e3ec9e 100644 --- a/src/Mod/Mesh/Gui/PreCompiled.h +++ b/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 #endif + // standard -#include -#include #include // STL #include -#include -#include -#include #include #include -#include -#include #include -#include #include #include -#ifdef FC_OS_WIN32 -# include -#endif - // Qt Toolkit #ifndef __QtAll__ # include @@ -73,14 +61,8 @@ // Inventor #ifndef __InventorAll__ # include -# include #endif -#elif defined(FC_OS_WIN32) -#ifndef NOMINMAX -#define NOMINMAX -#endif -#include #endif //_PreComp_ #endif // MESHGUI_PRECOMPILED_H From 60d43eb0b5143439330416f9b298617445b5e828 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 10 Dec 2022 02:06:23 +0100 Subject: [PATCH 13/19] [Raytracing] remove unused headers from PreCompiled - just a preparation since enabling precompiled headers do not yet compile --- src/Mod/Raytracing/App/PreCompiled.h | 3 --- src/Mod/Raytracing/Gui/PreCompiled.cpp | 1 - src/Mod/Raytracing/Gui/PreCompiled.h | 6 ++---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Mod/Raytracing/App/PreCompiled.h b/src/Mod/Raytracing/App/PreCompiled.h index d0514ec43d..11e89819e6 100644 --- a/src/Mod/Raytracing/App/PreCompiled.h +++ b/src/Mod/Raytracing/App/PreCompiled.h @@ -28,19 +28,16 @@ #ifdef _PreComp_ // STL -#include #include #include // OpenCascade View #include -#include #include #include #include #include #include -#include #endif //_PreComp_ diff --git a/src/Mod/Raytracing/Gui/PreCompiled.cpp b/src/Mod/Raytracing/Gui/PreCompiled.cpp index 3e85848b9a..ddca5c129e 100644 --- a/src/Mod/Raytracing/Gui/PreCompiled.cpp +++ b/src/Mod/Raytracing/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Raytracing/Gui/PreCompiled.h b/src/Mod/Raytracing/Gui/PreCompiled.h index 6f90966969..4429c44ebc 100644 --- a/src/Mod/Raytracing/Gui/PreCompiled.h +++ b/src/Mod/Raytracing/Gui/PreCompiled.h @@ -39,11 +39,9 @@ # include #endif -// OpenCasCade Base -#include - -// OpenCascade View +// OpenCascade #include +#include // Qt Toolkit # include From b2a3c5e22ccb10d56d97a0688eef452a10256c13 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 10 Dec 2022 04:43:58 +0100 Subject: [PATCH 14/19] [Drawing] App: remove unused headers - also some sorting - also enable precompiled header --- src/Mod/Drawing/App/AppDrawing.cpp | 18 +- src/Mod/Drawing/App/AppDrawingPy.cpp | 13 +- src/Mod/Drawing/App/CMakeLists.txt | 12 ++ src/Mod/Drawing/App/DrawingExport.cpp | 77 +++---- src/Mod/Drawing/App/DrawingExport.h | 2 +- src/Mod/Drawing/App/FeatureClip.cpp | 17 +- src/Mod/Drawing/App/FeatureClip.h | 3 +- src/Mod/Drawing/App/FeaturePage.cpp | 15 +- src/Mod/Drawing/App/FeaturePage.h | 4 - src/Mod/Drawing/App/FeatureProjection.cpp | 15 +- src/Mod/Drawing/App/FeatureProjection.h | 8 +- src/Mod/Drawing/App/FeatureView.cpp | 33 ++- src/Mod/Drawing/App/FeatureView.h | 8 +- src/Mod/Drawing/App/FeatureViewAnnotation.cpp | 17 +- src/Mod/Drawing/App/FeatureViewAnnotation.h | 10 +- src/Mod/Drawing/App/FeatureViewPart.cpp | 36 +--- src/Mod/Drawing/App/FeatureViewPart.h | 10 +- .../Drawing/App/FeatureViewSpreadsheet.cpp | 119 ++++++----- src/Mod/Drawing/App/FeatureViewSpreadsheet.h | 4 +- src/Mod/Drawing/App/FeatureViewSymbol.cpp | 15 +- src/Mod/Drawing/App/FeatureViewSymbol.h | 10 +- src/Mod/Drawing/App/PageGroup.cpp | 4 +- src/Mod/Drawing/App/PageGroup.h | 6 - src/Mod/Drawing/App/PreCompiled.h | 191 +++--------------- src/Mod/Drawing/App/ProjectionAlgos.cpp | 60 ++---- src/Mod/Drawing/App/ProjectionAlgos.h | 9 +- 26 files changed, 223 insertions(+), 493 deletions(-) diff --git a/src/Mod/Drawing/App/AppDrawing.cpp b/src/Mod/Drawing/App/AppDrawing.cpp index 332751dbde..23dc007792 100644 --- a/src/Mod/Drawing/App/AppDrawing.cpp +++ b/src/Mod/Drawing/App/AppDrawing.cpp @@ -12,17 +12,17 @@ #include "PreCompiled.h" #include -#include #include - -#include "FeaturePage.h" -#include "FeatureView.h" -#include "FeatureViewPart.h" -#include "FeatureViewAnnotation.h" -#include "FeatureViewSymbol.h" -#include "FeatureProjection.h" -#include "FeatureViewSpreadsheet.h" +#include + #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" diff --git a/src/Mod/Drawing/App/AppDrawingPy.cpp b/src/Mod/Drawing/App/AppDrawingPy.cpp index 259ade9aea..8791dec1cd 100644 --- a/src/Mod/Drawing/App/AppDrawingPy.cpp +++ b/src/Mod/Drawing/App/AppDrawingPy.cpp @@ -21,18 +21,17 @@ ***************************************************************************/ #include "PreCompiled.h" +#ifndef _PreComp_ +# include +#endif -#include -#include - -#include -#include "ProjectionAlgos.h" #include #include #include -#include - #include +#include + +#include "ProjectionAlgos.h" using namespace std; diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt index 86127d38a1..4698a00fa6 100644 --- a/src/Mod/Drawing/App/CMakeLists.txt +++ b/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}) diff --git a/src/Mod/Drawing/App/DrawingExport.cpp b/src/Mod/Drawing/App/DrawingExport.cpp index 7572be417c..3c49621981 100644 --- a/src/Mod/Drawing/App/DrawingExport.cpp +++ b/src/Mod/Drawing/App/DrawingExport.cpp @@ -20,67 +20,44 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ -# include # include +# include + +# include +# include # include -# include +# include +# include +# include +# include +# include +# include # include +# include # include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# if OCC_VERSION_HEX < 0x070600 +# include +# endif #endif -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if OCC_VERSION_HEX < 0x070600 -#include -#endif - -#include "DrawingExport.h" #include #include +#include "DrawingExport.h" + + #if OCC_VERSION_HEX >= 0x070600 using BRepAdaptor_HCurve = BRepAdaptor_Curve; #endif diff --git a/src/Mod/Drawing/App/DrawingExport.h b/src/Mod/Drawing/App/DrawingExport.h index 44d578ee5c..56d0806856 100644 --- a/src/Mod/Drawing/App/DrawingExport.h +++ b/src/Mod/Drawing/App/DrawingExport.h @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #ifndef DRAWING_EXPORT_H #define DRAWING_EXPORT_H @@ -28,6 +27,7 @@ #include #include + class TopoDS_Shape; class BRepAdaptor_Curve; diff --git a/src/Mod/Drawing/App/FeatureClip.cpp b/src/Mod/Drawing/App/FeatureClip.cpp index 3931172c5b..f7714a6854 100644 --- a/src/Mod/Drawing/App/FeatureClip.cpp +++ b/src/Mod/Drawing/App/FeatureClip.cpp @@ -20,28 +20,19 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ +# include # include #endif - -#include -#include -#include -#include -#include -#include - #include "FeatureClip.h" #include "FeatureView.h" + using namespace Drawing; using namespace std; - //=========================================================================== // FeaturePage //=========================================================================== @@ -99,8 +90,8 @@ App::DocumentObjectExecReturn *FeatureClip::execute(void) svg << "" << endl; // get through the children and collect all the views - const std::vector &Grp = Group.getValues(); - for (std::vector::const_iterator It= Grp.begin();It!=Grp.end();++It) { + const vector &Grp = Group.getValues(); + for (vector::const_iterator It= Grp.begin();It!=Grp.end();++It) { if ((*It)->getTypeId().isDerivedFrom(Drawing::FeatureView::getClassTypeId())) { Drawing::FeatureView *View = static_cast(*It); svg << View->ViewResult.getValue() << endl; diff --git a/src/Mod/Drawing/App/FeatureClip.h b/src/Mod/Drawing/App/FeatureClip.h index b19bb3e988..9c83d7b84f 100644 --- a/src/Mod/Drawing/App/FeatureClip.h +++ b/src/Mod/Drawing/App/FeatureClip.h @@ -20,15 +20,14 @@ * * ***************************************************************************/ - #ifndef _FeatureClip_h_ #define _FeatureClip_h_ - #include #include #include + namespace Drawing { diff --git a/src/Mod/Drawing/App/FeaturePage.cpp b/src/Mod/Drawing/App/FeaturePage.cpp index 2622cb3498..5e801fe276 100644 --- a/src/Mod/Drawing/App/FeaturePage.cpp +++ b/src/Mod/Drawing/App/FeaturePage.cpp @@ -20,31 +20,28 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include # include +# include # include + +# include #endif - -#include +#include #include #include -#include -#include -#include #include "FeaturePage.h" -#include "FeatureView.h" #include "FeatureClip.h" +#include "FeatureView.h" + using namespace Drawing; using namespace std; - //=========================================================================== // FeaturePage //=========================================================================== diff --git a/src/Mod/Drawing/App/FeaturePage.h b/src/Mod/Drawing/App/FeaturePage.h index a379d96052..b5c7f17b86 100644 --- a/src/Mod/Drawing/App/FeaturePage.h +++ b/src/Mod/Drawing/App/FeaturePage.h @@ -20,13 +20,10 @@ * * ***************************************************************************/ - #ifndef _FeaturePage_h_ #define _FeaturePage_h_ - #include -#include #include #include @@ -34,7 +31,6 @@ namespace Drawing { - /** Base class of all View Features in the drawing module */ class DrawingExport FeaturePage: public App::DocumentObjectGroup diff --git a/src/Mod/Drawing/App/FeatureProjection.cpp b/src/Mod/Drawing/App/FeatureProjection.cpp index f118cf1ec8..6c5de821ef 100644 --- a/src/Mod/Drawing/App/FeatureProjection.cpp +++ b/src/Mod/Drawing/App/FeatureProjection.cpp @@ -20,36 +20,29 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include + # include # include # include #endif - -#include -#include -#include -#include - #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"); diff --git a/src/Mod/Drawing/App/FeatureProjection.h b/src/Mod/Drawing/App/FeatureProjection.h index 06cfb4586d..afc3645154 100644 --- a/src/Mod/Drawing/App/FeatureProjection.h +++ b/src/Mod/Drawing/App/FeatureProjection.h @@ -20,22 +20,18 @@ * * ***************************************************************************/ - #ifndef DRAWING_FEATUREPROJECTION #define DRAWING_FEATUREPROJECTION - #include -#include -#include -#include +#include #include +#include namespace Drawing { - /** Base class of all View Features in the drawing module */ class DrawingExport FeatureProjection : public Part::Feature diff --git a/src/Mod/Drawing/App/FeatureView.cpp b/src/Mod/Drawing/App/FeatureView.cpp index 4829ce4ed6..a2e691be8d 100644 --- a/src/Mod/Drawing/App/FeatureView.cpp +++ b/src/Mod/Drawing/App/FeatureView.cpp @@ -20,24 +20,18 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include # include #endif - -#include -#include #include -#include #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::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::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; } diff --git a/src/Mod/Drawing/App/FeatureView.h b/src/Mod/Drawing/App/FeatureView.h index 6ccd9efa3f..58179e5752 100644 --- a/src/Mod/Drawing/App/FeatureView.h +++ b/src/Mod/Drawing/App/FeatureView.h @@ -20,24 +20,18 @@ * * ***************************************************************************/ - - - #ifndef _FeatureView_h_ #define _FeatureView_h_ - #include -#include -#include #include +#include #include namespace Drawing { - /** Base class of all View Features in the drawing module */ class DrawingExport FeatureView : public App::DocumentObject diff --git a/src/Mod/Drawing/App/FeatureViewAnnotation.cpp b/src/Mod/Drawing/App/FeatureViewAnnotation.cpp index b8624c28b1..ab57e25b21 100644 --- a/src/Mod/Drawing/App/FeatureViewAnnotation.cpp +++ b/src/Mod/Drawing/App/FeatureViewAnnotation.cpp @@ -20,24 +20,18 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ +# include # include #endif -#include - -#include -#include - #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::const_iterator it = Text.getValues().begin(); it != Text.getValues().end(); ++it) { + for (vector::const_iterator it = Text.getValues().begin(); it != Text.getValues().end(); ++it) { result << "" << it->c_str() << "" << endl; index++; } diff --git a/src/Mod/Drawing/App/FeatureViewAnnotation.h b/src/Mod/Drawing/App/FeatureViewAnnotation.h index 9641e90d37..f5031fdfee 100644 --- a/src/Mod/Drawing/App/FeatureViewAnnotation.h +++ b/src/Mod/Drawing/App/FeatureViewAnnotation.h @@ -20,23 +20,19 @@ * * ***************************************************************************/ - - - #ifndef _FeatureViewAnnotation_h_ #define _FeatureViewAnnotation_h_ - #include -#include -#include "FeatureView.h" #include +#include + +#include "FeatureView.h" namespace Drawing { - /** Base class of all View Features in the drawing module */ class DrawingExport FeatureViewAnnotation : public FeatureView diff --git a/src/Mod/Drawing/App/FeatureViewPart.cpp b/src/Mod/Drawing/App/FeatureViewPart.cpp index 58a22e3d7f..d7ebc33871 100644 --- a/src/Mod/Drawing/App/FeatureViewPart.cpp +++ b/src/Mod/Drawing/App/FeatureViewPart.cpp @@ -20,56 +20,26 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include +# include #endif - -#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#include -#include #include #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) diff --git a/src/Mod/Drawing/App/FeatureViewPart.h b/src/Mod/Drawing/App/FeatureViewPart.h index 5ec6c959ab..10ecefa725 100644 --- a/src/Mod/Drawing/App/FeatureViewPart.h +++ b/src/Mod/Drawing/App/FeatureViewPart.h @@ -20,23 +20,19 @@ * * ***************************************************************************/ - - - #ifndef _FeatureViewPart_h_ #define _FeatureViewPart_h_ - #include -#include -#include "FeatureView.h" #include +#include + +#include "FeatureView.h" namespace Drawing { - /** Base class of all View Features in the drawing module */ class DrawingExport FeatureViewPart : public FeatureView diff --git a/src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp b/src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp index 001ddefba1..2f2456cbc8 100644 --- a/src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp +++ b/src/Mod/Drawing/App/FeatureViewSpreadsheet.cpp @@ -20,25 +20,21 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ +# include # include #endif -#include -#include -#include -#include -#include #include -#include "FeatureViewSpreadsheet.h" +#include #include #include +#include "FeatureViewSpreadsheet.h" + + using namespace Drawing; -using namespace std; //=========================================================================== // FeatureViewSpreadsheet @@ -98,35 +94,38 @@ App::DocumentObjectExecReturn *FeatureViewSpreadsheet::execute(void) std::vector columns; std::vector rows; try { - for (unsigned int i=0; i::const_iterator j = availcolumns.begin(); j != availcolumns.end(); ++j) { - if ( (*j) == startcol) { - if ( (*j) != endcol) { + for (std::vector::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 << "" << 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 << "" << 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(link); std::vector skiplist; - for (std::vector::const_iterator col = columns.begin(); col != columns.end(); ++col) { + for (std::vector::const_iterator col = columns.begin(); col != columns.end(); + ++col) { // create a group for each column - result << " " << endl; + result << " " << std::endl; for (std::vector::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 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::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; igetSpans(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 << " " << endl; + result << " " << std::endl; if (alignment & Spreadsheet::Cell::ALIGNMENT_LEFT) - result << " " << celltext << "" << endl; + result << " " << celltext << "" << std::endl; } rowoffset = rowoffset + cellheight; } - result << " " << endl; + result << " " << std::endl; rowoffset = 0.0; coloffset = coloffset + cellwidth; } // close the containing group - result << "" << endl; + result << "" << std::endl; // Apply the resulting fragment ViewResult.setValue(result.str().c_str()); diff --git a/src/Mod/Drawing/App/FeatureViewSpreadsheet.h b/src/Mod/Drawing/App/FeatureViewSpreadsheet.h index 3f8e204cf4..673f18df26 100644 --- a/src/Mod/Drawing/App/FeatureViewSpreadsheet.h +++ b/src/Mod/Drawing/App/FeatureViewSpreadsheet.h @@ -20,15 +20,15 @@ * * ***************************************************************************/ - #ifndef _FeatureViewSpreadsheet_h_ #define _FeatureViewSpreadsheet_h_ - #include #include + #include "FeatureView.h" + namespace Drawing { diff --git a/src/Mod/Drawing/App/FeatureViewSymbol.cpp b/src/Mod/Drawing/App/FeatureViewSymbol.cpp index 9b548dced7..65dbf603ad 100644 --- a/src/Mod/Drawing/App/FeatureViewSymbol.cpp +++ b/src/Mod/Drawing/App/FeatureViewSymbol.cpp @@ -20,26 +20,21 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ +# include +# include # include + +# include #endif -#include -#include -#include - -#include -#include - #include "FeatureViewSymbol.h" + using namespace Drawing; using namespace std; - //=========================================================================== // FeatureViewSymbol //=========================================================================== diff --git a/src/Mod/Drawing/App/FeatureViewSymbol.h b/src/Mod/Drawing/App/FeatureViewSymbol.h index 44dad78cf6..9c1552e8f4 100644 --- a/src/Mod/Drawing/App/FeatureViewSymbol.h +++ b/src/Mod/Drawing/App/FeatureViewSymbol.h @@ -20,23 +20,19 @@ * * ***************************************************************************/ - - - #ifndef _FeatureViewSymbol_h_ #define _FeatureViewSymbol_h_ - #include -#include -#include "FeatureView.h" #include +#include + +#include "FeatureView.h" namespace Drawing { - /** Base class of all View Features in the drawing module */ class DrawingExport FeatureViewSymbol : public FeatureView diff --git a/src/Mod/Drawing/App/PageGroup.cpp b/src/Mod/Drawing/App/PageGroup.cpp index b3afe3c249..f36a740619 100644 --- a/src/Mod/Drawing/App/PageGroup.cpp +++ b/src/Mod/Drawing/App/PageGroup.cpp @@ -20,17 +20,15 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include #endif #include "PageGroup.h" -using namespace Drawing; +using namespace Drawing; //=========================================================================== // PageGroup diff --git a/src/Mod/Drawing/App/PageGroup.h b/src/Mod/Drawing/App/PageGroup.h index 4f8c23aac2..3c4d9078a6 100644 --- a/src/Mod/Drawing/App/PageGroup.h +++ b/src/Mod/Drawing/App/PageGroup.h @@ -20,15 +20,10 @@ * * ***************************************************************************/ - - - #ifndef _PageGroup_h_ #define _PageGroup_h_ - #include -#include #include #include @@ -36,7 +31,6 @@ namespace Drawing { - /** Base class of all View Features in the drawing module */ class DrawingExport PageGroup : public App::DocumentObjectGroup diff --git a/src/Mod/Drawing/App/PreCompiled.h b/src/Mod/Drawing/App/PreCompiled.h index 853f563786..897ad95b1a 100644 --- a/src/Mod/Drawing/App/PreCompiled.h +++ b/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 +#include #include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +// boost +#include -// OpenCasCade ===================================================================================== -// Base -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#if OCC_VERSION_HEX < 0x060700 -#include -#include -#endif - - -#include -#include -#include - +// OpenCasCade +#include #include +#include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#if OCC_VERSION_HEX < 0x070600 +# include +#endif #endif // _PreComp_ #endif - diff --git a/src/Mod/Drawing/App/ProjectionAlgos.cpp b/src/Mod/Drawing/App/ProjectionAlgos.cpp index da03d49057..5fd5ede54e 100644 --- a/src/Mod/Drawing/App/ProjectionAlgos.cpp +++ b/src/Mod/Drawing/App/ProjectionAlgos.cpp @@ -20,62 +20,29 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include -# include -# include -# include -# include + +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include -#include -#include -#include #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) { diff --git a/src/Mod/Drawing/App/ProjectionAlgos.h b/src/Mod/Drawing/App/ProjectionAlgos.h index 66ae7d2e8d..bd0a6ef106 100644 --- a/src/Mod/Drawing/App/ProjectionAlgos.h +++ b/src/Mod/Drawing/App/ProjectionAlgos.h @@ -20,14 +20,15 @@ * * ***************************************************************************/ - #ifndef _ProjectionAlgos_h_ #define _ProjectionAlgos_h_ -#include -#include -#include #include +#include + +#include +#include + class BRepAdaptor_Curve; From 20a3d4b7ede55d44ab573aac3d10f8588b4a8fe2 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 10 Dec 2022 05:37:30 +0100 Subject: [PATCH 15/19] [Drawing] Gui: remove unused headers - also some sorting - also enable precompiled header --- src/Mod/Drawing/Gui/AppDrawingGui.cpp | 1 + src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp | 24 +++---- src/Mod/Drawing/Gui/CMakeLists.txt | 12 ++++ src/Mod/Drawing/Gui/Command.cpp | 17 +++-- src/Mod/Drawing/Gui/DrawingView.cpp | 24 +++---- src/Mod/Drawing/Gui/DrawingView.h | 7 ++- src/Mod/Drawing/Gui/PreCompiled.cpp | 1 - src/Mod/Drawing/Gui/PreCompiled.h | 52 +++++++++------- src/Mod/Drawing/Gui/TaskDialog.cpp | 79 ++++++++++++------------ src/Mod/Drawing/Gui/TaskDialog.h | 3 +- src/Mod/Drawing/Gui/TaskOrthoViews.cpp | 10 ++- src/Mod/Drawing/Gui/TaskOrthoViews.h | 12 ++-- src/Mod/Drawing/Gui/ViewProviderPage.cpp | 17 +---- src/Mod/Drawing/Gui/ViewProviderPage.h | 4 +- src/Mod/Drawing/Gui/ViewProviderView.cpp | 16 +---- src/Mod/Drawing/Gui/ViewProviderView.h | 2 - src/Mod/Drawing/Gui/Workbench.cpp | 9 +-- src/Mod/Drawing/Gui/Workbench.h | 2 +- 18 files changed, 132 insertions(+), 160 deletions(-) diff --git a/src/Mod/Drawing/Gui/AppDrawingGui.cpp b/src/Mod/Drawing/Gui/AppDrawingGui.cpp index 5ceffbd906..e58bf7a377 100644 --- a/src/Mod/Drawing/Gui/AppDrawingGui.cpp +++ b/src/Mod/Drawing/Gui/AppDrawingGui.cpp @@ -26,6 +26,7 @@ #include #include #include + #include "Workbench.h" #include "ViewProviderPage.h" #include "ViewProviderView.h" diff --git a/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp b/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp index b849c52fea..6eead31417 100644 --- a/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp +++ b/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp @@ -22,29 +22,25 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include -# include # include + +# include #endif -#include -#include +#include +#include +#include +#include +#include +#include -#include "DrawingView.h" #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "DrawingView.h" + namespace DrawingGui { class Module : public Py::ExtensionModule diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index a20b6297d1..9bee0d9f6b 100644 --- a/src/Mod/Drawing/Gui/CMakeLists.txt +++ b/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 ) diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp index 9126056635..04577252e1 100644 --- a/src/Mod/Drawing/Gui/Command.cpp +++ b/src/Mod/Drawing/Gui/Command.cpp @@ -12,6 +12,8 @@ #include "PreCompiled.h" #ifndef _PreComp_ # include +# include + # include # include # include @@ -20,30 +22,25 @@ # include #endif -#include - -#include #include #include - +#include #include #include #include #include #include -#include -#include #include - -#include +#include +#include #include +#include #include - -#include "DrawingView.h" #include "TaskDialog.h" #include "TaskOrthoViews.h" + using namespace DrawingGui; using namespace std; diff --git a/src/Mod/Drawing/Gui/DrawingView.cpp b/src/Mod/Drawing/Gui/DrawingView.cpp index df8b25e12f..4219870b6a 100644 --- a/src/Mod/Drawing/Gui/DrawingView.cpp +++ b/src/Mod/Drawing/Gui/DrawingView.cpp @@ -20,12 +20,12 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include + # include # include -# include # include # include # include @@ -37,34 +37,26 @@ # include # include # include -# include # include # include # include # include # include -# include -# include -# include -# include -# include -# include # include -# include + #endif -#include "DrawingView.h" -#include -#include -#include -#include #include #include +#include #include -#include #include +#include #include +#include "DrawingView.h" + + using namespace DrawingGui; SvgView::SvgView(QWidget *parent) diff --git a/src/Mod/Drawing/Gui/DrawingView.h b/src/Mod/Drawing/Gui/DrawingView.h index 1a37149025..d7c43b07fc 100644 --- a/src/Mod/Drawing/Gui/DrawingView.h +++ b/src/Mod/Drawing/Gui/DrawingView.h @@ -20,15 +20,16 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_DRAWINGVIEW_H #define DRAWINGGUI_DRAWINGVIEW_H -#include -#include #include #include +#include +#include + + QT_BEGIN_NAMESPACE class QSlider; class QAction; diff --git a/src/Mod/Drawing/Gui/PreCompiled.cpp b/src/Mod/Drawing/Gui/PreCompiled.cpp index 90814f0b6c..3139e21f64 100644 --- a/src/Mod/Drawing/Gui/PreCompiled.cpp +++ b/src/Mod/Drawing/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Drawing/Gui/PreCompiled.h b/src/Mod/Drawing/Gui/PreCompiled.h index 59ecb5ec55..855f8a5968 100644 --- a/src/Mod/Drawing/Gui/PreCompiled.h +++ b/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 -#include -#include - // STL +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef FC_OS_WIN32 -# include -#endif - - -// Qt Toolkit -#ifndef __QtAll__ -# include -#endif +// Qt +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif //_PreComp_ diff --git a/src/Mod/Drawing/Gui/TaskDialog.cpp b/src/Mod/Drawing/Gui/TaskDialog.cpp index e1c53d02dc..8ac2ad756d 100644 --- a/src/Mod/Drawing/Gui/TaskDialog.cpp +++ b/src/Mod/Drawing/Gui/TaskDialog.cpp @@ -20,46 +20,43 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include # include #endif - -#include -#include "TaskDialog.h" #include #include -#include #include +#include #include #include #include +#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" diff --git a/src/Mod/Drawing/Gui/TaskDialog.h b/src/Mod/Drawing/Gui/TaskDialog.h index 1224b5b101..ad87e17ce2 100644 --- a/src/Mod/Drawing/Gui/TaskDialog.h +++ b/src/Mod/Drawing/Gui/TaskDialog.h @@ -20,14 +20,15 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_TASKDIALOG #define DRAWINGGUI_TASKDIALOG #include + #include #include + class QCheckBox; namespace DrawingGui diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp index 87b3d7fa0b..513b11b6d1 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp @@ -22,21 +22,19 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include #endif -#include "TaskOrthoViews.h" -#include "ui_TaskOrthoViews.h" - #include #include #include -#include #include -#include #include +#include + +#include "TaskOrthoViews.h" +#include "ui_TaskOrthoViews.h" using namespace Gui; diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.h b/src/Mod/Drawing/Gui/TaskOrthoViews.h index 2351e6ebcd..d680770beb 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.h +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.h @@ -23,19 +23,19 @@ #ifndef GUI_TASKVIEW_TASKORTHOVIEWS_H #define GUI_TASKVIEW_TASKORTHOVIEWS_H -#include -#include -#include - #include #include + +#include + #include +#include +#include +#include #include - - namespace DrawingGui { class Ui_TaskOrthoViews; diff --git a/src/Mod/Drawing/Gui/ViewProviderPage.cpp b/src/Mod/Drawing/Gui/ViewProviderPage.cpp index 6dd9f8fef2..46d80d2b06 100644 --- a/src/Mod/Drawing/Gui/ViewProviderPage.cpp +++ b/src/Mod/Drawing/Gui/ViewProviderPage.cpp @@ -20,32 +20,21 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ -# include # include # include #endif -/// Here the FreeCAD includes sorted by Base,App,Gui...... -#include -#include -#include -#include -#include -#include #include #include -#include -#include #include +#include #include - +#include #include "ViewProviderPage.h" -#include + using namespace DrawingGui; diff --git a/src/Mod/Drawing/Gui/ViewProviderPage.h b/src/Mod/Drawing/Gui/ViewProviderPage.h index 3f8caf6119..d646d3549b 100644 --- a/src/Mod/Drawing/Gui/ViewProviderPage.h +++ b/src/Mod/Drawing/Gui/ViewProviderPage.h @@ -20,16 +20,16 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_VIEWPROVIDERPAGE_H #define DRAWINGGUI_VIEWPROVIDERPAGE_H #include -#include + #include #include "DrawingView.h" + namespace Drawing{ class FeaturePage; } diff --git a/src/Mod/Drawing/Gui/ViewProviderView.cpp b/src/Mod/Drawing/Gui/ViewProviderView.cpp index f8858d7e11..2a20ca8c62 100644 --- a/src/Mod/Drawing/Gui/ViewProviderView.cpp +++ b/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 -#include -#include -#include -#include -#include #include -#include - -#include #include +#include + #include "ViewProviderView.h" diff --git a/src/Mod/Drawing/Gui/ViewProviderView.h b/src/Mod/Drawing/Gui/ViewProviderView.h index 5b86df4b2a..91295a0f6a 100644 --- a/src/Mod/Drawing/Gui/ViewProviderView.h +++ b/src/Mod/Drawing/Gui/ViewProviderView.h @@ -20,11 +20,9 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_VIEWPROVIDERVIEW_H #define DRAWINGGUI_VIEWPROVIDERVIEW_H -#include #include diff --git a/src/Mod/Drawing/Gui/Workbench.cpp b/src/Mod/Drawing/Gui/Workbench.cpp index bd8e306eef..51d7f17129 100644 --- a/src/Mod/Drawing/Gui/Workbench.cpp +++ b/src/Mod/Drawing/Gui/Workbench.cpp @@ -20,17 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - -#include "Workbench.h" #include #include +#include "Workbench.h" + + using namespace DrawingGui; #if 0 // needed for Qt's lupdate utility diff --git a/src/Mod/Drawing/Gui/Workbench.h b/src/Mod/Drawing/Gui/Workbench.h index d7a5e1d004..595c81ff91 100644 --- a/src/Mod/Drawing/Gui/Workbench.h +++ b/src/Mod/Drawing/Gui/Workbench.h @@ -20,12 +20,12 @@ * * ***************************************************************************/ - #ifndef DRAWING_WORKBENCH_H #define DRAWING_WORKBENCH_H #include + namespace DrawingGui { /** From ec9b2c09660b6d36bcddc76e76327c25fd8523c1 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sat, 10 Dec 2022 05:49:18 +0100 Subject: [PATCH 16/19] [Inspection] enable precompiled headers --- src/Mod/Inspection/App/CMakeLists.txt | 7 ++++- src/Mod/Inspection/App/PreCompiled.cpp | 1 - src/Mod/Inspection/App/PreCompiled.h | 31 ++++++------------- src/Mod/Inspection/Gui/CMakeLists.txt | 6 ++++ src/Mod/Inspection/Gui/Command.cpp | 1 - src/Mod/Inspection/Gui/PreCompiled.cpp | 1 - src/Mod/Inspection/Gui/PreCompiled.h | 43 +++++++------------------- 7 files changed, 32 insertions(+), 58 deletions(-) diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index 78cbb20f5f..9790087a51 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/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 diff --git a/src/Mod/Inspection/App/PreCompiled.cpp b/src/Mod/Inspection/App/PreCompiled.cpp index c74d61cf64..41bf7beded 100644 --- a/src/Mod/Inspection/App/PreCompiled.cpp +++ b/src/Mod/Inspection/App/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Inspection/App/PreCompiled.h b/src/Mod/Inspection/App/PreCompiled.h index 2e8550c6e6..7b2059b4e3 100644 --- a/src/Mod/Inspection/App/PreCompiled.h +++ b/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 #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 -#include -#include +// STL #include -// STL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - // OCC -#include #include #include #include #include +#include +#include #include // Qt -#include #include #include #include +#include #endif //_PreComp_ diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index ba50d91854..b8270eab39 100644 --- a/src/Mod/Inspection/Gui/CMakeLists.txt +++ b/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 ) diff --git a/src/Mod/Inspection/Gui/Command.cpp b/src/Mod/Inspection/Gui/Command.cpp index 609b294a92..4767190cf5 100644 --- a/src/Mod/Inspection/Gui/Command.cpp +++ b/src/Mod/Inspection/Gui/Command.cpp @@ -21,7 +21,6 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ # include #endif diff --git a/src/Mod/Inspection/Gui/PreCompiled.cpp b/src/Mod/Inspection/Gui/PreCompiled.cpp index c74d61cf64..41bf7beded 100644 --- a/src/Mod/Inspection/Gui/PreCompiled.cpp +++ b/src/Mod/Inspection/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/Inspection/Gui/PreCompiled.h b/src/Mod/Inspection/Gui/PreCompiled.h index f80b346f42..6751f3a7c2 100644 --- a/src/Mod/Inspection/Gui/PreCompiled.h +++ b/src/Mod/Inspection/Gui/PreCompiled.h @@ -20,67 +20,46 @@ * * ***************************************************************************/ - #ifndef GUI_PRECOMPILED_H #define GUI_PRECOMPILED_H #include -#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 -#include - // STL -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef FC_OS_WIN32 -# include -#endif +#include // Inventor #include #include #include #include +#include #include #include #include -#include #include #include #include +#include #include #include #include #include #include -#include -// Qt Toolkit -#ifndef __QtAll__ -# include -#endif +// Qt +#include +#include +#include #endif //_PreComp_ From bea2f9be2c08631fac4d6fe38a3a2caf122f5330 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 11 Dec 2022 03:19:11 +0100 Subject: [PATCH 17/19] [Reverse Eng] App: enable precompiled headers - also some sorting --- .../App/AppReverseEngineering.cpp | 26 +++++------ .../ReverseEngineering/App/ApproxSurface.cpp | 21 ++++----- .../ReverseEngineering/App/ApproxSurface.h | 6 +-- .../ReverseEngineering/App/BSplineFitting.cpp | 6 +-- .../ReverseEngineering/App/BSplineFitting.h | 9 ++-- src/Mod/ReverseEngineering/App/CMakeLists.txt | 7 ++- .../ReverseEngineering/App/PreCompiled.cpp | 1 - src/Mod/ReverseEngineering/App/PreCompiled.h | 42 +++++++----------- .../ReverseEngineering/App/RegionGrowing.cpp | 24 +++++----- .../ReverseEngineering/App/RegionGrowing.h | 7 +-- .../App/SampleConsensus.cpp | 25 ++++++----- .../ReverseEngineering/App/SampleConsensus.h | 5 ++- .../ReverseEngineering/App/Segmentation.cpp | 24 +++++----- src/Mod/ReverseEngineering/App/Segmentation.h | 7 +-- .../App/SurfaceTriangulation.cpp | 44 +++++++++---------- .../App/SurfaceTriangulation.h | 5 ++- 16 files changed, 129 insertions(+), 130 deletions(-) diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp index b14636bba0..08c52a5e1c 100644 --- a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp +++ b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp @@ -22,35 +22,29 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include # include +# include #endif #include -#include -#include -#include #include - -#include -#include - +#include #include -#include #include #include +#if defined(HAVE_PCL_FILTERS) +# include +# include +# include +#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 -#include -#include -#endif +#include "Segmentation.h" +#include "SurfaceTriangulation.h" + /* Dependency of pcl components: diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp index 0df5c39618..5e3188d97f 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp @@ -20,24 +20,25 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include -#include -#include -#include +#ifndef _PreComp_ +# include +# include +# include -#include -#include -#include +# include +# include +# include +# include +#endif -#include #include -#include #include +#include #include "ApproxSurface.h" + using namespace Reen; namespace bp = boost::placeholders; diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.h b/src/Mod/ReverseEngineering/App/ApproxSurface.h index 680b1dd210..f0ab0e3996 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.h +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.h @@ -20,21 +20,21 @@ * * ***************************************************************************/ - #ifndef REEN_APPROXSURFACE_H #define REEN_APPROXSURFACE_H -#include -#include #include #include #include +#include +#include #include #include #include #include + namespace Base { class SequencerLauncher; } diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.cpp b/src/Mod/ReverseEngineering/App/BSplineFitting.cpp index 0d804e01d7..6df1ded66d 100644 --- a/src/Mod/ReverseEngineering/App/BSplineFitting.cpp +++ b/src/Mod/ReverseEngineering/App/BSplineFitting.cpp @@ -20,16 +20,16 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #if defined(HAVE_PCL_OPENNURBS) #ifndef _PreComp_ +# include + # include # include -# include # include # include -# include +# include #endif #include diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.h b/src/Mod/ReverseEngineering/App/BSplineFitting.h index cabcceca67..0dd1f2b740 100644 --- a/src/Mod/ReverseEngineering/App/BSplineFitting.h +++ b/src/Mod/ReverseEngineering/App/BSplineFitting.h @@ -20,14 +20,15 @@ * * ***************************************************************************/ - #ifndef REEN_BSPLINEFITTING_H #define REEN_BSPLINEFITTING_H #if defined(HAVE_PCL_OPENNURBS) -#include -#include -#include +# include + +# include +# include + namespace Reen { diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 13d5d2ab5a..13e5360eae 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/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) diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.cpp b/src/Mod/ReverseEngineering/App/PreCompiled.cpp index 7cd1cae80f..cde4369c5b 100644 --- a/src/Mod/ReverseEngineering/App/PreCompiled.cpp +++ b/src/Mod/ReverseEngineering/App/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.h b/src/Mod/ReverseEngineering/App/PreCompiled.h index 69b62da8ce..f600eeed2b 100644 --- a/src/Mod/ReverseEngineering/App/PreCompiled.h +++ b/src/Mod/ReverseEngineering/App/PreCompiled.h @@ -20,51 +20,43 @@ * * ***************************************************************************/ - #ifndef __PRECOMPILED__ #define __PRECOMPILED__ #include #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 instead of #ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS -#define BOOST_BIND_GLOBAL_PLACEHOLDERS +# define BOOST_BIND_GLOBAL_PLACEHOLDERS #endif #ifdef _PreComp_ // standard -#include -#include -#include -#include -#include #include -#include -#include -#include + +// boost +#include // OpenCasCade +#include #include #include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#endif +// Qt +#include +#include +#include + #endif // _PreComp_ - +#endif diff --git a/src/Mod/ReverseEngineering/App/RegionGrowing.cpp b/src/Mod/ReverseEngineering/App/RegionGrowing.cpp index cd3f8fc297..3c5816a176 100644 --- a/src/Mod/ReverseEngineering/App/RegionGrowing.cpp +++ b/src/Mod/ReverseEngineering/App/RegionGrowing.cpp @@ -20,24 +20,26 @@ * * ***************************************************************************/ - #include "PreCompiled.h" +#ifndef _PreComp_ +# include +#endif + +#include #include "RegionGrowing.h" -#include -#include -#include + #if defined(HAVE_PCL_FILTERS) -#include -#include +# include +# include #endif #if defined(HAVE_PCL_SEGMENTATION) -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include using namespace std; using namespace Reen; diff --git a/src/Mod/ReverseEngineering/App/RegionGrowing.h b/src/Mod/ReverseEngineering/App/RegionGrowing.h index c241f1de88..f38b92ece7 100644 --- a/src/Mod/ReverseEngineering/App/RegionGrowing.h +++ b/src/Mod/ReverseEngineering/App/RegionGrowing.h @@ -20,13 +20,14 @@ * * ***************************************************************************/ - #ifndef REEN_REGIONGROWING_H #define REEN_REGIONGROWING_H -#include -#include #include +#include + +#include + namespace Points {class PointKernel;} diff --git a/src/Mod/ReverseEngineering/App/SampleConsensus.cpp b/src/Mod/ReverseEngineering/App/SampleConsensus.cpp index 9c53911e5a..5dcf320ed1 100644 --- a/src/Mod/ReverseEngineering/App/SampleConsensus.cpp +++ b/src/Mod/ReverseEngineering/App/SampleConsensus.cpp @@ -20,22 +20,25 @@ * * ***************************************************************************/ - #include "PreCompiled.h" +#ifndef _PreComp_ +# include +#endif + +#include +#include #include "SampleConsensus.h" -#include -#include -#include + #if defined(HAVE_PCL_SAMPLE_CONSENSUS) -#include -#include -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include +# include +# include using namespace std; using namespace Reen; diff --git a/src/Mod/ReverseEngineering/App/SampleConsensus.h b/src/Mod/ReverseEngineering/App/SampleConsensus.h index 0d8ea2cdf4..13d227e044 100644 --- a/src/Mod/ReverseEngineering/App/SampleConsensus.h +++ b/src/Mod/ReverseEngineering/App/SampleConsensus.h @@ -20,13 +20,14 @@ * * ***************************************************************************/ - #ifndef REEN_SAMPLECONSENSUS_H #define REEN_SAMPLECONSENSUS_H -#include #include +#include + + namespace Points {class PointKernel;} namespace Reen { diff --git a/src/Mod/ReverseEngineering/App/Segmentation.cpp b/src/Mod/ReverseEngineering/App/Segmentation.cpp index b809c0e963..4f25a9344e 100644 --- a/src/Mod/ReverseEngineering/App/Segmentation.cpp +++ b/src/Mod/ReverseEngineering/App/Segmentation.cpp @@ -20,29 +20,29 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include "Segmentation.h" #include -#include + +#include "Segmentation.h" + #if defined(HAVE_PCL_FILTERS) -#include -#include -#include +# include +# include +# include #endif #if defined(HAVE_PCL_SAMPLE_CONSENSUS) -#include -#include +# include +# include #endif #if defined(HAVE_PCL_SEGMENTATION) -#include -#include -#include -#include +# include +# include +# include +# include #endif using namespace std; diff --git a/src/Mod/ReverseEngineering/App/Segmentation.h b/src/Mod/ReverseEngineering/App/Segmentation.h index 228b647b3f..94137e2357 100644 --- a/src/Mod/ReverseEngineering/App/Segmentation.h +++ b/src/Mod/ReverseEngineering/App/Segmentation.h @@ -20,13 +20,14 @@ * * ***************************************************************************/ - #ifndef REEN_SEGMENTATION_H #define REEN_SEGMENTATION_H -#include -#include #include +#include + +#include + namespace Points {class PointKernel;} diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp index f597cf4fd4..4baaa5c870 100644 --- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp +++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp @@ -20,40 +20,39 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include "SurfaceTriangulation.h" +#include #include #include #include #include #include -#include + +#include "SurfaceTriangulation.h" + // http://svn.pointclouds.org/pcl/tags/pcl-1.5.1/test/ #if defined(HAVE_PCL_SURFACE) -#include -#include -#include -#include -#include -#include -#include -#include -//#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include #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 - diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h index 3299a8ff6f..3041d72ab5 100644 --- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h +++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h @@ -20,13 +20,14 @@ * * ***************************************************************************/ - #ifndef REEN_SURFACETRIANGULATION_H #define REEN_SURFACETRIANGULATION_H -#include #include +#include + + namespace Points {class PointKernel;} namespace Mesh {class MeshObject;} namespace pcl {struct PolygonMesh;} From 8faf86e2b578e23d6edc270cb0f914b816dc3a37 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 11 Dec 2022 03:51:16 +0100 Subject: [PATCH 18/19] [Reverse Eng] Gui: remove unused headers - also enable precompiled headers - also some sorting --- .../Gui/AppReverseEngineeringGui.cpp | 4 +- src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 7 +++- src/Mod/ReverseEngineering/Gui/Command.cpp | 34 +++++++--------- .../Gui/FitBSplineSurface.cpp | 27 +++++-------- .../Gui/FitBSplineSurface.h | 5 +-- src/Mod/ReverseEngineering/Gui/Poisson.cpp | 20 +++------- src/Mod/ReverseEngineering/Gui/Poisson.h | 5 +-- .../ReverseEngineering/Gui/PreCompiled.cpp | 1 - src/Mod/ReverseEngineering/Gui/PreCompiled.h | 39 +++++++++---------- .../ReverseEngineering/Gui/Segmentation.cpp | 19 +++++---- src/Mod/ReverseEngineering/Gui/Segmentation.h | 7 ++-- .../Gui/SegmentationManual.cpp | 13 ++----- .../Gui/SegmentationManual.h | 6 ++- src/Mod/ReverseEngineering/Gui/Workbench.cpp | 9 ++--- 14 files changed, 81 insertions(+), 115 deletions(-) diff --git a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp index c298cc3c88..8a14b07bc2 100644 --- a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp +++ b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp @@ -27,10 +27,8 @@ #include #include #include -#include "Workbench.h" -#include -#include +#include "Workbench.h" // use a different name to CreateCommand() diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 3946cf8ac0..5bf63890e2 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/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) diff --git a/src/Mod/ReverseEngineering/Gui/Command.cpp b/src/Mod/ReverseEngineering/Gui/Command.cpp index b12cd51c2b..176fc3f606 100644 --- a/src/Mod/ReverseEngineering/Gui/Command.cpp +++ b/src/Mod/ReverseEngineering/Gui/Command.cpp @@ -20,49 +20,43 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include # include # include + # include # include # include #endif -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include #include +#include +#include #include #include #include #include -#include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "../App/ApproxSurface.h" #include "FitBSplineSurface.h" #include "Poisson.h" #include "Segmentation.h" #include "SegmentationManual.h" + using namespace std; DEF_STD_CMD_A(CmdApproxSurface) diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp index da508fd0de..9491c30580 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.cpp @@ -20,35 +20,26 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include # include -# include #endif -#include "ui_FitBSplineSurface.h" -#include "FitBSplineSurface.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include #include +#include "ui_FitBSplineSurface.h" +#include "FitBSplineSurface.h" + using namespace ReenGui; diff --git a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h index 02e6a22817..809d47242d 100644 --- a/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h +++ b/src/Mod/ReverseEngineering/Gui/FitBSplineSurface.h @@ -20,13 +20,12 @@ * * ***************************************************************************/ - #ifndef REENGUI_FITBSPLINESURFACE_H #define REENGUI_FITBSPLINESURFACE_H -#include #include -#include +#include + namespace ReenGui { diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.cpp b/src/Mod/ReverseEngineering/Gui/Poisson.cpp index 41cc8f22e5..06ab581f7f 100644 --- a/src/Mod/ReverseEngineering/Gui/Poisson.cpp +++ b/src/Mod/ReverseEngineering/Gui/Poisson.cpp @@ -20,29 +20,19 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include -# include #endif +#include +#include +#include +#include + #include "ui_Poisson.h" #include "Poisson.h" -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - using namespace ReenGui; diff --git a/src/Mod/ReverseEngineering/Gui/Poisson.h b/src/Mod/ReverseEngineering/Gui/Poisson.h index 3277e73dd5..392e765ee1 100644 --- a/src/Mod/ReverseEngineering/Gui/Poisson.h +++ b/src/Mod/ReverseEngineering/Gui/Poisson.h @@ -20,13 +20,12 @@ * * ***************************************************************************/ - #ifndef REENGUI_POISSON_H #define REENGUI_POISSON_H -#include #include -#include +#include + namespace ReenGui { diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp b/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp index 7cd1cae80f..cde4369c5b 100644 --- a/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp +++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.cpp @@ -20,5 +20,4 @@ * * ***************************************************************************/ - #include "PreCompiled.h" diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.h b/src/Mod/ReverseEngineering/Gui/PreCompiled.h index f693e2bd4a..a499a96b1d 100644 --- a/src/Mod/ReverseEngineering/Gui/PreCompiled.h +++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.h @@ -26,35 +26,32 @@ #include #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 -#include -#include - -// STL -#include -#include -#include -#include -#include #include -#include -#include -#include +#include -#ifdef FC_OS_WIN32 -# include -#endif +// OpenCasCade +#include +#include +#include +#include +#include +#include +#include // Qt Toolkit -#ifndef __QtAll__ -# include -#endif +#include +#include +#include #endif //_PreComp_ diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.cpp b/src/Mod/ReverseEngineering/Gui/Segmentation.cpp index 3f5bb501c7..9e5d4ad6e1 100644 --- a/src/Mod/ReverseEngineering/Gui/Segmentation.cpp +++ b/src/Mod/ReverseEngineering/Gui/Segmentation.cpp @@ -20,37 +20,36 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include + # include # include -# include # include +# include # include # include # include #endif -#include "Segmentation.h" -#include "ui_Segmentation.h" -#include #include #include #include +#include #include - #include #include -#include #include +#include #include -#include #include -#include #include +#include + +#include "Segmentation.h" +#include "ui_Segmentation.h" + using namespace ReverseEngineeringGui; diff --git a/src/Mod/ReverseEngineering/Gui/Segmentation.h b/src/Mod/ReverseEngineering/Gui/Segmentation.h index f46b7df756..a237d9b6d7 100644 --- a/src/Mod/ReverseEngineering/Gui/Segmentation.h +++ b/src/Mod/ReverseEngineering/Gui/Segmentation.h @@ -20,15 +20,16 @@ * * ***************************************************************************/ - #ifndef REVERSEENGINEERINGGUI_SEGMENTATION_H #define REVERSEENGINEERINGGUI_SEGMENTATION_H +#include + #include + #include #include -#include -#include + // forward declarations namespace Mesh { class Feature; } diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp b/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp index 82488df9cb..150e374692 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.cpp @@ -20,32 +20,27 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include #endif -#include "SegmentationManual.h" -#include "ui_SegmentationManual.h" #include #include #include #include - #include #include #include -#include -#include -#include #include #include -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) diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h index 0133ccbb6c..fc80ddbcf0 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h @@ -20,15 +20,17 @@ * * ***************************************************************************/ - #ifndef REVERSEENGINEERINGGUI_SEGMENTATIONMANUAL_H #define REVERSEENGINEERINGGUI_SEGMENTATIONMANUAL_H +#include + #include + #include #include #include -#include + namespace ReverseEngineeringGui { class Ui_SegmentationManual; diff --git a/src/Mod/ReverseEngineering/Gui/Workbench.cpp b/src/Mod/ReverseEngineering/Gui/Workbench.cpp index ab4d343ae9..18fb2c185e 100644 --- a/src/Mod/ReverseEngineering/Gui/Workbench.cpp +++ b/src/Mod/ReverseEngineering/Gui/Workbench.cpp @@ -20,17 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - -#include "Workbench.h" #include #include +#include "Workbench.h" + + using namespace ReverseEngineeringGui; #if 0 // needed for Qt's lupdate utility From 7b3d759ea1ce4993f8f7fdfda06332705ccfb8bd Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 11 Dec 2022 11:32:56 +0100 Subject: [PATCH 19/19] RE: [skip ci] fix build failure --- src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp index 08c52a5e1c..94a4ea2dec 100644 --- a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp +++ b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp @@ -27,6 +27,7 @@ #endif #include +#include #include #include #include