kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #9521 from AgCaliva/User/Document/Feature_level_units_selection_#7746

Browse Source 
Adding "ProjectUnitSystem" support to project files.
This commit is contained in:
sliptonic
2023-10-06 07:56:59 -05:00
committed by GitHub
parent 5f14ef7656 2212e68a30
commit aa82948b27
90 changed files with 2022 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Fem/Gui/Command.cpp
View File

@@ -31,6 +31,8 @@
#include <SMESHDS_Mesh.hxx>
#include <SMESH_Mesh.hxx>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <App/DocumentObserver.h>
@@ -44,8 +46,7 @@
#include <Gui/SelectionFilter.h>
#include <Gui/SelectionObject.h>
#include <Gui/Utilities.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/WaitCursor.h>
#include <Mod/Fem/App/FemAnalysis.h>

4
src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
View File

@@ -30,14 +30,14 @@
#include <SMESH_Mesh.hxx>
#include <Standard_math.hxx>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Base/Console.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Document.h>
#include <Gui/Utilities.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProvider.h>
#include <Gui/WaitCursor.h>
#include <Mod/Fem/App/FemMeshObject.h>

4
src/Mod/Fem/Gui/TaskFemConstraint.cpp
View File

@@ -32,10 +32,12 @@
#include <sstream>
#endif
#include <Gui/Command.h>
#include <App/Document.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/Selection.h>
#include <Gui/ViewProvider.h>

6
src/Mod/Fem/Gui/TaskPostBoxes.cpp
View File

@@ -35,6 +35,10 @@
#include <QMetaMethod>
#include <QToolTip>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <App/Document.h>
#include <Base/Console.h>
@@ -46,8 +50,6 @@
#include <Gui/Document.h>
#include <Gui/Inventor/MarkerBitmaps.h>
#include <Gui/MainWindow.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Fem/App/FemPostPipeline.h>
#include "ui_TaskPostClip.h"

7
src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp
View File

@@ -42,6 +42,10 @@
#include <QMessageBox>
#include <QTextStream>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <App/Document.h>
#include <Base/UnitsApi.h>
@@ -49,9 +53,8 @@
#include <Gui/Control.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include "FemSettings.h"
#include "TaskPostBoxes.h"

6
src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
View File

@@ -46,6 +46,9 @@
#include <QTextStream>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <Base/Console.h>
#include <Gui/Application.h>
@@ -56,8 +59,7 @@
#include <Gui/SelectionObject.h>
#include <Gui/SoFCColorBar.h>
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Fem/App/FemPostFilter.h>
#include "TaskPostBoxes.h"

4
src/Mod/Inspection/Gui/Command.cpp
View File

@@ -24,6 +24,8 @@
#ifndef _PreComp_
#include <Inventor/events/SoButtonEvent.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <Gui/Application.h>
@@ -31,8 +33,6 @@
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Inspection/App/InspectionFeature.h>
#include "ViewProviderInspection.h"

4
src/Mod/Inspection/Gui/ViewProviderInspection.cpp
View File

@@ -46,13 +46,15 @@
#include <Inventor/nodes/SoShapeHints.h>
#endif
#include <Gui/View3DInventorViewer.h>
#include <App/GeoFeature.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/Flag.h>
#include <Gui/MainWindow.h>
#include <Gui/SoFCColorBar.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/Widgets.h>
#include <Mod/Inspection/App/InspectionFeature.h>
#include <Mod/Points/App/Properties.h>

4
src/Mod/Mesh/Gui/Command.cpp
View File

@@ -38,6 +38,8 @@
#ifndef __InventorAll__
#include <Gui/InventorAll.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/DocumentObject.h>
#include <App/DocumentObjectGroup.h>
@@ -53,8 +55,6 @@
#include <Gui/MouseSelection.h>
#include <Gui/NavigationStyle.h>
#include <Gui/Selection.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/WaitCursor.h>
#include <Mod/Mesh/App/Core/Smoothing.h>

5
src/Mod/Mesh/Gui/MeshEditor.cpp
View File

@@ -45,11 +45,12 @@
#include <Inventor/nodes/SoSeparator.h>
#include <Inventor/nodes/SoShapeHints.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Application.h>
#include <App/Document.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/WaitCursor.h>
#include <Mod/Mesh/App/MeshFeature.h>
#include <Mod/Mesh/App/Core/Algorithm.h>

8
src/Mod/Mesh/Gui/MeshSelection.cpp
View File

@@ -32,7 +32,10 @@
#include <Inventor/events/SoMouseButtonEvent.h>
#include <Inventor/nodes/SoCamera.h>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <App/Application.h>
#include <App/Document.h>
#include <Base/Console.h>
@@ -42,8 +45,7 @@
#include <Gui/MouseSelection.h>
#include <Gui/NavigationStyle.h>
#include <Gui/Utilities.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Mesh/App/MeshFeature.h>
#include <Mod/Mesh/App/Core/MeshKernel.h>
#include <Mod/Mesh/App/Core/Iterator.h>

7
src/Mod/MeshPart/Gui/Command.cpp
View File

@@ -26,7 +26,10 @@
#include <QMessageBox>
#include <QPushButton>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <App/Application.h>
#include <App/Document.h>
#include <Base/Converter.h>
@@ -35,8 +38,6 @@
#include <Gui/Control.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Mesh/App/MeshFeature.h>
#include "CrossSections.h"

6
src/Mod/MeshPart/Gui/CrossSections.cpp
View File

@@ -42,13 +42,15 @@
#include <Inventor/nodes/SoSeparator.h>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <App/Document.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProvider.h>
#include <Mod/Mesh/App/Core/Algorithm.h>
#include <Mod/Mesh/App/Core/Grid.h>

7
src/Mod/MeshPart/Gui/CurveOnMesh.cpp
View File

@@ -51,13 +51,16 @@
#include <Inventor/nodes/SoSeparator.h>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <App/Document.h>
#include <Base/Converter.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Utilities.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Mesh/App/Core/Algorithm.h>
#include <Mod/Mesh/App/Core/Grid.h>
#include <Mod/Mesh/App/Core/MeshKernel.h>

5
src/Mod/Part/Gui/BoxSelection.cpp
View File

@@ -33,7 +33,8 @@
# include <Inventor/events/SoMouseButtonEvent.h>
# include <Inventor/nodes/SoCamera.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <Gui/Application.h>
@@ -41,8 +42,6 @@
#include <Gui/Selection.h>
#include <Gui/SelectionFilter.h>
#include <Gui/Utilities.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include "BoxSelection.h"
#include "ViewProviderExt.h"

5
src/Mod/Part/Gui/Command.cpp
View File

@@ -31,7 +31,8 @@
# include <TopExp_Explorer.hxx>
# include <TopoDS_Shape.hxx>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <App/DocumentObjectGroup.h>
#include <Base/Console.h>
@@ -48,8 +49,6 @@
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/SelectionObject.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/WaitCursor.h>
#include "BoxSelection.h"

5
src/Mod/Part/Gui/CrossSections.cpp
View File

@@ -38,7 +38,8 @@
# include <Inventor/nodes/SoLineSet.h>
# include <Inventor/nodes/SoSeparator.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <Base/Sequencer.h>
#include <Base/UnitsApi.h>
@@ -46,8 +47,6 @@
#include <Gui/BitmapFactory.h>
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProvider.h>
#include <Mod/Part/App/CrossSection.h>
#include <Mod/Part/App/PartFeature.h>

5
src/Mod/Part/Gui/DlgPrimitives.cpp
View File

@@ -33,7 +33,8 @@
#include <Inventor/SoPickedPoint.h>
#include <Inventor/events/SoMouseButtonEvent.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Application.h>
#include <App/Part.h>
#include <App/Document.h>
@@ -43,8 +44,6 @@
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/Command.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/SoFCUnifiedSelection.h>
#include <Gui/TaskView/TaskView.h>
#include <Mod/Part/App/PrimitiveFeature.h>

5
src/Mod/Part/Gui/DlgProjectionOnSurface.cpp
View File

@@ -42,12 +42,11 @@
# include <TopoDS_Edge.hxx>
# include <TopoDS_Face.hxx>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <Gui/BitmapFactory.h>
#include <Gui/MainWindow.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/Application.h>
#include <Gui/SelectionObject.h>
#include <Inventor/SbVec3d.h>

5
src/Mod/Part/Gui/SectionCutting.cpp
View File

@@ -38,7 +38,8 @@
# include <QSlider>
# include <QToolTip>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <App/Link.h>
#include <App/Part.h>
@@ -50,8 +51,6 @@
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/PrefWidgets.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Mod/Part/App/FeatureCompound.h>
#include <Mod/Part/App/FeaturePartBox.h>

5
src/Mod/Part/Gui/TaskDimension.cpp
View File

@@ -62,7 +62,8 @@
# include <Inventor/nodes/SoTransform.h>
# include <Inventor/nodes/SoVertexProperty.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <Base/Console.h>
#include <Base/Interpreter.h>
@@ -72,8 +73,6 @@
#include <Gui/BitmapFactory.h>
#include <Gui/Control.h>
#include <Gui/Selection.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Part/App/PartFeature.h>
#include "TaskDimension.h"

5
src/Mod/Part/Gui/TaskFaceColors.cpp
View File

@@ -42,7 +42,8 @@
# include <Inventor/nodes/SoCamera.h>
# include <Inventor/nodes/SoSeparator.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <Gui/Application.h>
#include <Gui/Control.h>
@@ -51,8 +52,6 @@
#include <Gui/Selection.h>
#include <Gui/Tools.h>
#include <Gui/Utilities.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include "TaskFaceColors.h"
#include "ui_TaskFaceColors.h"

6
src/Mod/Part/Gui/ViewProviderGridExtension.cpp
View File

@@ -38,6 +38,9 @@
# include <QApplication>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Base/Parameter.h>
#include <App/Application.h>
#include <Mod/Part/App/PropertyTopoShape.h>
@@ -45,8 +48,7 @@
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/MDIView.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProvider.h>
#include <Gui/ViewProviderDocumentObject.h>

5
src/Mod/PartDesign/Gui/ViewProviderBody.cpp
View File

@@ -29,7 +29,8 @@
# include <Precision.hxx>
# include <QMenu>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <App/Origin.h>
#include <App/Part.h>
@@ -39,8 +40,6 @@
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/MDIView.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProviderOrigin.h>
#include <Gui/ViewProviderOriginFeature.h>
#include <Mod/PartDesign/App/Body.h>

5
src/Mod/PartDesign/Gui/ViewProviderDatum.cpp
View File

@@ -40,14 +40,13 @@
# include <QAction>
# include <QMenu>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <App/DocumentObjectGroup.h>
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/Control.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProviderOrigin.h>
#include <Mod/PartDesign/App/Body.h>
#include <Mod/PartDesign/App/DatumCS.h>

3
src/Mod/Path/Gui/AppPathGui.cpp
View File

@@ -25,7 +25,7 @@
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <Base/PyObjectBase.h>
#include <Gui/Application.h>
#include <Gui/WidgetFactory.h>
#include <Gui/Language/Translator.h>
@@ -34,6 +34,7 @@
#include "ViewProviderPath.h"
#include "ViewProviderPathCompound.h"
#include "ViewProviderPathShape.h"
#include <Gui/Application.h>
// use a different name to CreateCommand()

5
src/Mod/Points/Gui/Command.cpp
View File

@@ -26,6 +26,8 @@
#include <QInputDialog>
#include <algorithm>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Application.h>
#include <App/Document.h>
@@ -39,8 +41,7 @@
#include <Gui/FileDialog.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewProviderDocumentObject.h>
#include <Gui/WaitCursor.h>

3
src/Mod/Points/Gui/ViewProvider.cpp
View File

@@ -36,13 +36,14 @@
#include <Inventor/nodes/SoNormal.h>
#include <Inventor/nodes/SoPointSet.h>
#endif
#include <Gui/View3DInventorViewer.h>
#include <App/Document.h>
#include <Base/Vector3D.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/SoFCSelection.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Points/App/PointsFeature.h>
#include <Mod/Points/App/Properties.h>

5
src/Mod/Sandbox/Gui/AppSandboxGui.cpp
View File

@@ -30,7 +30,8 @@
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoCoordinate3.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <Base/GeometryPyCXX.h>
@@ -42,8 +43,6 @@
#include <App/Document.h>
#include <App/DocumentObserver.h>
#include <Gui/Document.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/Application.h>
#ifdef HAVE_PART
#include <Mod/Part/App/PropertyGeometryList.h>

7
src/Mod/Sandbox/Gui/Command.cpp
View File

@@ -58,7 +58,9 @@
# include <boost/bind/bind.hpp>
# include <memory>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/Tools.h>
#include <Base/Console.h>
#include <Base/Sequencer.h>
#include <App/Application.h>
@@ -68,9 +70,6 @@
#include <Gui/Command.h>
#include <Gui/MainWindow.h>
#include <Gui/FileDialog.h>
#include <Gui/Tools.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/WaitCursor.h>
#include <Mod/Sandbox/App/DocumentThread.h>

9
src/Mod/Sandbox/Gui/Overlay.cpp
View File

@@ -29,6 +29,8 @@
# include <Inventor/nodes/SoOrthographicCamera.h>
# include <Inventor/nodes/SoImage.h>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <QtOpenGL.h>
@@ -36,9 +38,7 @@
#include <Gui/Document.h>
#include <Gui/Selection.h>
#include <Gui/GLPainter.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/NavigationStyle.h>
#include "Overlay.h"
@@ -435,9 +435,6 @@ void paintSelection()
}
// ---------------------------------------
#include <Gui/NavigationStyle.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#if 0
void MeshSelection::prepareFreehandSelection(bool add)
{

8
src/Mod/Sandbox/Gui/PreCompiled.h
View File

@@ -26,6 +26,10 @@
#include <FCConfig.h>
#ifdef FC_OS_WIN32
# include <windows.h>
#endif
// Importing of App classes
#ifdef FC_OS_WIN32
# define SandboxAppExport __declspec(dllimport)
@@ -62,10 +66,6 @@
// Xerces
#include <xercesc/util/XercesDefs.hpp>
#ifdef FC_OS_WIN32
# include <windows.h>
#endif
// Qt Toolkit
#include <qaction.h>
#include <qapplication.h>

3
src/Mod/Sketcher/Gui/AppSketcherGui.cpp
View File

@@ -22,6 +22,7 @@
#include "PreCompiled.h"
#include "ViewProviderSketch.h"
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <Base/PyObjectBase.h>
@@ -34,7 +35,7 @@
#include "SketcherSettings.h"
#include "SoZoomTranslation.h"
#include "ViewProviderPython.h"
#include "ViewProviderSketch.h"
#include "ViewProviderSketchGeometryExtension.h"
#include "ViewProviderSketchGeometryExtensionPy.h"
#include "Workbench.h"

7
src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
View File

@@ -29,6 +29,11 @@
#include <QString>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <App/OriginFeature.h>
#include <Gui/Action.h>
#include <Gui/Application.h>
@@ -37,8 +42,6 @@
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/SelectionFilter.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Part/App/DatumFeature.h>
#include <Mod/Part/App/Geometry2d.h>
#include <Mod/Sketcher/App/Constraint.h>

7
src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
View File

@@ -28,14 +28,17 @@
#include <QPainter>
#endif // #ifndef _PreComp_
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <Base/Console.h>
#include <Base/Exception.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/CommandT.h>
#include <Gui/MainWindow.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Sketcher/App/SketchObject.h>
#include "CommandConstraints.h"

7
src/Mod/Sketcher/Gui/EditDatumDialog.cpp
View File

@@ -30,14 +30,17 @@
#include <QDialog>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <Base/Tools.h>
#include <Gui/Application.h>
#include <Gui/CommandT.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Notifications.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Sketcher/App/GeometryFacade.h>
#include <Mod/Sketcher/App/SketchObject.h>

31
src/Mod/Sketcher/Gui/PropertyVisualLayerList.cpp
View File

@@ -23,6 +23,7 @@
#include "PreCompiled.h"
#include <Base/Console.h>
#include <Base/DocumentReader.h>
#include <Base/Interpreter.h>
#include <Base/Reader.h>
#include <Base/Writer.h>
@@ -91,6 +92,36 @@ void PropertyVisualLayerList::Restore(Base::XMLReader& reader)
setValues(std::move(layers));
}
void PropertyVisualLayerList::Restore(Base::DocumentReader& reader,
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl)
{
auto Prop_VisualLayerListDOM =
reader.FindElementByField(containerEl, "Property", "name", "VisualLayerList");
if (Prop_VisualLayerListDOM) {
auto VisualLayerListDOM = reader.FindElement(Prop_VisualLayerListDOM, "VisualLayerList");
const char* count_cstr = reader.GetAttribute(VisualLayerListDOM, "count");
if (count_cstr) {
int count = reader.ContentToInt(count_cstr);
std::vector<VisualLayer> layers;
layers.reserve(count);
auto prev_VisualLayerDOM = reader.FindElement(VisualLayerListDOM, "VisualLayer");
VisualLayer visualLayer;
visualLayer.Restore(reader, prev_VisualLayerDOM);
layers.push_back(std::move(visualLayer));
for (int i = 1; i < count; i++) {
auto VisualLayerDOM_i = reader.FindNextElement(prev_VisualLayerDOM, "VisualLayer");
VisualLayer visualLayer;
visualLayer.Restore(reader, VisualLayerDOM_i);
layers.push_back(std::move(visualLayer));
prev_VisualLayerDOM = VisualLayerDOM_i;
}
setValues(std::move(layers));
}
}
}
Property* PropertyVisualLayerList::Copy() const
{
PropertyVisualLayerList* p = new PropertyVisualLayerList();

2
src/Mod/Sketcher/Gui/PropertyVisualLayerList.h
View File

@@ -61,6 +61,8 @@ public:
void Save(Base::Writer& writer) const override;
void Restore(Base::XMLReader& reader) override;
void Restore(Base::DocumentReader& reader,
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl) override;
Property* Copy() const override;
void Paste(const Property& from) override;

10
src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp
View File

@@ -21,13 +21,11 @@
***************************************************************************/
#include "PreCompiled.h"
#include <Gui/Command.h>
#include "TaskDlgEditSketch.h"
// clang-format off
#include "ViewProviderSketch.h"
#include <Gui/Command.h>
#include "TaskDlgEditSketch.h"
// clang-format on
using namespace SketcherGui;
//**************************************************************************

7
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -39,6 +39,11 @@
#include <QTextStream>
#endif
// clang-format off
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
// clang-format on
#include <Base/Console.h>
#include <Base/Vector3D.h>
#include <Gui/Application.h>
@@ -52,8 +57,6 @@
#include <Gui/SelectionObject.h>
#include <Gui/SoFCUnifiedSelection.h>
#include <Gui/Utilities.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Part/App/Geometry.h>
#include <Mod/Sketcher/App/GeoList.h>
#include <Mod/Sketcher/App/GeometryFacade.h>

4
src/Mod/Sketcher/Gui/ViewProviderSketch.h
View File

@@ -29,10 +29,12 @@
#include <boost_signals2.hpp>
#include <memory>
#include <Gui/GLPainter.h>
#include <Base/Parameter.h>
#include <Base/Placement.h>
#include <Gui/Document.h>
#include <Gui/GLPainter.h>
#include <Gui/Selection.h>
#include <Mod/Part/Gui/ViewProvider2DObject.h>
#include <Mod/Part/Gui/ViewProviderAttachExtension.h>

19
src/Mod/Sketcher/Gui/VisualLayer.cpp
View File

@@ -22,6 +22,8 @@
#include "PreCompiled.h"
#include <Base/Console.h>
#include <Base/DocumentReader.h>
#include <Base/Reader.h>
#include <Base/Writer.h>
@@ -86,3 +88,20 @@ void VisualLayer::Restore(Base::XMLReader& reader)
linePattern = reader.getAttributeAsUnsigned("linePattern");
lineWidth = reader.getAttributeAsFloat("lineWidth");
}
void VisualLayer::Restore(Base::DocumentReader& reader,
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* ContainerDOM)
{
const char* visible_cstr = reader.GetAttribute(ContainerDOM, "visible");
if (visible_cstr) {
std::string str = visible_cstr;
visible = (str == "true");
const char* linePattern_cstr = reader.GetAttribute(ContainerDOM, "linePattern");
const char* lineWidth_cstr = reader.GetAttribute(ContainerDOM, "lineWidth");
if (linePattern_cstr && lineWidth_cstr) {
linePattern = reader.ContentToUnsigned(linePattern_cstr);
lineWidth = reader.ContentToUnsigned(lineWidth_cstr);
}
}
}

2
src/Mod/Sketcher/Gui/VisualLayer.h
View File

@@ -52,6 +52,8 @@ public:
void Save(Base::Writer& /*writer*/) const;
void Restore(Base::XMLReader& /*reader*/);
void Restore(Base::DocumentReader& reader,
XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* containerEl);
private:
unsigned int linePattern;

3
src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
View File

@@ -29,11 +29,12 @@
#include <sstream>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/View3DInventor.h>
#include <Mod/Spreadsheet/App/Sheet.h>
#include "SpreadsheetView.h"

5
src/Mod/TechDraw/Gui/DrawGuiUtil.cpp
View File

@@ -35,7 +35,8 @@
# include <BRepLProp_SLProps.hxx>
# include <gp_Dir.hxx>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Application.h>
#include <App/Document.h>
#include <App/DocumentObject.h>
@@ -50,8 +51,6 @@
#include <Gui/MainWindow.h>
#include <Gui/MDIView.h>
#include <Gui/Selection.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Inventor/SbVec3f.h>
#include <Mod/TechDraw/App/ArrowPropEnum.h>
#include <Mod/TechDraw/App/DrawPage.h>

5
src/Mod/TechDraw/Gui/Grabber3d.cpp
View File

@@ -21,12 +21,11 @@
***************************************************************************/
#include "PreCompiled.h"
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Base/Console.h>
#include <Gui/MainWindow.h>
#include <Gui/MDIView.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include "Grabber3d.h"

5
src/Mod/TechDraw/Gui/QGVPage.cpp
View File

@@ -34,7 +34,8 @@
#include <QScrollBar>
#include <QWheelEvent>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <App/Application.h>
#include <App/Document.h>
#include <Base/Parameter.h>
@@ -42,8 +43,6 @@
#include <Gui/Document.h>
#include <Gui/NavigationStyle.h>
#include <Gui/Selection.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawSVGTemplate.h>

5
src/Mod/TechDraw/Gui/TaskActiveView.cpp
View File

@@ -27,6 +27,8 @@
# include <QMessageBox>
# include <QPushButton>
#endif // #ifndef _PreComp_
#include <Gui/View3DInventor.h>
#include <Gui/ViewProvider.h>
#include <App/Document.h>
#include <Base/Console.h>
@@ -36,8 +38,7 @@
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/View3DInventor.h>
#include <Gui/ViewProvider.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawViewImage.h>

5
src/Mod/TechDraw/Gui/TaskProjection.cpp
View File

@@ -26,15 +26,14 @@
#ifndef _PreComp_
# include <QMessageBox>
#endif
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Command.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/View3DInventor.h>
#include <Gui/View3DInventorViewer.h>
#include <Mod/Part/App/PartFeature.h>
#include "TaskProjection.h"