From 4895bc03b4eafecdcefc8c7a5516bddf43fe74b4 Mon Sep 17 00:00:00 2001 From: HanifKoh <76276251+HanifKoh@users.noreply.github.com> Date: Mon, 5 Oct 2026 16:47:17 +0800 Subject: [PATCH] Remove Unused Project Includes and Forward-Declare Where a Type Is Only Referenced (#16099) * Remove Unused Project Includes and Forward-Declare Where a Type Is Only Referenced Generated with include-what-you-use and applied conservatively. Only OrcaSlicer's own headers, the ones under src/ and tests/, are removed or forward-declared; standard-library and third-party includes are left alone. An include is removed only when both the Release and the Debug configuration leave it unused, never from inside a conditional block, and never from a file with platform-specific blocks, which only gain includes. Files whose only use of a header sits behind a feature or debug macro (libvgcode's OpenGL ES and marker code, the ARACHNE/TESTS_EXPORT_SVGS debug output) keep their includes. clonable_ptr.hpp gains #pragma once; it had no include guard and was only safe while Config.hpp was its sole includer. * Remove Unused Project Includes From Files With Platform-Specific Code A Linux include-what-you-use run cannot see the code inside _WIN32, __APPLE__ or __linux__ blocks, so its verdict is only taken where nothing the removed header declares, directly or through what it includes, is named inside those blocks. Removals also have to hold in both the Release and Debug configuration and never touch a line inside a conditional block. * Restore the libslic3r Precompiled Header and Direct Includes Lost in the Platform Pass The platform-file pass treated pchheader.hpp as an ordinary header and emptied it, and left GUI_Preview.hpp and 14 other files relying on headers they no longer reached directly. * Restore MainFrame.hpp in ParamsDialog.cpp for the Windows-Only Reparent Call * Include Headers That Files Reached Through Ones the Cleanup Removed * Drop Includes Duplicated by the Cleanup or by Main's Own Additions * Leave PreciseSeam.cpp as Main Has It After the Precise Seam Rework --- src/OrcaSlicer.cpp | 12 ++++++++++++ src/OrcaSlicer.hpp | 5 ++++- .../OrcaSlicer_profile_validator.cpp | 2 ++ src/dev-utils/profile_include_dump.cpp | 1 + src/libslic3r/Algorithm/RegionExpansion.cpp | 1 + .../Arachne/SkeletalTrapezoidation.cpp | 2 ++ .../Arachne/SkeletalTrapezoidation.hpp | 1 - src/libslic3r/Arachne/WallToolPaths.hpp | 1 - src/libslic3r/Arachne/utils/ExtrusionLine.cpp | 1 - src/libslic3r/Arachne/utils/ExtrusionLine.hpp | 2 -- .../Arachne/utils/PolylineStitcher.hpp | 1 - src/libslic3r/Arrange.cpp | 2 +- src/libslic3r/Brim.cpp | 5 +++++ src/libslic3r/CAD/CadDocument.cpp | 4 ++++ src/libslic3r/CAD/SketchEngine.cpp | 2 ++ src/libslic3r/CAD/SketchSolver.cpp | 1 + src/libslic3r/CAD/SketchSolver.hpp | 5 ++++- src/libslic3r/Circle.cpp | 2 -- src/libslic3r/Circle.hpp | 3 ++- src/libslic3r/ClipperUtils.cpp | 2 +- src/libslic3r/ClipperZUtils.cpp | 1 + src/libslic3r/ClipperZUtils.hpp | 1 + src/libslic3r/ContourZ.cpp | 3 +++ src/libslic3r/CustomGCode.cpp | 3 --- src/libslic3r/CutSurface.hpp | 4 +++- src/libslic3r/CutUtils.cpp | 1 + src/libslic3r/ElephantFootCompensation.cpp | 2 +- src/libslic3r/ElephantFootCompensation.hpp | 1 - src/libslic3r/ExPolygon.cpp | 2 -- src/libslic3r/ExPolygonsIndex.cpp | 1 + src/libslic3r/Extruder.cpp | 1 + src/libslic3r/Extruder.hpp | 1 - src/libslic3r/ExtrusionEntity.cpp | 2 +- src/libslic3r/ExtrusionSimulator.cpp | 1 + src/libslic3r/ExtrusionSimulator.hpp | 1 - src/libslic3r/FaceDetector.cpp | 1 - src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp | 6 ++++-- .../Interlocking/InterlockingGenerator.cpp | 4 ++++ .../Interlocking/InterlockingGenerator.hpp | 5 +++-- .../Feature/Interlocking/VoxelUtils.cpp | 2 +- src/libslic3r/Fill/Fill.cpp | 7 +++++++ src/libslic3r/Fill/Fill3DHoneycomb.cpp | 1 + src/libslic3r/Fill/Fill3DHoneycomb.hpp | 2 ++ src/libslic3r/Fill/FillAdaptive.cpp | 3 +++ src/libslic3r/Fill/FillBase.cpp | 1 + src/libslic3r/Fill/FillBase.hpp | 5 +++-- src/libslic3r/Fill/FillConcentric.cpp | 1 + src/libslic3r/Fill/FillConcentric.hpp | 3 ++- src/libslic3r/Fill/FillConcentricInternal.cpp | 5 +++++ src/libslic3r/Fill/FillConcentricInternal.hpp | 2 ++ src/libslic3r/Fill/FillCornerSmoothing.hpp | 1 - src/libslic3r/Fill/FillCrossHatch.cpp | 3 +-- src/libslic3r/Fill/FillCrossHatch.hpp | 4 ++-- src/libslic3r/Fill/FillGyroid.cpp | 3 +-- src/libslic3r/Fill/FillGyroid.hpp | 4 ++-- src/libslic3r/Fill/FillHoneycomb.cpp | 3 +-- src/libslic3r/Fill/FillLightning.cpp | 1 - src/libslic3r/Fill/FillLightning.hpp | 3 ++- src/libslic3r/Fill/FillLine.cpp | 3 ++- src/libslic3r/Fill/FillPlanePath.cpp | 2 +- src/libslic3r/Fill/FillRectilinear.cpp | 1 - src/libslic3r/Fill/FillRectilinear.hpp | 3 ++- src/libslic3r/Fill/FillSpiralInset.cpp | 5 +++-- src/libslic3r/Fill/FillSpiralInset.hpp | 3 ++- src/libslic3r/Fill/FillTpmsD.hpp | 1 - src/libslic3r/Fill/FillTpmsFK.cpp | 1 + src/libslic3r/Fill/FillTpmsFK.hpp | 1 - src/libslic3r/Fill/Lightning/Generator.cpp | 3 +++ src/libslic3r/Fill/Lightning/Layer.cpp | 1 - src/libslic3r/Fill/Lightning/TreeNode.hpp | 1 + src/libslic3r/Flow.cpp | 2 +- src/libslic3r/FlushVolCalc.cpp | 1 - src/libslic3r/Format/3mf.cpp | 2 -- src/libslic3r/Format/AMF.cpp | 7 ------- src/libslic3r/Format/OBJ.cpp | 1 - src/libslic3r/Format/SL1.cpp | 3 +-- src/libslic3r/Format/STEP.cpp | 1 - src/libslic3r/Format/STL.cpp | 1 - src/libslic3r/Format/bbs_3mf.cpp | 2 +- src/libslic3r/Format/svg.cpp | 1 + src/libslic3r/GCode.cpp | 9 ++++++++- src/libslic3r/GCode.hpp | 7 ++++--- src/libslic3r/GCode/AdaptivePAProcessor.cpp | 3 +++ .../GCode/AvoidCrossingPerimeters.cpp | 5 ++++- .../GCode/AvoidCrossingPerimeters.hpp | 2 +- src/libslic3r/GCode/ConflictChecker.cpp | 1 + src/libslic3r/GCode/ConflictChecker.hpp | 5 ++--- src/libslic3r/GCode/CoolingBuffer.cpp | 3 +++ src/libslic3r/GCode/CoolingBuffer.hpp | 1 - src/libslic3r/GCode/FanMover.cpp | 2 ++ src/libslic3r/GCode/FanMover.hpp | 3 --- src/libslic3r/GCode/GCodeProcessor.cpp | 3 ++- src/libslic3r/GCode/OrderingStrategies.cpp | 1 + src/libslic3r/GCode/OrderingStrategies.hpp | 4 ++-- src/libslic3r/GCode/PressureEqualizer.cpp | 3 +-- src/libslic3r/GCode/PressureEqualizer.hpp | 1 - src/libslic3r/GCode/PrintExtents.cpp | 2 ++ .../GCode/RetractWhenCrossingPerimeters.cpp | 2 ++ src/libslic3r/GCode/SeamPlacer.hpp | 5 ----- .../GCode/SmallAreaInfillFlowCompensator.cpp | 2 +- .../GCode/SmallAreaInfillFlowCompensator.hpp | 7 ++++--- src/libslic3r/GCode/SpiralVase.cpp | 3 ++- src/libslic3r/GCode/SpiralVase.hpp | 2 +- src/libslic3r/GCode/Thumbnails.cpp | 1 - src/libslic3r/GCode/Thumbnails.hpp | 4 ++-- src/libslic3r/GCode/TimelapsePosPicker.cpp | 3 +++ src/libslic3r/GCode/TimelapsePosPicker.hpp | 4 +++- src/libslic3r/GCode/ToolOrdering.cpp | 5 +++++ src/libslic3r/GCode/ToolOrdering.hpp | 6 ++++-- src/libslic3r/GCode/WipePathHelpers.cpp | 1 + src/libslic3r/GCode/WipeTower.cpp | 1 + src/libslic3r/GCode/WipeTower2.cpp | 2 +- src/libslic3r/GCode/WipeTower2.hpp | 2 ++ src/libslic3r/GCode/WipeTowerEstimate.cpp | 1 + src/libslic3r/GCodeReader.cpp | 1 + src/libslic3r/GCodeWriter.cpp | 1 - src/libslic3r/GCodeWriter.hpp | 2 +- src/libslic3r/Geometry.cpp | 5 ++--- src/libslic3r/Geometry/Circle.cpp | 1 - src/libslic3r/Geometry/ConvexHull.cpp | 2 +- src/libslic3r/Geometry/Voronoi.hpp | 2 -- src/libslic3r/Geometry/VoronoiOffset.hpp | 1 - src/libslic3r/Geometry/VoronoiUtils.hpp | 1 - src/libslic3r/Geometry/VoronoiUtilsCgal.hpp | 2 -- src/libslic3r/IntersectionPoints.cpp | 1 + src/libslic3r/LayOnFace.cpp | 1 + src/libslic3r/Layer.cpp | 4 +++- src/libslic3r/Layer.hpp | 7 +++++-- src/libslic3r/LayerRegion.cpp | 3 +++ src/libslic3r/Line.cpp | 2 +- src/libslic3r/Measure.cpp | 2 ++ src/libslic3r/MinAreaBoundingBox.cpp | 1 + src/libslic3r/Model.cpp | 1 + src/libslic3r/ModelArrange.cpp | 4 +++- src/libslic3r/MultiMaterialSegmentation.cpp | 6 ++++-- src/libslic3r/MutablePolygon.cpp | 1 - src/libslic3r/NSVGUtils.hpp | 1 - src/libslic3r/Orient.cpp | 2 +- src/libslic3r/Orient.hpp | 4 +++- src/libslic3r/PerimeterGenerator.cpp | 5 +++-- src/libslic3r/PerimeterGenerator.hpp | 7 +++++-- src/libslic3r/PlaceholderParser.hpp | 4 ++-- src/libslic3r/PolygonTrimmer.hpp | 4 ---- src/libslic3r/Polyline.cpp | 3 +-- src/libslic3r/Preset.cpp | 1 - src/libslic3r/PresetCacheFormat.hpp | 3 +++ src/libslic3r/PrincipalComponents2D.hpp | 3 --- src/libslic3r/Print.cpp | 4 +++- src/libslic3r/PrintApply.cpp | 4 ++++ src/libslic3r/PrintObject.cpp | 11 ++++++++--- src/libslic3r/PrintObjectSlice.cpp | 2 ++ src/libslic3r/ProjectTask.cpp | 3 --- src/libslic3r/SLA/Clustering.hpp | 1 - src/libslic3r/SLA/ConcaveHull.cpp | 2 +- src/libslic3r/SLA/Hollowing.cpp | 3 ++- src/libslic3r/SLA/Pad.cpp | 3 ++- src/libslic3r/SLA/RasterToPolygons.cpp | 2 +- src/libslic3r/SLA/Rotfinder.cpp | 6 +++--- src/libslic3r/SLA/SupportPointGenerator.cpp | 3 +-- src/libslic3r/SLA/SupportPointGenerator.hpp | 3 ++- src/libslic3r/SLA/SupportTree.cpp | 9 ++++----- src/libslic3r/SLA/SupportTreeBuilder.cpp | 1 + src/libslic3r/SLA/SupportTreeBuildsteps.hpp | 5 +++-- src/libslic3r/SLAPrint.cpp | 5 +++-- src/libslic3r/SLAPrintSteps.cpp | 10 +++++++--- src/libslic3r/SLAPrintSteps.hpp | 2 -- src/libslic3r/Semver.cpp | 1 - src/libslic3r/ShortestPath.cpp | 1 + src/libslic3r/ShortestPath.hpp | 7 +++++-- src/libslic3r/SlicesToTriangleMesh.cpp | 1 + src/libslic3r/Slicing.cpp | 1 + src/libslic3r/SlicingAdaptive.hpp | 2 ++ src/libslic3r/Support/SupportCommon.cpp | 5 +++++ src/libslic3r/Support/SupportCommon.hpp | 8 ++++---- src/libslic3r/Support/SupportMaterial.cpp | 5 +++++ src/libslic3r/Support/SupportMaterial.hpp | 3 +-- .../Support/SupportSpotsGenerator.cpp | 11 ----------- .../Support/SupportSpotsGenerator.hpp | 5 ++--- src/libslic3r/Support/TreeModelVolumes.cpp | 2 -- src/libslic3r/Support/TreeModelVolumes.hpp | 1 - src/libslic3r/Support/TreeSupport.cpp | 8 +++++++- src/libslic3r/Support/TreeSupport3D.cpp | 4 ++++ src/libslic3r/Support/TreeSupport3D.hpp | 5 ++--- src/libslic3r/Surface.hpp | 3 +-- src/libslic3r/SurfaceCollection.hpp | 1 - src/libslic3r/Tesselate.cpp | 3 +++ .../TextureBake/TextureBakeDebug.hpp | 3 ++- .../TextureBake/TextureBakePipeline.hpp | 1 - src/libslic3r/TextureDisplacement.cpp | 1 + src/libslic3r/TextureDisplacement.hpp | 1 - src/libslic3r/TexturePainting.cpp | 1 + src/libslic3r/TextureToColor/ColorUtils.hpp | 1 - .../TextureToColor/TextureToColor.hpp | 2 ++ src/libslic3r/Thread.cpp | 1 - src/libslic3r/TriangleMesh.cpp | 4 +--- src/libslic3r/TriangleMeshSlicer.cpp | 2 -- src/libslic3r/TriangleSelector.cpp | 1 - src/libslic3r/TriangulateWall.cpp | 1 - src/libslic3r/VariableWidth.hpp | 4 ++-- src/libslic3r/calib.cpp | 1 + src/libslic3r/clonable_ptr.hpp | 2 ++ src/libslic3r/libslic3r.h | 1 - src/libslic3r/utils.cpp | 3 ++- src/slic3r/Config/Version.hpp | 1 - src/slic3r/GUI/2DBed.cpp | 4 +++- src/slic3r/GUI/AVVideoDecoder.hpp | 3 +++ src/slic3r/GUI/AboutDialog.hpp | 6 ++++++ src/slic3r/GUI/AmsMappingPopup.cpp | 8 +++++--- src/slic3r/GUI/AmsMappingPopupUpdate.cpp | 14 +++++++++----- src/slic3r/GUI/AmsWidgets.cpp | 9 +++------ src/slic3r/GUI/Auxiliary.cpp | 3 ++- src/slic3r/GUI/AuxiliaryDataViewModel.cpp | 5 +++-- src/slic3r/GUI/AuxiliaryDataViewModel.hpp | 1 - src/slic3r/GUI/AuxiliaryDialog.cpp | 3 ++- src/slic3r/GUI/AuxiliaryDialog.hpp | 3 ++- src/slic3r/GUI/BBLStatusBar.cpp | 1 - src/slic3r/GUI/BBLStatusBarBind.cpp | 3 +-- src/slic3r/GUI/BBLStatusBarBind.hpp | 15 ++++++--------- src/slic3r/GUI/BBLStatusBarPrint.cpp | 1 - src/slic3r/GUI/BBLStatusBarSend.cpp | 1 - src/slic3r/GUI/BBLTopbar.cpp | 1 + src/slic3r/GUI/BBLTopbar.hpp | 9 ++++++++- src/slic3r/GUI/BackgroundSlicingProcess.cpp | 4 ++++ src/slic3r/GUI/BackgroundSlicingProcess.hpp | 6 +++++- src/slic3r/GUI/BaseTransparentDPIFrame.cpp | 9 ++------- src/slic3r/GUI/BaseTransparentDPIFrame.hpp | 10 +++++++--- src/slic3r/GUI/BonjourDialog.hpp | 7 ++++--- src/slic3r/GUI/CAD/DesignCanvas.cpp | 1 + src/slic3r/GUI/CAD/DesignCanvas.hpp | 9 +++++++-- src/slic3r/GUI/CAD/DesignPanel.cpp | 2 +- src/slic3r/GUI/CAD/DesignSketchTool.cpp | 5 +++++ src/slic3r/GUI/CAD/DesignSketchTool.hpp | 1 - src/slic3r/GUI/CAD/SketchInlineEditor.cpp | 1 - src/slic3r/GUI/CalibrationWizardCaliPage.cpp | 10 ++++++++-- src/slic3r/GUI/CalibrationWizardPage.cpp | 3 ++- src/slic3r/GUI/CameraPopup.cpp | 1 - src/slic3r/GUI/CameraUtils.cpp | 2 ++ src/slic3r/GUI/CloneDialog.cpp | 7 ++++++- src/slic3r/GUI/ColorDecomposeSupport.cpp | 4 ++++ src/slic3r/GUI/ConfigManipulation.hpp | 6 ++++-- src/slic3r/GUI/ConfigWizard.cpp | 1 - src/slic3r/GUI/CrealityDiscoveryDialog.hpp | 2 ++ src/slic3r/GUI/DailyTips.cpp | 2 +- src/slic3r/GUI/DesktopIntegrationDialog.cpp | 1 + src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp | 1 - src/slic3r/GUI/DeviceCore/DevCtrl.cpp | 1 - src/slic3r/GUI/DeviceCore/DevCtrl.h | 1 - src/slic3r/GUI/DeviceCore/DevFan.cpp | 2 -- .../GUI/DeviceCore/DevFilaAmsSetting.cpp | 1 + .../GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp | 1 + src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp | 3 ++- .../GUI/DeviceCore/DevFilaSystemCtrl.cpp | 1 - src/slic3r/GUI/DeviceCore/DevFirmware.cpp | 1 - src/slic3r/GUI/DeviceCore/DevHMS.h | 1 - src/slic3r/GUI/DeviceCore/DevInfo.cpp | 1 - src/slic3r/GUI/DeviceCore/DevInfo.h | 1 - src/slic3r/GUI/DeviceCore/DevMapping.cpp | 1 - src/slic3r/GUI/DeviceCore/DevMapping.h | 5 ++--- .../GUI/DeviceCore/DevMappingNozzle.cpp | 4 ++-- src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp | 1 - .../GUI/DeviceCore/DevNozzleRackCtrl.cpp | 3 ++- src/slic3r/GUI/DeviceCore/DevPrintOptions.h | 1 - src/slic3r/GUI/DeviceCore/DevStatus.cpp | 1 - src/slic3r/GUI/DeviceCore/DevStatus.h | 2 -- src/slic3r/GUI/DeviceCore/DevStorage.cpp | 1 - src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp | 1 - src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp | 4 +++- src/slic3r/GUI/DeviceCore/DevUtilBackend.h | 3 ++- src/slic3r/GUI/DeviceErrorDialog.hpp | 7 +++++++ src/slic3r/GUI/DeviceManager.cpp | 13 ++++++------- .../GUI/DeviceTab/uiAmsHumidityPopup.cpp | 5 +++-- src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp | 5 +++-- src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp | 2 -- src/slic3r/GUI/DeviceTab/wgtMsgPanel.h | 4 ++++ src/slic3r/GUI/DockPanel.hpp | 2 ++ src/slic3r/GUI/DownloadProgressDialog.cpp | 7 +++---- src/slic3r/GUI/Downloader.hpp | 3 ++- src/slic3r/GUI/DownloaderFileGet.cpp | 1 + src/slic3r/GUI/DownloaderFileGet.hpp | 1 - src/slic3r/GUI/DragCanvas.cpp | 3 ++- src/slic3r/GUI/DragCanvas.hpp | 6 ++++++ src/slic3r/GUI/ExportPresetBundleDialog.cpp | 5 ++--- src/slic3r/GUI/ExtraRenderers.cpp | 2 ++ src/slic3r/GUI/ExtrusionCalibration.cpp | 1 - src/slic3r/GUI/Field.hpp | 12 ++++++++---- src/slic3r/GUI/FilamentPickerDialog.cpp | 1 - src/slic3r/GUI/FileArchiveDialog.cpp | 4 +--- src/slic3r/GUI/FrameProfiler.cpp | 1 - src/slic3r/GUI/GCodeViewer.cpp | 18 +++++++++--------- src/slic3r/GUI/GLCanvas3D.cpp | 19 ++++++++++++++++++- src/slic3r/GUI/GLCanvas3D.hpp | 12 ++++++++---- src/slic3r/GUI/GLSelectionRectangle.cpp | 2 ++ src/slic3r/GUI/GLShader.cpp | 1 - src/slic3r/GUI/GLTexture.hpp | 3 ++- src/slic3r/GUI/GLToolbar.cpp | 7 +++++-- src/slic3r/GUI/GUI.cpp | 1 - src/slic3r/GUI/GUI_App.cpp | 15 +++++++++++++++ src/slic3r/GUI/GUI_AuxiliaryList.hpp | 10 +++++++++- src/slic3r/GUI/GUI_Factories.cpp | 1 - src/slic3r/GUI/GUI_Geometry.cpp | 1 - src/slic3r/GUI/GUI_Init.cpp | 5 +---- src/slic3r/GUI/GUI_ObjectList.cpp | 4 +++- src/slic3r/GUI/GUI_ObjectList.hpp | 3 ++- src/slic3r/GUI/GUI_ObjectSettings.cpp | 9 ++++++--- src/slic3r/GUI/GUI_ObjectTable.cpp | 10 +++++----- src/slic3r/GUI/GUI_ObjectTableSettings.hpp | 3 +++ src/slic3r/GUI/GUI_Preview.cpp | 15 +++++++++------ src/slic3r/GUI/GUI_Preview.hpp | 12 +++++++----- src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp | 9 ++++----- src/slic3r/GUI/Gizmos/GLGizmoBase.cpp | 6 ++++++ src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp | 10 +++++++++- src/slic3r/GUI/Gizmos/GLGizmoCut.cpp | 12 ++++++++++-- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 13 +++++++++---- src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp | 12 ++++++++++++ src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp | 4 ++++ src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp | 6 ++++++ src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp | 10 +++++++++- src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp | 5 +++-- src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp | 7 +++++++ .../GUI/Gizmos/GLGizmoMmuSegmentation.cpp | 7 +++++++ src/slic3r/GUI/Gizmos/GLGizmoMove.cpp | 7 ++++++- src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp | 10 +++++++++- src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp | 4 ++-- src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp | 11 ++++++++++- src/slic3r/GUI/Gizmos/GLGizmoScale.cpp | 10 +++++++++- src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp | 5 +++-- src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp | 9 ++++----- src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 10 +++++++--- .../GUI/Gizmos/GizmoObjectManipulation.cpp | 4 ++++ src/slic3r/GUI/GradientCurveEditor.hpp | 2 ++ src/slic3r/GUI/GuiColor.hpp | 1 - src/slic3r/GUI/HMSPanel.cpp | 4 ++-- src/slic3r/GUI/HintNotification.cpp | 1 - src/slic3r/GUI/HintNotification.hpp | 3 +++ src/slic3r/GUI/IMSlider.cpp | 11 +++++++++-- src/slic3r/GUI/IMSlider.hpp | 3 ++- src/slic3r/GUI/IMToolbar.hpp | 1 - src/slic3r/GUI/IconManager.cpp | 1 + src/slic3r/GUI/IdleScheduler.cpp | 1 + src/slic3r/GUI/IdleScheduler.hpp | 3 ++- src/slic3r/GUI/ImGuiWrapper.cpp | 1 - src/slic3r/GUI/ImageDPIFrame.cpp | 3 --- src/slic3r/GUI/Jobs/BindJob.cpp | 3 --- src/slic3r/GUI/Jobs/BindJob.hpp | 2 ++ src/slic3r/GUI/Jobs/BoostThreadWorker.cpp | 1 + .../GUI/Jobs/CreateFontStyleImagesJob.hpp | 1 - src/slic3r/GUI/Jobs/EmbossJob.cpp | 14 ++++++++------ src/slic3r/GUI/Jobs/FillBedJob.cpp | 8 ++++++-- src/slic3r/GUI/Jobs/OAuthJob.hpp | 2 ++ src/slic3r/GUI/Jobs/OrientJob.cpp | 6 ++++-- src/slic3r/GUI/Jobs/PrintJob.cpp | 7 ++++--- src/slic3r/GUI/Jobs/RotoptimizeJob.cpp | 8 ++++++-- src/slic3r/GUI/Jobs/SLAImportJob.cpp | 4 +++- .../GUI/Jobs/TextureDisplacementBakeJob.cpp | 2 ++ .../GUI/Jobs/TextureDisplacementBakeJob.hpp | 3 ++- .../GUI/Jobs/TextureDisplacementDebugJob.cpp | 2 ++ .../GUI/Jobs/TextureDisplacementDebugJob.hpp | 1 - .../Jobs/TextureDisplacementPrepareJob.cpp | 2 ++ .../Jobs/TextureDisplacementPrepareJob.hpp | 2 -- .../Jobs/TextureDisplacementPreviewJob.cpp | 1 - .../Jobs/TextureDisplacementPreviewJob.hpp | 2 -- src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp | 2 ++ src/slic3r/GUI/KBShortcutsDialog.cpp | 3 --- src/slic3r/GUI/KBShortcutsDialog.hpp | 13 +++++++++++-- src/slic3r/GUI/Lazy.hpp | 3 ++- src/slic3r/GUI/LazyPage.hpp | 1 + src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp | 4 ++++ src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp | 1 - src/slic3r/GUI/MainFrame.cpp | 14 ++++++++++++++ src/slic3r/GUI/MarkdownTip.hpp | 6 ++++++ src/slic3r/GUI/MediaFilePanel.cpp | 1 - src/slic3r/GUI/MediaPlayCtrl.cpp | 3 ++- src/slic3r/GUI/MediaPlayCtrl.h | 7 +++++-- src/slic3r/GUI/MeshUtils.cpp | 4 +++- src/slic3r/GUI/ModelMall.cpp | 3 ++- src/slic3r/GUI/Monitor.cpp | 8 +++++--- src/slic3r/GUI/MonitorBasePanel.cpp | 5 ++--- src/slic3r/GUI/MonitorBasePanel.h | 12 ++++++------ src/slic3r/GUI/MonitorPage.cpp | 2 ++ src/slic3r/GUI/MonitorPage.hpp | 3 +++ src/slic3r/GUI/MsgDialog.cpp | 1 + src/slic3r/GUI/MultiChoiceDialog.hpp | 5 +++-- src/slic3r/GUI/NativeCommands.cpp | 3 ++- src/slic3r/GUI/NetworkTestDialog.hpp | 10 ++++++++-- src/slic3r/GUI/Notebook.cpp | 1 - src/slic3r/GUI/Notebook.hpp | 5 ++++- src/slic3r/GUI/OAuthDialog.hpp | 3 +++ src/slic3r/GUI/OG_CustomCtrl.cpp | 3 --- src/slic3r/GUI/OG_CustomCtrl.hpp | 11 ++++++++--- src/slic3r/GUI/ObjectDataViewModel.cpp | 1 - src/slic3r/GUI/OpenGLManager.cpp | 1 + src/slic3r/GUI/OptionsGroup.cpp | 6 ++---- src/slic3r/GUI/ParamsDialog.cpp | 4 ++-- src/slic3r/GUI/ParamsPanel.cpp | 3 +-- src/slic3r/GUI/PartPlate.cpp | 10 +++++++++- src/slic3r/GUI/PartSkipDialog.cpp | 2 -- src/slic3r/GUI/PhysicalPrinterDialog.cpp | 6 ------ src/slic3r/GUI/PluginProgressDialog.cpp | 2 ++ src/slic3r/GUI/PluginProgressDialog.hpp | 4 ++++ src/slic3r/GUI/PluginsConfigDialog.hpp | 2 ++ src/slic3r/GUI/PluginsDialog.hpp | 8 +++----- src/slic3r/GUI/PostProcessor.hpp | 4 ++-- src/slic3r/GUI/PrePrintChecker.cpp | 3 ++- src/slic3r/GUI/PresetComboBoxes.cpp | 3 --- src/slic3r/GUI/PresetHints.cpp | 11 +++-------- src/slic3r/GUI/PresetHints.hpp | 5 +++-- src/slic3r/GUI/PrintHostDialogs.cpp | 5 +++++ src/slic3r/GUI/Printer/PrinterFileSystem.cpp | 1 + src/slic3r/GUI/PrinterCloudAuthDialog.hpp | 7 +++++-- src/slic3r/GUI/PrinterWebView.cpp | 4 ++-- src/slic3r/GUI/PrinterWebViewHandler.hpp | 2 ++ src/slic3r/GUI/ProcessRunner.hpp | 2 ++ src/slic3r/GUI/ProgressStatusBar.hpp | 1 - src/slic3r/GUI/Project.cpp | 12 ++++++------ src/slic3r/GUI/Project.hpp | 12 ++++++------ src/slic3r/GUI/PublishSettingsDialog.hpp | 14 +++++++++++++- src/slic3r/GUI/RammingChart.cpp | 2 -- src/slic3r/GUI/RecenterDialog.hpp | 6 +++++- src/slic3r/GUI/ReleaseNote.cpp | 16 ++++++++++------ src/slic3r/GUI/SavePresetDialog.hpp | 12 +++++------- src/slic3r/GUI/SceneBenchmark.cpp | 6 ++++++ src/slic3r/GUI/SelectMachine.cpp | 15 ++++++++++++++- src/slic3r/GUI/SelectMachinePop.cpp | 2 -- src/slic3r/GUI/Selection.cpp | 11 ++++++++++- src/slic3r/GUI/SendMultiMachinePage.cpp | 12 ++++++++++++ src/slic3r/GUI/SendSystemInfoDialog.cpp | 5 +++-- src/slic3r/GUI/SkipPartCanvas.hpp | 4 ++++ src/slic3r/GUI/SliceInfoPanel.cpp | 5 ++--- src/slic3r/GUI/SliceInfoPanel.hpp | 14 +++++++++----- src/slic3r/GUI/SpeedDialDialog.hpp | 2 ++ src/slic3r/GUI/StatusPanel.cpp | 1 - src/slic3r/GUI/SurfaceDrag.cpp | 3 +++ src/slic3r/GUI/SyncAmsInfoDialog.cpp | 16 +++++++++++----- src/slic3r/GUI/Tab.cpp | 2 -- src/slic3r/GUI/TabButton.cpp | 1 + src/slic3r/GUI/TabButton.hpp | 3 +++ src/slic3r/GUI/Tabbook.hpp | 6 +++++- src/slic3r/GUI/TerminalDialog.cpp | 2 ++ src/slic3r/GUI/TerminalDialog.hpp | 2 ++ src/slic3r/GUI/TextLines.cpp | 6 +++--- src/slic3r/GUI/TextLines.hpp | 4 ++-- src/slic3r/GUI/TextureProjectorFrame.cpp | 3 ++- src/slic3r/GUI/TextureProjectorFrame.hpp | 3 +++ .../GUI/ThermalPreconditioningDialog.cpp | 4 ++-- .../GUI/ThermalPreconditioningDialog.hpp | 6 ++++++ src/slic3r/GUI/TickCode.hpp | 1 - src/slic3r/GUI/UVEditorCanvas.cpp | 1 - src/slic3r/GUI/UserManager.cpp | 4 ---- src/slic3r/GUI/WebDialog.hpp | 5 +++++ src/slic3r/GUI/WebGuideDialog.cpp | 11 +++++++---- src/slic3r/GUI/WebGuideDialog.hpp | 13 ++++++++++--- src/slic3r/GUI/WebPanel.hpp | 5 +++++ src/slic3r/GUI/WebRtcMediaController.hpp | 6 +++++- src/slic3r/GUI/WebViewDialog.cpp | 2 -- src/slic3r/GUI/Widgets/AMSControl.cpp | 7 +++++-- src/slic3r/GUI/Widgets/AMSItem.cpp | 5 +++-- src/slic3r/GUI/Widgets/AxisCtrlButton.cpp | 1 + src/slic3r/GUI/Widgets/AxisCtrlButton.hpp | 2 ++ src/slic3r/GUI/Widgets/Button.cpp | 2 ++ src/slic3r/GUI/Widgets/CheckList.cpp | 2 +- src/slic3r/GUI/Widgets/ComboBox.cpp | 1 + src/slic3r/GUI/Widgets/DropDown.cpp | 3 +++ src/slic3r/GUI/Widgets/DropDown.hpp | 3 +++ src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp | 2 ++ src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp | 3 +++ src/slic3r/GUI/Widgets/FanControl.cpp | 1 - src/slic3r/GUI/Widgets/FilamentLoad.cpp | 7 +++---- src/slic3r/GUI/Widgets/HyperLink.cpp | 2 ++ src/slic3r/GUI/Widgets/ImageSwitchButton.cpp | 4 ++++ src/slic3r/GUI/Widgets/ImageSwitchButton.hpp | 5 +++-- src/slic3r/GUI/Widgets/LabeledStaticBox.cpp | 1 + src/slic3r/GUI/Widgets/LabeledStaticBox.hpp | 5 +++-- src/slic3r/GUI/Widgets/ProgressBar.cpp | 1 - src/slic3r/GUI/Widgets/ProgressDialog.hpp | 13 +++++++++++-- src/slic3r/GUI/Widgets/RadioBox.hpp | 2 ++ src/slic3r/GUI/Widgets/RadioGroup.cpp | 2 ++ src/slic3r/GUI/Widgets/Scrollbar.hpp | 6 ++++++ src/slic3r/GUI/Widgets/ScrolledWindow.hpp | 7 ++++++- src/slic3r/GUI/Widgets/SideButton.cpp | 2 ++ src/slic3r/GUI/Widgets/SideButton.hpp | 2 ++ src/slic3r/GUI/Widgets/SideMenuPopup.cpp | 1 - src/slic3r/GUI/Widgets/SpinInput.cpp | 1 + src/slic3r/GUI/Widgets/SpinInput.hpp | 4 ++++ src/slic3r/GUI/Widgets/StateHandler.hpp | 2 ++ src/slic3r/GUI/Widgets/StaticBox.cpp | 3 +++ src/slic3r/GUI/Widgets/StaticLine.cpp | 3 +++ src/slic3r/GUI/Widgets/StepCtrl.cpp | 5 +++++ src/slic3r/GUI/Widgets/StepCtrl.hpp | 3 +++ src/slic3r/GUI/Widgets/TabCtrl.cpp | 3 +++ src/slic3r/GUI/Widgets/TempInput.cpp | 1 - src/slic3r/GUI/Widgets/TempInput.hpp | 5 +++++ src/slic3r/GUI/Widgets/TextInput.cpp | 3 ++- src/slic3r/GUI/Widgets/WebView.hpp | 3 +++ src/slic3r/GUI/Widgets/WebViewHostDialog.hpp | 5 +++++ src/slic3r/GUI/WipeTowerDialog.cpp | 9 ++++++--- src/slic3r/GUI/wxExtensions.cpp | 1 - src/slic3r/GUI/wxMediaCtrl3.cpp | 4 ++-- src/slic3r/Utils/3DPrinterOS.hpp | 4 +++- src/slic3r/Utils/AstroBox.hpp | 2 ++ src/slic3r/Utils/BBLCloudServiceAgent.cpp | 2 +- src/slic3r/Utils/BBLPrinterAgent.cpp | 3 ++- src/slic3r/Utils/BBLPrinterAgent.hpp | 3 ++- src/slic3r/Utils/Bonjour.hpp | 3 +++ src/slic3r/Utils/CrealityPrint.cpp | 1 - src/slic3r/Utils/Duet.cpp | 1 - src/slic3r/Utils/Duet.hpp | 1 + src/slic3r/Utils/ESP3D.cpp | 3 --- src/slic3r/Utils/ESP3D.hpp | 1 - src/slic3r/Utils/ElegooLink.hpp | 5 +++-- src/slic3r/Utils/FileTransferUtils.cpp | 2 -- src/slic3r/Utils/FixModelByCgal.cpp | 1 + src/slic3r/Utils/FixModelByCgal.hpp | 3 ++- src/slic3r/Utils/FlashAir.cpp | 1 - src/slic3r/Utils/Flashforge.cpp | 1 - src/slic3r/Utils/Flashforge.hpp | 3 ++- src/slic3r/Utils/MKS.cpp | 1 - src/slic3r/Utils/MKS.hpp | 1 - src/slic3r/Utils/Moonraker.cpp | 1 - src/slic3r/Utils/Moonraker.hpp | 3 ++- src/slic3r/Utils/MoonrakerPrinterAgent.hpp | 3 ++- src/slic3r/Utils/NetworkAgentFactory.cpp | 1 + src/slic3r/Utils/Obico.cpp | 1 - src/slic3r/Utils/Obico.hpp | 3 ++- src/slic3r/Utils/OctoPrint.hpp | 1 + src/slic3r/Utils/OrcaCloudServiceAgent.cpp | 1 + src/slic3r/Utils/OrcaPrinterAgent.cpp | 2 ++ src/slic3r/Utils/OrcaPrinterAgent.hpp | 3 ++- src/slic3r/Utils/PresetUpdater.cpp | 7 +++---- src/slic3r/Utils/RaycastManager.cpp | 3 ++- src/slic3r/Utils/Repetier.hpp | 2 ++ src/slic3r/Utils/UltiMaker.cpp | 1 - src/slic3r/Utils/UndoRedo.cpp | 3 +-- src/slic3r/Utils/WxFontUtils.hpp | 2 ++ .../CustomWidgetsPlugin.cpp | 1 + .../CustomWidgetsPlugin.hpp | 3 +++ .../wxInspectorPlugins/DPIAwarePlugin.hpp | 3 +++ src/slic3r/plugin/CloudPluginService.hpp | 4 +++- src/slic3r/plugin/PluginAuditManager.cpp | 3 +++ src/slic3r/plugin/PluginConfig.hpp | 1 - src/slic3r/plugin/PluginFsUtils.hpp | 1 + src/slic3r/plugin/PluginHooks.cpp | 2 ++ src/slic3r/plugin/PluginLoader.hpp | 3 ++- src/slic3r/plugin/PluginManager.cpp | 3 ++- src/slic3r/plugin/PluginResolver.cpp | 3 ++- src/slic3r/plugin/PythonInterpreter.cpp | 3 +++ src/slic3r/plugin/PythonInterpreter.hpp | 1 - src/slic3r/plugin/PythonPluginBridge.hpp | 6 +++++- src/slic3r/plugin/host/PluginHost.cpp | 1 + src/slic3r/plugin/host/PluginHostGeometry.cpp | 3 +++ src/slic3r/plugin/host/PluginHostMesh.cpp | 2 ++ src/slic3r/plugin/host/PluginHostModel.cpp | 8 ++++++++ src/slic3r/plugin/host/PluginHostSlicing.cpp | 10 +++++++++- src/slic3r/plugin/host/PluginPages.hpp | 3 +++ tests/fff_print/fff_print_tests.cpp | 1 - tests/fff_print/test_extrusion_entity.cpp | 3 ++- tests/fff_print/test_extrusion_processor.cpp | 1 + tests/fff_print/test_flow.cpp | 3 --- tests/fff_print/test_gcode_timing.cpp | 6 ++++-- tests/fff_print/test_gcodewriter.cpp | 1 + tests/fff_print/test_helpers.cpp | 4 ++-- tests/fff_print/test_model.cpp | 2 ++ tests/fff_print/test_print.cpp | 4 +++- tests/fff_print/test_printobject.cpp | 3 +++ tests/fff_print/test_seam_placer.cpp | 4 ++++ tests/fff_print/test_skirt_brim.cpp | 7 ++++++- .../fff_print/test_slicing_pipeline_hook.cpp | 3 +++ tests/fff_print/test_support_material.cpp | 2 ++ tests/fff_print/test_texture_displacement.cpp | 1 + tests/fff_print/test_tree_support.cpp | 2 ++ tests/fff_print/test_trianglemesh.cpp | 5 ++--- tests/fff_print/test_wipe.cpp | 1 + tests/fff_print/test_wipe_tower.cpp | 2 ++ .../filament_group_regression_main.cpp | 1 + tests/libnest2d/libnest2d_tests.cpp | 3 +++ tests/libnest2d/test_geometry.cpp | 3 +++ tests/libnest2d/test_nfp.cpp | 2 ++ tests/libnest2d/test_nfp_placer.cpp | 5 +++++ tests/libslic3r/test_aabbindirect.cpp | 2 +- tests/libslic3r/test_arachne_walls.cpp | 1 + tests/libslic3r/test_arrange.cpp | 1 + tests/libslic3r/test_buildvolume.cpp | 1 + tests/libslic3r/test_caddocument.cpp | 2 ++ tests/libslic3r/test_calib.cpp | 1 + tests/libslic3r/test_clipper_utils.cpp | 2 +- tests/libslic3r/test_config.cpp | 1 + .../libslic3r/test_fill_corner_smoothing.cpp | 1 - tests/libslic3r/test_geometry.cpp | 1 + tests/libslic3r/test_lay_on_face.cpp | 1 + tests/libslic3r/test_marchingsquares.cpp | 3 +-- tests/libslic3r/test_meshboolean.cpp | 1 - tests/libslic3r/test_model.cpp | 1 + .../test_multimaterial_segmentation.cpp | 2 +- tests/libslic3r/test_optimizers.cpp | 2 -- tests/libslic3r/test_ordering_strategies.cpp | 1 + tests/libslic3r/test_polygon.cpp | 2 ++ tests/libslic3r/test_precise_seam_3mf.cpp | 1 + tests/libslic3r/test_sketchconstraints.cpp | 1 + tests/libslic3r/test_sketchedit.cpp | 1 + .../test_toolordering_nozzle_group.cpp | 1 + tests/libslic3r/test_wipe_path.cpp | 1 + tests/libslic3r/test_wipe_tower.cpp | 1 + tests/libslic3r/test_wipe_tower_estimate.cpp | 1 + tests/sla_print/sla_print_tests.cpp | 3 ++- tests/sla_print/sla_print_tests_main.cpp | 1 - tests/sla_print/sla_raycast_tests.cpp | 3 --- tests/sla_print/sla_supptgen_tests.cpp | 1 - tests/sla_print/sla_test_utils.cpp | 1 + tests/sla_print/sla_test_utils.hpp | 17 ++++++----------- tests/slic3rutils/test_dev_mapping.cpp | 2 ++ tests/slic3rutils/test_network_versions.cpp | 1 - .../test_plugin_capability_config.cpp | 2 +- .../test_plugin_cloud_metadata.cpp | 1 - tests/slic3rutils/test_plugin_config.cpp | 2 -- tests/slic3rutils/test_plugin_host_api.cpp | 6 +++++- tests/slic3rutils/test_plugin_install.cpp | 1 - tests/slic3rutils/test_plugin_lifecycle.cpp | 1 - .../slic3rutils/test_plugin_printer_agent.cpp | 1 + .../slic3rutils/test_precise_seam_plugin.cpp | 2 ++ tests/slic3rutils/test_printer_agent.cpp | 7 ++++--- tests/slic3rutils/test_printhost.cpp | 1 + .../test_slicing_pipeline_bindings.cpp | 4 ++++ .../test_slicing_pipeline_config.cpp | 1 - .../slic3rutils/test_web_media_controller.cpp | 5 +++++ 623 files changed, 1512 insertions(+), 753 deletions(-) diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp index 0e6fda1a12..62ccfb7675 100644 --- a/src/OrcaSlicer.cpp +++ b/src/OrcaSlicer.cpp @@ -141,6 +141,18 @@ using namespace nlohmann; #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GuiColor.hpp" #include +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/BuildVolume.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Exception.hpp" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/GCode/ToolOrdering.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/GUI_ObjectList.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" namespace fs = boost::filesystem; diff --git a/src/OrcaSlicer.hpp b/src/OrcaSlicer.hpp index 6d18e16fce..48609f112e 100644 --- a/src/OrcaSlicer.hpp +++ b/src/OrcaSlicer.hpp @@ -5,7 +5,6 @@ #include "libslic3r/BoundingBox.hpp" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Format/bbs_3mf.hpp" -#include "libslic3r/GCode/ThumbnailData.hpp" #include #include #include @@ -14,6 +13,10 @@ #include "libslic3r/Model.hpp" #include "libslic3r/Format/AssembleList.hpp" +namespace Slic3r { class Preset; } +namespace Slic3r { struct PlateBBoxData; } +namespace Slic3r { struct ThumbnailData; } + namespace Slic3r { namespace IO { diff --git a/src/dev-utils/OrcaSlicer_profile_validator.cpp b/src/dev-utils/OrcaSlicer_profile_validator.cpp index 140716c896..687292b8c7 100644 --- a/src/dev-utils/OrcaSlicer_profile_validator.cpp +++ b/src/dev-utils/OrcaSlicer_profile_validator.cpp @@ -57,6 +57,8 @@ #include #include #include +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Format/STEP.hpp" namespace fs = boost::filesystem; diff --git a/src/dev-utils/profile_include_dump.cpp b/src/dev-utils/profile_include_dump.cpp index 6561027f70..5b1720d874 100644 --- a/src/dev-utils/profile_include_dump.cpp +++ b/src/dev-utils/profile_include_dump.cpp @@ -26,6 +26,7 @@ #include #include #include +#include "libslic3r/PrintConfig.hpp" using namespace Slic3r; namespace fs = boost::filesystem; diff --git a/src/libslic3r/Algorithm/RegionExpansion.cpp b/src/libslic3r/Algorithm/RegionExpansion.cpp index a4558a3939..9eabfd2cf4 100644 --- a/src/libslic3r/Algorithm/RegionExpansion.cpp +++ b/src/libslic3r/Algorithm/RegionExpansion.cpp @@ -20,6 +20,7 @@ #include #include #include +#include "libslic3r/BoundingBox.hpp" namespace Slic3r { namespace Algorithm { diff --git a/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp b/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp index 82ca92e090..3248116169 100644 --- a/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp +++ b/src/libslic3r/Arachne/SkeletalTrapezoidation.cpp @@ -28,6 +28,8 @@ #include "libslic3r/Arachne/SkeletalTrapezoidationJoint.hpp" #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp" #include "libslic3r/Arachne/utils/ExtrusionLine.hpp" +#include "libslic3r/Arachne/SkeletalTrapezoidationGraph.hpp" +#include "libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp" #ifndef NDEBUG #include "libslic3r/EdgeGrid.hpp" diff --git a/src/libslic3r/Arachne/SkeletalTrapezoidation.hpp b/src/libslic3r/Arachne/SkeletalTrapezoidation.hpp index d87cd74728..9c956da879 100644 --- a/src/libslic3r/Arachne/SkeletalTrapezoidation.hpp +++ b/src/libslic3r/Arachne/SkeletalTrapezoidation.hpp @@ -11,7 +11,6 @@ #include #include -#include "utils/HalfEdgeGraph.hpp" #include "utils/PolygonsSegmentIndex.hpp" #include "utils/ExtrusionJunction.hpp" #include "utils/ExtrusionLine.hpp" diff --git a/src/libslic3r/Arachne/WallToolPaths.hpp b/src/libslic3r/Arachne/WallToolPaths.hpp index cfec7284eb..cb88b48754 100644 --- a/src/libslic3r/Arachne/WallToolPaths.hpp +++ b/src/libslic3r/Arachne/WallToolPaths.hpp @@ -11,7 +11,6 @@ #include #include -#include "BeadingStrategy/BeadingStrategyFactory.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/Point.hpp" #include "utils/ExtrusionLine.hpp" diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp index c1c29c50e9..749eb67cb4 100644 --- a/src/libslic3r/Arachne/utils/ExtrusionLine.cpp +++ b/src/libslic3r/Arachne/utils/ExtrusionLine.cpp @@ -14,7 +14,6 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/Point.hpp" #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp" -#include "libslic3r/BoundingBox.hpp" #include "libslic3r/ExtrusionEntity.hpp" #include "libslic3r/Line.hpp" #include "libslic3r/Polygon.hpp" diff --git a/src/libslic3r/Arachne/utils/ExtrusionLine.hpp b/src/libslic3r/Arachne/utils/ExtrusionLine.hpp index 421f73e0e8..461a38178b 100644 --- a/src/libslic3r/Arachne/utils/ExtrusionLine.hpp +++ b/src/libslic3r/Arachne/utils/ExtrusionLine.hpp @@ -19,9 +19,7 @@ #include "ExtrusionJunction.hpp" #include "../../Polyline.hpp" #include "../../Polygon.hpp" -#include "../../BoundingBox.hpp" #include "../../ExtrusionEntity.hpp" -#include "../../Flow.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/Point.hpp" diff --git a/src/libslic3r/Arachne/utils/PolylineStitcher.hpp b/src/libslic3r/Arachne/utils/PolylineStitcher.hpp index 7f547f4f23..a85416f9d9 100644 --- a/src/libslic3r/Arachne/utils/PolylineStitcher.hpp +++ b/src/libslic3r/Arachne/utils/PolylineStitcher.hpp @@ -15,7 +15,6 @@ #include "SparsePointGrid.hpp" #include "PolygonsPointIndex.hpp" -#include "../../Polygon.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" diff --git a/src/libslic3r/Arrange.cpp b/src/libslic3r/Arrange.cpp index 8a2cace499..520f02f5f2 100644 --- a/src/libslic3r/Arrange.cpp +++ b/src/libslic3r/Arrange.cpp @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -45,6 +44,7 @@ #include #include #include +#include "MultiMaterialSegmentation.hpp" namespace libnest2d { #if !defined(_MSC_VER) && defined(__SIZEOF_INT128__) && !defined(__APPLE__) diff --git a/src/libslic3r/Brim.cpp b/src/libslic3r/Brim.cpp index f48723cfef..d5707ca0de 100644 --- a/src/libslic3r/Brim.cpp +++ b/src/libslic3r/Brim.cpp @@ -32,6 +32,11 @@ #include #include #include +#include "Config.hpp" +#include "ExtrusionEntityCollection.hpp" +#include "MultiMaterialSegmentation.hpp" +#include "SurfaceCollection.hpp" +#include "TriangleMesh.hpp" #ifndef NDEBUG // #define BRIM_DEBUG_TO_SVG diff --git a/src/libslic3r/CAD/CadDocument.cpp b/src/libslic3r/CAD/CadDocument.cpp index b077d9cdd6..447ca138b7 100644 --- a/src/libslic3r/CAD/CadDocument.cpp +++ b/src/libslic3r/CAD/CadDocument.cpp @@ -90,6 +90,10 @@ #include #include #include +#include "libslic3r/Color.hpp" +#include "libslic3r/TriangleMesh.hpp" + +class Geom2d_TrimmedCurve; namespace Slic3r { diff --git a/src/libslic3r/CAD/SketchEngine.cpp b/src/libslic3r/CAD/SketchEngine.cpp index 44ee45d8a4..045145cc85 100644 --- a/src/libslic3r/CAD/SketchEngine.cpp +++ b/src/libslic3r/CAD/SketchEngine.cpp @@ -62,6 +62,8 @@ #include #include +class Geom_TrimmedCurve; + namespace Slic3r { // Single source of truth for the weld tolerance the viewport and the kernel share. diff --git a/src/libslic3r/CAD/SketchSolver.cpp b/src/libslic3r/CAD/SketchSolver.cpp index 03033d061e..aac34722cd 100644 --- a/src/libslic3r/CAD/SketchSolver.cpp +++ b/src/libslic3r/CAD/SketchSolver.cpp @@ -11,6 +11,7 @@ #include #include #include +#include "libslic3r/Point.hpp" namespace Slic3r { diff --git a/src/libslic3r/CAD/SketchSolver.hpp b/src/libslic3r/CAD/SketchSolver.hpp index ada4474c7a..1898643568 100644 --- a/src/libslic3r/CAD/SketchSolver.hpp +++ b/src/libslic3r/CAD/SketchSolver.hpp @@ -6,9 +6,12 @@ // hand-rolled SketchConstraints: full constraint set, real DoF counting, and // over-constrained (bad-constraint) detection. Solves on a fixed 2D XY workplane. -#include "libslic3r/CAD/SketchEngine.hpp" #include +namespace Slic3r { enum class SketchPointRole; } +namespace Slic3r { struct SketchEntity; } +namespace Slic3r { struct SketchEntityConstraintDef; } + namespace Slic3r { struct SketchSolveResult { diff --git a/src/libslic3r/Circle.cpp b/src/libslic3r/Circle.cpp index 8d09ba8f89..c94b612901 100644 --- a/src/libslic3r/Circle.cpp +++ b/src/libslic3r/Circle.cpp @@ -5,10 +5,8 @@ #include #include #include -#include "Geometry.hpp" #include "Point.hpp" #include "Line.hpp" -#include "Polygon.hpp" #include "libslic3r.h" diff --git a/src/libslic3r/Circle.hpp b/src/libslic3r/Circle.hpp index 388c7488ea..662677a316 100644 --- a/src/libslic3r/Circle.hpp +++ b/src/libslic3r/Circle.hpp @@ -2,10 +2,11 @@ #define slic3r_Circle_hpp_ #include "Point.hpp" -#include "Line.hpp" #include "libslic3r.h" #include +namespace Slic3r { class Line; } + namespace Slic3r { constexpr double ZERO_TOLERANCE = 0.000005; diff --git a/src/libslic3r/ClipperUtils.cpp b/src/libslic3r/ClipperUtils.cpp index d80936515e..8e9decf37a 100644 --- a/src/libslic3r/ClipperUtils.cpp +++ b/src/libslic3r/ClipperUtils.cpp @@ -12,7 +12,6 @@ #include "ClipperUtils.hpp" #include "BoundingBox.hpp" #include "ExPolygon.hpp" -#include "Geometry.hpp" #include "Point.hpp" #include "Polygon.hpp" #include "Polyline.hpp" @@ -24,6 +23,7 @@ #include #include #include +#include "ExtrusionEntity.hpp" // #define CLIPPER_UTILS_DEBUG diff --git a/src/libslic3r/ClipperZUtils.cpp b/src/libslic3r/ClipperZUtils.cpp index a07f40dc4a..3ae786d1ee 100644 --- a/src/libslic3r/ClipperZUtils.cpp +++ b/src/libslic3r/ClipperZUtils.cpp @@ -3,6 +3,7 @@ #include #include +#include "Point.hpp" namespace Slic3r { namespace ClipperZUtils { diff --git a/src/libslic3r/ClipperZUtils.hpp b/src/libslic3r/ClipperZUtils.hpp index 781357caa5..3a6588b662 100644 --- a/src/libslic3r/ClipperZUtils.hpp +++ b/src/libslic3r/ClipperZUtils.hpp @@ -13,6 +13,7 @@ #include #include #include +#include "Polygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/ContourZ.cpp b/src/libslic3r/ContourZ.cpp index 8751bcca58..578b37c636 100644 --- a/src/libslic3r/ContourZ.cpp +++ b/src/libslic3r/ContourZ.cpp @@ -14,6 +14,9 @@ #include #include #include +#include "Config.hpp" +#include "Polyline.hpp" +#include "PrintConfig.hpp" namespace Slic3r { diff --git a/src/libslic3r/CustomGCode.cpp b/src/libslic3r/CustomGCode.cpp index a78bc2a111..3e4e553b70 100644 --- a/src/libslic3r/CustomGCode.cpp +++ b/src/libslic3r/CustomGCode.cpp @@ -1,7 +1,4 @@ #include "CustomGCode.hpp" -#include "Config.hpp" -#include "GCode.hpp" -#include "GCodeWriter.hpp" #include #include #include diff --git a/src/libslic3r/CutSurface.hpp b/src/libslic3r/CutSurface.hpp index 33b0d88697..1a5dc2d678 100644 --- a/src/libslic3r/CutSurface.hpp +++ b/src/libslic3r/CutSurface.hpp @@ -6,7 +6,9 @@ #include #include // indexed_triangle_set #include "ExPolygon.hpp" -#include "Emboss.hpp" // IProjection + +namespace Slic3r::Emboss { class IProject3d; } +namespace Slic3r::Emboss { class IProjection; } namespace Slic3r{ diff --git a/src/libslic3r/CutUtils.cpp b/src/libslic3r/CutUtils.cpp index e5cb3cc6f1..cd897ab7b4 100644 --- a/src/libslic3r/CutUtils.cpp +++ b/src/libslic3r/CutUtils.cpp @@ -19,6 +19,7 @@ #include #include #include +#include "BoundingBox.hpp" namespace Slic3r { diff --git a/src/libslic3r/ElephantFootCompensation.cpp b/src/libslic3r/ElephantFootCompensation.cpp index 40b856ee4b..166ce2709c 100644 --- a/src/libslic3r/ElephantFootCompensation.cpp +++ b/src/libslic3r/ElephantFootCompensation.cpp @@ -8,7 +8,6 @@ #include "ElephantFootCompensation.hpp" #include "Flow.hpp" #include "Geometry.hpp" -#include "SVG.hpp" #include "Utils.hpp" #include @@ -19,6 +18,7 @@ #include #include #include +#include "ExtrusionEntity.hpp" // #define CONTOUR_DISTANCE_DEBUG_SVG diff --git a/src/libslic3r/ElephantFootCompensation.hpp b/src/libslic3r/ElephantFootCompensation.hpp index 596a3e9588..4315996c5a 100644 --- a/src/libslic3r/ElephantFootCompensation.hpp +++ b/src/libslic3r/ElephantFootCompensation.hpp @@ -1,7 +1,6 @@ #ifndef slic3r_ElephantFootCompensation_hpp_ #define slic3r_ElephantFootCompensation_hpp_ -#include "libslic3r.h" #include "ExPolygon.hpp" #include diff --git a/src/libslic3r/ExPolygon.cpp b/src/libslic3r/ExPolygon.cpp index f34b07b7cb..133bb8d279 100644 --- a/src/libslic3r/ExPolygon.cpp +++ b/src/libslic3r/ExPolygon.cpp @@ -1,6 +1,5 @@ #include "BoundingBox.hpp" #include "ExPolygon.hpp" -#include "Exception.hpp" #include "Geometry/MedialAxis.hpp" #include "Point.hpp" #include "MultiPoint.hpp" @@ -8,7 +7,6 @@ #include "Line.hpp" #include "ClipperUtils.hpp" #include "Polyline.hpp" -#include "SVG.hpp" #include "libslic3r.h" #include #include diff --git a/src/libslic3r/ExPolygonsIndex.cpp b/src/libslic3r/ExPolygonsIndex.cpp index 296d43a198..166f780d9b 100644 --- a/src/libslic3r/ExPolygonsIndex.cpp +++ b/src/libslic3r/ExPolygonsIndex.cpp @@ -5,6 +5,7 @@ #include #include #include +#include "Polygon.hpp" using namespace Slic3r; // IMPROVE: use one dimensional vector for polygons offset with searching by std::lower_bound diff --git a/src/libslic3r/Extruder.cpp b/src/libslic3r/Extruder.cpp index bffdf6771c..7d37cfb88b 100644 --- a/src/libslic3r/Extruder.cpp +++ b/src/libslic3r/Extruder.cpp @@ -6,6 +6,7 @@ #include #include #include +#include "Config.hpp" namespace Slic3r { diff --git a/src/libslic3r/Extruder.hpp b/src/libslic3r/Extruder.hpp index 94e083c86b..4676173255 100644 --- a/src/libslic3r/Extruder.hpp +++ b/src/libslic3r/Extruder.hpp @@ -2,7 +2,6 @@ #define slic3r_Extruder_hpp_ #include "libslic3r.h" -#include "Point.hpp" #include namespace Slic3r { diff --git a/src/libslic3r/ExtrusionEntity.cpp b/src/libslic3r/ExtrusionEntity.cpp index a3590814f7..2e024c9b8a 100644 --- a/src/libslic3r/ExtrusionEntity.cpp +++ b/src/libslic3r/ExtrusionEntity.cpp @@ -2,7 +2,6 @@ #include "ExtrusionEntityCollection.hpp" #include "ExPolygon.hpp" #include "ClipperUtils.hpp" -#include "Extruder.hpp" #include "Flow.hpp" #include #include @@ -21,6 +20,7 @@ #include #include "Utils.hpp" #include "libslic3r.h" +#include "ArcFitter.hpp" #define L(s) (s) diff --git a/src/libslic3r/ExtrusionSimulator.cpp b/src/libslic3r/ExtrusionSimulator.cpp index bb9179a7e2..e7057b9818 100644 --- a/src/libslic3r/ExtrusionSimulator.cpp +++ b/src/libslic3r/ExtrusionSimulator.cpp @@ -25,6 +25,7 @@ #include "ExtrusionEntity.hpp" #include "libslic3r.h" #include "ExtrusionSimulator.hpp" +#include "Polyline.hpp" #ifndef M_PI #define M_PI 3.1415926535897932384626433832795 diff --git a/src/libslic3r/ExtrusionSimulator.hpp b/src/libslic3r/ExtrusionSimulator.hpp index 33629d79e6..2cc257b595 100644 --- a/src/libslic3r/ExtrusionSimulator.hpp +++ b/src/libslic3r/ExtrusionSimulator.hpp @@ -2,7 +2,6 @@ #define slic3r_ExtrusionSimulator_hpp_ #include "Point.hpp" -#include "libslic3r.h" #include "ExtrusionEntity.hpp" #include "BoundingBox.hpp" diff --git a/src/libslic3r/FaceDetector.cpp b/src/libslic3r/FaceDetector.cpp index a631822d9e..d6a5994b9f 100644 --- a/src/libslic3r/FaceDetector.cpp +++ b/src/libslic3r/FaceDetector.cpp @@ -2,7 +2,6 @@ #include "BoundingBox.hpp" #include "TriangleMesh.hpp" #include "SLA/IndexedMesh.hpp" -#include "Model.hpp" #include #include #include diff --git a/src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp b/src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp index ec5069a49c..4c28dbf14c 100644 --- a/src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp +++ b/src/libslic3r/Feature/FuzzySkin/FuzzySkin.hpp @@ -5,10 +5,12 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/Polygon.hpp" #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp" -#include "libslic3r/Arachne/utils/ExtrusionLine.hpp" -#include "libslic3r/PerimeterGenerator.hpp" #include +namespace Slic3r { class PerimeterGenerator; } +namespace Slic3r { struct FuzzySkinConfig; } +namespace Slic3r::Arachne { struct ExtrusionLine; } + namespace Slic3r::Feature::FuzzySkin { void fuzzy_polyline(Points& poly, bool closed, coordf_t slice_z, const FuzzySkinConfig& cfg); diff --git a/src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp b/src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp index 9e2fb7fa47..6d1a06681f 100644 --- a/src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp +++ b/src/libslic3r/Feature/Interlocking/InterlockingGenerator.cpp @@ -18,6 +18,10 @@ #include #include #include +#include "libslic3r/Config.hpp" +#include "libslic3r/Print.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/SurfaceCollection.hpp" namespace std { template<> struct hash diff --git a/src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp b/src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp index b06c8a10c8..f29234ebdc 100644 --- a/src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp +++ b/src/libslic3r/Feature/Interlocking/InterlockingGenerator.hpp @@ -6,14 +6,15 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/Point.hpp" -#include "libslic3r/ExPolygon.hpp" -#include "libslic3r/Print.hpp" #include "VoxelUtils.hpp" #include #include #include #include #include +#include "libslic3r/MultiMaterialSegmentation.hpp" + +namespace Slic3r { class PrintObject; } namespace Slic3r { diff --git a/src/libslic3r/Feature/Interlocking/VoxelUtils.cpp b/src/libslic3r/Feature/Interlocking/VoxelUtils.cpp index 6e33ddaca7..31c3bd0eb2 100644 --- a/src/libslic3r/Feature/Interlocking/VoxelUtils.cpp +++ b/src/libslic3r/Feature/Interlocking/VoxelUtils.cpp @@ -10,13 +10,13 @@ #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Polyline.hpp" #include "libslic3r/Geometry.hpp" -#include "libslic3r/Fill/FillRectilinear.hpp" #include "libslic3r/Surface.hpp" #include #include #include #include #include +#include "libslic3r/BoundingBox.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index 505081ab79..254dd109f8 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -41,6 +41,13 @@ #include "libslic3r/Polygon.hpp" #include "libslic3r/Polyline.hpp" #include "libslic3r.h" +#include "libslic3r/ExtrusionEntityCollection.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "libslic3r/Slicing.hpp" +#include "libslic3r/SurfaceCollection.hpp" + +namespace Slic3r::FillAdaptive { struct Octree; } +namespace Slic3r::FillLightning { class Generator; } namespace Slic3r { diff --git a/src/libslic3r/Fill/Fill3DHoneycomb.cpp b/src/libslic3r/Fill/Fill3DHoneycomb.cpp index 5a390fa517..15e3ee6d21 100644 --- a/src/libslic3r/Fill/Fill3DHoneycomb.cpp +++ b/src/libslic3r/Fill/Fill3DHoneycomb.cpp @@ -16,6 +16,7 @@ #include "libslic3r/Polyline.hpp" #include #include "Fill3DHoneycomb.hpp" +#include "libslic3r/Polygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/Fill3DHoneycomb.hpp b/src/libslic3r/Fill/Fill3DHoneycomb.hpp index 2ad6f79a7c..a31608310d 100644 --- a/src/libslic3r/Fill/Fill3DHoneycomb.hpp +++ b/src/libslic3r/Fill/Fill3DHoneycomb.hpp @@ -11,6 +11,8 @@ #include "libslic3r/Point.hpp" #include "libslic3r/Polyline.hpp" +namespace Slic3r { class Point; } + namespace Slic3r { class Fill3DHoneycomb : public Fill diff --git a/src/libslic3r/Fill/FillAdaptive.cpp b/src/libslic3r/Fill/FillAdaptive.cpp index 927e2c86a3..210394ea51 100644 --- a/src/libslic3r/Fill/FillAdaptive.cpp +++ b/src/libslic3r/Fill/FillAdaptive.cpp @@ -49,6 +49,9 @@ #include #include #include +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/SurfaceCollection.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp index aabd2b3209..95b7dc28db 100644 --- a/src/libslic3r/Fill/FillBase.cpp +++ b/src/libslic3r/Fill/FillBase.cpp @@ -48,6 +48,7 @@ #include "libslic3r/Line.hpp" #include "libslic3r/Polygon.hpp" #include "libslic3r/Utils.hpp" +#include "libslic3r/Flow.hpp" // #define INFILL_DEBUG_OUTPUT namespace Slic3r { diff --git a/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp index 0ccce102ad..0b775acf58 100644 --- a/src/libslic3r/Fill/FillBase.hpp +++ b/src/libslic3r/Fill/FillBase.hpp @@ -24,10 +24,11 @@ #include "../PrintConfig.hpp" #include "../Flow.hpp" #include "../ExtrusionEntity.hpp" -#include "../ExtrusionEntityCollection.hpp" -#include "../ShortestPath.hpp" #include "libslic3r/Polyline.hpp" #include "libslic3r/Polygon.hpp" +#include "libslic3r/Point.hpp" + +namespace Slic3r { class ExtrusionEntityCollection; } namespace Slic3r { diff --git a/src/libslic3r/Fill/FillConcentric.cpp b/src/libslic3r/Fill/FillConcentric.cpp index 6a70200b34..f112d6243a 100644 --- a/src/libslic3r/Fill/FillConcentric.cpp +++ b/src/libslic3r/Fill/FillConcentric.cpp @@ -20,6 +20,7 @@ #include #include #include +#include "libslic3r/ExtrusionEntity.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/FillConcentric.hpp b/src/libslic3r/Fill/FillConcentric.hpp index 43273131db..3d79c4f77d 100644 --- a/src/libslic3r/Fill/FillConcentric.hpp +++ b/src/libslic3r/Fill/FillConcentric.hpp @@ -4,9 +4,10 @@ #include "libslic3r/ExPolygon.hpp" #include "FillBase.hpp" #include -#include "libslic3r/Point.hpp" #include "libslic3r/Polyline.hpp" +namespace Slic3r { class Point; } + namespace Slic3r { class FillConcentric : public Fill diff --git a/src/libslic3r/Fill/FillConcentricInternal.cpp b/src/libslic3r/Fill/FillConcentricInternal.cpp index 49b21935f3..e0313486a2 100644 --- a/src/libslic3r/Fill/FillConcentricInternal.cpp +++ b/src/libslic3r/Fill/FillConcentricInternal.cpp @@ -19,6 +19,11 @@ #include #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Flow.hpp" +#include "libslic3r/PrintConfig.hpp" + +namespace Slic3r { class Surface; } namespace Slic3r { diff --git a/src/libslic3r/Fill/FillConcentricInternal.hpp b/src/libslic3r/Fill/FillConcentricInternal.hpp index f78e9e1cb1..0b9b05515b 100644 --- a/src/libslic3r/Fill/FillConcentricInternal.hpp +++ b/src/libslic3r/Fill/FillConcentricInternal.hpp @@ -4,6 +4,8 @@ #include "libslic3r/ExtrusionEntity.hpp" #include "FillBase.hpp" +namespace Slic3r { class Surface; } + namespace Slic3r { class FillConcentricInternal : public Fill diff --git a/src/libslic3r/Fill/FillCornerSmoothing.hpp b/src/libslic3r/Fill/FillCornerSmoothing.hpp index b59cf26237..b6acf20049 100644 --- a/src/libslic3r/Fill/FillCornerSmoothing.hpp +++ b/src/libslic3r/Fill/FillCornerSmoothing.hpp @@ -7,7 +7,6 @@ #include #include -#include "../libslic3r.h" #include "../Point.hpp" #include "../Polygon.hpp" #include "../Polyline.hpp" diff --git a/src/libslic3r/Fill/FillCrossHatch.cpp b/src/libslic3r/Fill/FillCrossHatch.cpp index c70a8a5320..79ca4743d9 100644 --- a/src/libslic3r/Fill/FillCrossHatch.cpp +++ b/src/libslic3r/Fill/FillCrossHatch.cpp @@ -1,6 +1,4 @@ #include "../ClipperUtils.hpp" -#include "../ShortestPath.hpp" -#include "../Surface.hpp" #include #include #include @@ -13,6 +11,7 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/Polyline.hpp" #include "FillCrossHatch.hpp" +#include "libslic3r/Polygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/FillCrossHatch.hpp b/src/libslic3r/Fill/FillCrossHatch.hpp index 0fdc16644a..4b18443aae 100644 --- a/src/libslic3r/Fill/FillCrossHatch.hpp +++ b/src/libslic3r/Fill/FillCrossHatch.hpp @@ -4,13 +4,13 @@ #include #include -#include "../libslic3r.h" #include "libslic3r/ExPolygon.hpp" #include "FillBase.hpp" -#include "libslic3r/Point.hpp" #include "libslic3r/Polyline.hpp" +namespace Slic3r { class Point; } + namespace Slic3r { class FillCrossHatch : public Fill diff --git a/src/libslic3r/Fill/FillGyroid.cpp b/src/libslic3r/Fill/FillGyroid.cpp index de748d4893..3b2803738c 100644 --- a/src/libslic3r/Fill/FillGyroid.cpp +++ b/src/libslic3r/Fill/FillGyroid.cpp @@ -1,7 +1,5 @@ #include "../ClipperUtils.hpp" #include "../MarchingSquares.hpp" -#include "../ShortestPath.hpp" -#include "../Surface.hpp" #include #include #include @@ -18,6 +16,7 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/Polyline.hpp" #include "FillGyroid.hpp" +#include "libslic3r/Polygon.hpp" // --------------------------------------------------------------------------- // Marching-squares scalar field for the optimized gyroid branch. diff --git a/src/libslic3r/Fill/FillGyroid.hpp b/src/libslic3r/Fill/FillGyroid.hpp index 2599662403..ad032d5904 100644 --- a/src/libslic3r/Fill/FillGyroid.hpp +++ b/src/libslic3r/Fill/FillGyroid.hpp @@ -1,14 +1,14 @@ #ifndef slic3r_FillGyroid_hpp_ #define slic3r_FillGyroid_hpp_ -#include "../libslic3r.h" #include "libslic3r/ExPolygon.hpp" #include "FillBase.hpp" #include -#include "libslic3r/Point.hpp" #include "libslic3r/Polyline.hpp" +namespace Slic3r { class Point; } + namespace Slic3r { class FillGyroid : public Fill diff --git a/src/libslic3r/Fill/FillHoneycomb.cpp b/src/libslic3r/Fill/FillHoneycomb.cpp index 594ff3fbba..c9337074f7 100644 --- a/src/libslic3r/Fill/FillHoneycomb.cpp +++ b/src/libslic3r/Fill/FillHoneycomb.cpp @@ -1,6 +1,4 @@ #include "../ClipperUtils.hpp" -#include "../ShortestPath.hpp" -#include "../Surface.hpp" #include "libslic3r/Fill/FillBase.hpp" #include "libslic3r/ExPolygon.hpp" @@ -14,6 +12,7 @@ #include #include #include "FillHoneycomb.hpp" +#include "libslic3r/Polygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/FillLightning.cpp b/src/libslic3r/Fill/FillLightning.cpp index 9f6200a88e..a81ef31586 100644 --- a/src/libslic3r/Fill/FillLightning.cpp +++ b/src/libslic3r/Fill/FillLightning.cpp @@ -1,6 +1,5 @@ #include "../ClipperUtils.hpp" #include "../Print.hpp" -#include "../ShortestPath.hpp" #include "libslic3r/ExPolygon.hpp" #include "libslic3r/Fill/Lightning/Layer.hpp" #include "FillBase.hpp" diff --git a/src/libslic3r/Fill/FillLightning.hpp b/src/libslic3r/Fill/FillLightning.hpp index 8ad15b5c2a..e40f591616 100644 --- a/src/libslic3r/Fill/FillLightning.hpp +++ b/src/libslic3r/Fill/FillLightning.hpp @@ -6,9 +6,10 @@ #include #include #include -#include "libslic3r/Point.hpp" #include "libslic3r/Polyline.hpp" +namespace Slic3r { class Point; } + namespace Slic3r { class PrintObject; diff --git a/src/libslic3r/Fill/FillLine.cpp b/src/libslic3r/Fill/FillLine.cpp index f46c102131..1631b78e53 100644 --- a/src/libslic3r/Fill/FillLine.cpp +++ b/src/libslic3r/Fill/FillLine.cpp @@ -1,7 +1,6 @@ #include "../ClipperUtils.hpp" #include "../ExPolygon.hpp" #include "../ShortestPath.hpp" -#include "../Surface.hpp" #include "libslic3r/Fill/FillBase.hpp" #include #include "libslic3r/Point.hpp" @@ -15,6 +14,8 @@ #include #include "FillLine.hpp" +#include "libslic3r/ExtrusionEntity.hpp" +#include "libslic3r/Polygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/FillPlanePath.cpp b/src/libslic3r/Fill/FillPlanePath.cpp index 2ee2b1ef3a..4e967affa4 100644 --- a/src/libslic3r/Fill/FillPlanePath.cpp +++ b/src/libslic3r/Fill/FillPlanePath.cpp @@ -1,6 +1,5 @@ #include "../ClipperUtils.hpp" #include "../ShortestPath.hpp" -#include "../Surface.hpp" #include "libslic3r/BoundingBox.hpp" #include "libslic3r/Fill/FillBase.hpp" @@ -18,6 +17,7 @@ #include #include #include "FillPlanePath.hpp" +#include "libslic3r/Config.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp index 5951e154e9..85de82e27c 100644 --- a/src/libslic3r/Fill/FillRectilinear.cpp +++ b/src/libslic3r/Fill/FillRectilinear.cpp @@ -24,7 +24,6 @@ #include "../Geometry.hpp" #include "../Surface.hpp" #include "../ShortestPath.hpp" -#include "../VariableWidth.hpp" #include "libslic3r/BoundingBox.hpp" #include "libslic3r/Fill/FillBase.hpp" diff --git a/src/libslic3r/Fill/FillRectilinear.hpp b/src/libslic3r/Fill/FillRectilinear.hpp index a4453ad2d0..59bb56a5c8 100644 --- a/src/libslic3r/Fill/FillRectilinear.hpp +++ b/src/libslic3r/Fill/FillRectilinear.hpp @@ -12,10 +12,11 @@ #include #include #include -#include "libslic3r/Flow.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/Polygon.hpp" +namespace Slic3r { class Flow; } + namespace Slic3r { class PrintRegionConfig; diff --git a/src/libslic3r/Fill/FillSpiralInset.cpp b/src/libslic3r/Fill/FillSpiralInset.cpp index 8f663df340..8f0c75ff83 100644 --- a/src/libslic3r/Fill/FillSpiralInset.cpp +++ b/src/libslic3r/Fill/FillSpiralInset.cpp @@ -1,7 +1,5 @@ #include "../ClipperUtils.hpp" #include "../ExPolygon.hpp" -#include "../Surface.hpp" -#include "../VariableWidth.hpp" #include "Arachne/WallToolPaths.hpp" #include "libslic3r/Polygon.hpp" #include "libslic3r/Point.hpp" @@ -22,6 +20,9 @@ #include #include #include +#include "libslic3r/Arachne/utils/ExtrusionJunction.hpp" +#include "libslic3r/ExtrusionEntity.hpp" +#include "libslic3r/Line.hpp" namespace Slic3r { diff --git a/src/libslic3r/Fill/FillSpiralInset.hpp b/src/libslic3r/Fill/FillSpiralInset.hpp index 8b95657b4b..269002ce3e 100644 --- a/src/libslic3r/Fill/FillSpiralInset.hpp +++ b/src/libslic3r/Fill/FillSpiralInset.hpp @@ -4,9 +4,10 @@ #include "libslic3r/ExPolygon.hpp" #include "FillBase.hpp" #include -#include "libslic3r/Point.hpp" #include "libslic3r/Polyline.hpp" +namespace Slic3r { class Point; } + namespace Slic3r { class FillSpiralInset : public Fill diff --git a/src/libslic3r/Fill/FillTpmsD.hpp b/src/libslic3r/Fill/FillTpmsD.hpp index 5e8accc19c..8dfa12196a 100644 --- a/src/libslic3r/Fill/FillTpmsD.hpp +++ b/src/libslic3r/Fill/FillTpmsD.hpp @@ -3,7 +3,6 @@ #include -#include "libslic3r/libslic3r.h" #include "FillBase.hpp" #include "libslic3r/ExPolygon.hpp" #include "libslic3r/Polyline.hpp" diff --git a/src/libslic3r/Fill/FillTpmsFK.cpp b/src/libslic3r/Fill/FillTpmsFK.cpp index a48a63f3d0..61dd220e64 100644 --- a/src/libslic3r/Fill/FillTpmsFK.cpp +++ b/src/libslic3r/Fill/FillTpmsFK.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "libslic3r/Polygon.hpp" namespace marchsq { using namespace Slic3r; diff --git a/src/libslic3r/Fill/FillTpmsFK.hpp b/src/libslic3r/Fill/FillTpmsFK.hpp index b9cd7d208b..d1fec0e93f 100644 --- a/src/libslic3r/Fill/FillTpmsFK.hpp +++ b/src/libslic3r/Fill/FillTpmsFK.hpp @@ -3,7 +3,6 @@ #include -#include "libslic3r/libslic3r.h" #include "FillBase.hpp" #include "libslic3r/ExPolygon.hpp" #include "libslic3r/Polyline.hpp" diff --git a/src/libslic3r/Fill/Lightning/Generator.cpp b/src/libslic3r/Fill/Lightning/Generator.cpp index c35eb3250f..18ed32a91d 100644 --- a/src/libslic3r/Fill/Lightning/Generator.cpp +++ b/src/libslic3r/Fill/Lightning/Generator.cpp @@ -30,6 +30,9 @@ #include #include #include +#include "libslic3r/Config.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "libslic3r/SurfaceCollection.hpp" /* Possible future tasks/optimizations,etc.: * - Improve connecting heuristic to favor connecting to shorter trees diff --git a/src/libslic3r/Fill/Lightning/Layer.cpp b/src/libslic3r/Fill/Lightning/Layer.cpp index f461888a14..6a03f84fa6 100644 --- a/src/libslic3r/Fill/Lightning/Layer.cpp +++ b/src/libslic3r/Fill/Lightning/Layer.cpp @@ -14,7 +14,6 @@ #include "../../ClipperUtils.hpp" #include "../../Geometry.hpp" -#include "Utils.hpp" #include "libslic3r/libslic3r.h" #include diff --git a/src/libslic3r/Fill/Lightning/TreeNode.hpp b/src/libslic3r/Fill/Lightning/TreeNode.hpp index c82ca3f2b6..f6dbac9f76 100644 --- a/src/libslic3r/Fill/Lightning/TreeNode.hpp +++ b/src/libslic3r/Fill/Lightning/TreeNode.hpp @@ -19,6 +19,7 @@ #include "libslic3r/BoundingBox.hpp" #include "SVG.hpp" #include "libslic3r/libslic3r.h" +#include "libslic3r/Line.hpp" //#define LIGHTNING_TREE_NODE_DEBUG_OUTPUT diff --git a/src/libslic3r/Flow.cpp b/src/libslic3r/Flow.cpp index 13ee73973e..96cbb86949 100644 --- a/src/libslic3r/Flow.cpp +++ b/src/libslic3r/Flow.cpp @@ -1,7 +1,6 @@ #include "Flow.hpp" #include "Exception.hpp" #include "Config.hpp" -#include "I18N.hpp" #include "Print.hpp" #include "libslic3r.h" #include @@ -10,6 +9,7 @@ #include #include #include +#include "PrintConfig.hpp" // Mark string for localization and translate. #define L(s) Slic3r::I18N::translate(s) diff --git a/src/libslic3r/FlushVolCalc.cpp b/src/libslic3r/FlushVolCalc.cpp index daeaf587c6..5773af3a15 100644 --- a/src/libslic3r/FlushVolCalc.cpp +++ b/src/libslic3r/FlushVolCalc.cpp @@ -4,7 +4,6 @@ #include #include "FlushVolPredictor.hpp" #include "slic3r/Utils/ColorSpaceConvert.hpp" -#include "Utils.hpp" #include "FlushVolCalc.hpp" diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp index e6e7f322e3..0a277a4d15 100644 --- a/src/libslic3r/Format/3mf.cpp +++ b/src/libslic3r/Format/3mf.cpp @@ -3,11 +3,9 @@ #include "../Model.hpp" #include "../Utils.hpp" #include "../LocalesUtils.hpp" -#include "../GCode.hpp" #include "../Geometry.hpp" #include "../GCode/ThumbnailData.hpp" #include "../Semver.hpp" -#include "../Time.hpp" #include "../I18N.hpp" #include "libslic3r/Point.hpp" diff --git a/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp index abf6953855..57165794c2 100644 --- a/src/libslic3r/Format/AMF.cpp +++ b/src/libslic3r/Format/AMF.cpp @@ -12,17 +12,10 @@ #include -#include "../libslic3r.h" #include "../Exception.hpp" #include "../Model.hpp" -#include "../GCode.hpp" -#include "../PrintConfig.hpp" -#include "../Utils.hpp" -#include "../I18N.hpp" #include "../Geometry.hpp" -#include "../CustomGCode.hpp" #include "../LocalesUtils.hpp" -#include "libslic3r/Config.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/TriangleMesh.hpp" diff --git a/src/libslic3r/Format/OBJ.cpp b/src/libslic3r/Format/OBJ.cpp index db24ebec0b..094dbe28d7 100644 --- a/src/libslic3r/Format/OBJ.cpp +++ b/src/libslic3r/Format/OBJ.cpp @@ -1,4 +1,3 @@ -#include "../libslic3r.h" #include "../Model.hpp" #include "../TriangleMesh.hpp" #include "../TexturePainting.hpp" diff --git a/src/libslic3r/Format/SL1.cpp b/src/libslic3r/Format/SL1.cpp index 15589e79b4..eaf5d5b4ec 100644 --- a/src/libslic3r/Format/SL1.cpp +++ b/src/libslic3r/Format/SL1.cpp @@ -1,7 +1,6 @@ #include "SL1.hpp" #include "libslic3r/ExPolygon.hpp" #include "libslic3r/Config.hpp" -#include "GCode/ThumbnailData.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/Polygon.hpp" #include "libslic3r/Point.hpp" @@ -35,7 +34,6 @@ #include "libslic3r/SlicesToTriangleMesh.hpp" #include "libslic3r/MarchingSquares.hpp" #include "libslic3r/ClipperUtils.hpp" -#include "libslic3r/MTUtils.hpp" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/SLA/RasterBase.hpp" #include "libslic3r/miniz_extension.hpp" @@ -50,6 +48,7 @@ #include #include #include +#include "libslic3r/SLA/Pad.hpp" namespace marchsq { diff --git a/src/libslic3r/Format/STEP.cpp b/src/libslic3r/Format/STEP.cpp index 1a77b53373..57d8e44157 100644 --- a/src/libslic3r/Format/STEP.cpp +++ b/src/libslic3r/Format/STEP.cpp @@ -1,4 +1,3 @@ -#include "../libslic3r.h" #include "../Model.hpp" #include "../TriangleMesh.hpp" #include "libslic3r/Exception.hpp" diff --git a/src/libslic3r/Format/STL.cpp b/src/libslic3r/Format/STL.cpp index 55489af976..83510043a2 100644 --- a/src/libslic3r/Format/STL.cpp +++ b/src/libslic3r/Format/STL.cpp @@ -1,4 +1,3 @@ -#include "../libslic3r.h" #include "../Model.hpp" #include "../TriangleMesh.hpp" diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp index 09f9725109..6d5d6a1187 100644 --- a/src/libslic3r/Format/bbs_3mf.cpp +++ b/src/libslic3r/Format/bbs_3mf.cpp @@ -9,7 +9,6 @@ #include "../Geometry.hpp" #include "../GCode/ThumbnailData.hpp" #include "../Semver.hpp" -#include "../Time.hpp" #include "../I18N.hpp" #include "libslic3r/Point.hpp" @@ -113,6 +112,7 @@ namespace pt = boost::property_tree; #include "NSVGUtils.hpp" #include +#include "libslic3r/ProjectTask.hpp" // Slightly faster than sprintf("%.9g"), but there is an issue with the karma floating point formatter, // https://github.com/boostorg/spirit/pull/586 diff --git a/src/libslic3r/Format/svg.cpp b/src/libslic3r/Format/svg.cpp index 45cc5758f5..b8fdc1f0d5 100644 --- a/src/libslic3r/Format/svg.cpp +++ b/src/libslic3r/Format/svg.cpp @@ -37,6 +37,7 @@ #include "TopoDS.hxx" #include "BRepExtrema_SelfIntersection.hxx" #include "libslic3r/Polygon.hpp" +#include "libslic3r/Polyline.hpp" namespace Slic3r { const double STEP_TRANS_CHORD_ERROR = 0.005; diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 8add372abd..6ae5394ac2 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -120,7 +120,6 @@ #include -#include "miniz_extension.hpp" using namespace std::literals::string_view_literals; @@ -132,6 +131,14 @@ using namespace std::literals::string_view_literals; #endif #include +#include "AABBTreeLines.hpp" +#include "Extruder.hpp" +#include "ExtrusionEntityCollection.hpp" +#include "FilamentMixer.hpp" +#include "Format/STEP.hpp" +#include "Model.hpp" +#include "MultiNozzleUtils.hpp" +#include "Slicing.hpp" namespace fs = boost::filesystem; diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index cc8c56000f..ca89341f33 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -4,10 +4,8 @@ #include "ExtrusionEntity.hpp" #include "Polygon.hpp" #include "Config.hpp" -#include "ExtrusionEntityCollection.hpp" #include "Print.hpp" #include "libslic3r.h" -#include "ExPolygon.hpp" #include "GCodeWriter.hpp" #include "Layer.hpp" #include "Point.hpp" @@ -22,7 +20,6 @@ #include "GCode/WipeTower.hpp" #include "GCode/SeamPlacer.hpp" #include "GCode/GCodeProcessor.hpp" -#include "EdgeGrid.hpp" #include "GCode/ThumbnailData.hpp" #include "libslic3r/ObjectID.hpp" #include "GCode/ExtrusionProcessor.hpp" @@ -48,6 +45,10 @@ #include #include #include +#include "BoundingBox.hpp" +#include "Polyline.hpp" + +namespace Slic3r { class ExtrusionEntityCollection; } namespace Slic3r { diff --git a/src/libslic3r/GCode/AdaptivePAProcessor.cpp b/src/libslic3r/GCode/AdaptivePAProcessor.cpp index 4f4e527f67..dbe2105a8b 100644 --- a/src/libslic3r/GCode/AdaptivePAProcessor.cpp +++ b/src/libslic3r/GCode/AdaptivePAProcessor.cpp @@ -19,6 +19,9 @@ #include #include #include +#include "libslic3r/Config.hpp" +#include "libslic3r/GCodeWriter.hpp" +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp index 62c2ae61fd..35adda3bf7 100644 --- a/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp +++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.cpp @@ -6,7 +6,6 @@ #include "../ExPolygon.hpp" #include "../Geometry.hpp" #include "../ClipperUtils.hpp" -#include "../SVG.hpp" #include "libslic3r/Line.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/Point.hpp" @@ -31,6 +30,10 @@ #include #include #include +#include "libslic3r/Extruder.hpp" +#include "libslic3r/GCodeWriter.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/SurfaceCollection.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp index 53e2942d3b..1d35624daf 100644 --- a/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp +++ b/src/libslic3r/GCode/AvoidCrossingPerimeters.hpp @@ -1,13 +1,13 @@ #ifndef slic3r_AvoidCrossingPerimeters_hpp_ #define slic3r_AvoidCrossingPerimeters_hpp_ -#include "../libslic3r.h" #include "../ExPolygon.hpp" #include "../EdgeGrid.hpp" #include "libslic3r/Polyline.hpp" #include "libslic3r/Polygon.hpp" #include "libslic3r/BoundingBox.hpp" #include +#include "libslic3r/MultiMaterialSegmentation.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/ConflictChecker.cpp b/src/libslic3r/GCode/ConflictChecker.cpp index 70b58423fa..a5646d8800 100644 --- a/src/libslic3r/GCode/ConflictChecker.cpp +++ b/src/libslic3r/GCode/ConflictChecker.cpp @@ -23,6 +23,7 @@ #include #include #include +#include "libslic3r/Model.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/ConflictChecker.hpp b/src/libslic3r/GCode/ConflictChecker.hpp index 50a126b89a..fb1e02ec3f 100644 --- a/src/libslic3r/GCode/ConflictChecker.hpp +++ b/src/libslic3r/GCode/ConflictChecker.hpp @@ -1,15 +1,12 @@ #ifndef slic3r_ConflictChecker_hpp_ #define slic3r_ConflictChecker_hpp_ -#include "../Utils.hpp" -#include "../Model.hpp" #include "../Print.hpp" #include "../Layer.hpp" #include "libslic3r/Line.hpp" #include "libslic3r/ExtrusionEntity.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/Polyline.hpp" -#include "libslic3r/ExtrusionEntityCollection.hpp" #include "libslic3r/GCode/GCodeProcessor.hpp" #include @@ -20,6 +17,8 @@ #include #include +namespace Slic3r { class ExtrusionEntityCollection; } + namespace Slic3r { struct LineWithID diff --git a/src/libslic3r/GCode/CoolingBuffer.cpp b/src/libslic3r/GCode/CoolingBuffer.cpp index 28a561369b..9fe7bbbd20 100644 --- a/src/libslic3r/GCode/CoolingBuffer.cpp +++ b/src/libslic3r/GCode/CoolingBuffer.cpp @@ -30,6 +30,9 @@ #endif #include +#include "libslic3r/Config.hpp" +#include "libslic3r/GCodeWriter.hpp" +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/CoolingBuffer.hpp b/src/libslic3r/GCode/CoolingBuffer.hpp index 0f7e27b14f..c2323dfc01 100644 --- a/src/libslic3r/GCode/CoolingBuffer.hpp +++ b/src/libslic3r/GCode/CoolingBuffer.hpp @@ -1,7 +1,6 @@ #ifndef slic3r_CoolingBuffer_hpp_ #define slic3r_CoolingBuffer_hpp_ -#include "../libslic3r.h" #include "../Point.hpp" #include #include diff --git a/src/libslic3r/GCode/FanMover.cpp b/src/libslic3r/GCode/FanMover.cpp index cb5fc310ee..3fc85828ec 100644 --- a/src/libslic3r/GCode/FanMover.cpp +++ b/src/libslic3r/GCode/FanMover.cpp @@ -33,6 +33,8 @@ #include #include #include +#include "libslic3r/Config.hpp" +#include "libslic3r/GCodeWriter.hpp" */ diff --git a/src/libslic3r/GCode/FanMover.hpp b/src/libslic3r/GCode/FanMover.hpp index b3a6fcb309..c7247009c4 100644 --- a/src/libslic3r/GCode/FanMover.hpp +++ b/src/libslic3r/GCode/FanMover.hpp @@ -2,11 +2,8 @@ #define slic3r_GCode_FanMover_hpp_ -#include "../libslic3r.h" -#include "../PrintConfig.hpp" #include "../ExtrusionEntity.hpp" -#include "../Point.hpp" #include "../GCodeReader.hpp" #include "../GCodeWriter.hpp" #include diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index 33b9119116..10a6f9dc88 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -1,9 +1,9 @@ +#include "libslic3r/ArcFitter.hpp" #include "libslic3r/Config.hpp" #include "libslic3r/CustomGCode.hpp" #include "libslic3r/Exception.hpp" #include "libslic3r/BoundingBox.hpp" #include "libslic3r/CommonDefs.hpp" -#include "libslic3r/ArcFitter.hpp" #include "ExtrusionEntity.hpp" #include "libslic3r/GCodeReader.hpp" #include "GCodeWriter.hpp" @@ -73,6 +73,7 @@ #include #include "Geometry/ArcWelder.hpp" +#include "libslic3r/MultiNozzleUtils.hpp" static const float DEFAULT_TOOLPATH_WIDTH = 0.4f; static const float DEFAULT_TOOLPATH_HEIGHT = 0.2f; diff --git a/src/libslic3r/GCode/OrderingStrategies.cpp b/src/libslic3r/GCode/OrderingStrategies.cpp index 73cb90f461..43bf9ecf87 100644 --- a/src/libslic3r/GCode/OrderingStrategies.cpp +++ b/src/libslic3r/GCode/OrderingStrategies.cpp @@ -17,6 +17,7 @@ #include #include #include +#include "libslic3r/Print.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/OrderingStrategies.hpp b/src/libslic3r/GCode/OrderingStrategies.hpp index 4e6d766b37..a42a338a52 100644 --- a/src/libslic3r/GCode/OrderingStrategies.hpp +++ b/src/libslic3r/GCode/OrderingStrategies.hpp @@ -3,10 +3,8 @@ #ifndef slic3r_OrderingStrategies_hpp_ #define slic3r_OrderingStrategies_hpp_ -#include "../libslic3r.h" #include "../Point.hpp" #include -#include "libslic3r/PrintConfig.hpp" #ifndef SLIC3R_TEST_HARNESS #include "../Print.hpp" @@ -17,6 +15,8 @@ #include #include +namespace Slic3r { enum class PrintOrder; } + namespace Slic3r { // --- Path improvement (operate on index vectors into `centers`) --- diff --git a/src/libslic3r/GCode/PressureEqualizer.cpp b/src/libslic3r/GCode/PressureEqualizer.cpp index 44ca576933..1d3111ccc8 100644 --- a/src/libslic3r/GCode/PressureEqualizer.cpp +++ b/src/libslic3r/GCode/PressureEqualizer.cpp @@ -13,9 +13,7 @@ #include #include -#include "../libslic3r.h" #include "../PrintConfig.hpp" -#include "../LocalesUtils.hpp" #include "../GCode.hpp" #include "PressureEqualizer.hpp" @@ -23,6 +21,7 @@ #include "libslic3r/Exception.hpp" #include "fast_float/fast_float.h" #include "GCodeWriter.hpp" +#include "libslic3r/Config.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/PressureEqualizer.hpp b/src/libslic3r/GCode/PressureEqualizer.hpp index be8e0e77fe..c3f0c1786a 100644 --- a/src/libslic3r/GCode/PressureEqualizer.hpp +++ b/src/libslic3r/GCode/PressureEqualizer.hpp @@ -1,7 +1,6 @@ #ifndef slic3r_GCode_PressureEqualizer_hpp_ #define slic3r_GCode_PressureEqualizer_hpp_ -#include "../libslic3r.h" #include "../ExtrusionEntity.hpp" #include "../PrintConfig.hpp" #include diff --git a/src/libslic3r/GCode/PrintExtents.cpp b/src/libslic3r/GCode/PrintExtents.cpp index 71bc826258..b9312e0d76 100644 --- a/src/libslic3r/GCode/PrintExtents.cpp +++ b/src/libslic3r/GCode/PrintExtents.cpp @@ -20,6 +20,8 @@ #include #include #include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp b/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp index 32994741d4..b4c362607d 100644 --- a/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp +++ b/src/libslic3r/GCode/RetractWhenCrossingPerimeters.cpp @@ -12,6 +12,8 @@ #include "libslic3r/Polygon.hpp" #include "RetractWhenCrossingPerimeters.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/SurfaceCollection.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/SeamPlacer.hpp b/src/libslic3r/GCode/SeamPlacer.hpp index ab3dc8089d..1c989cf155 100644 --- a/src/libslic3r/GCode/SeamPlacer.hpp +++ b/src/libslic3r/GCode/SeamPlacer.hpp @@ -14,11 +14,6 @@ #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" -#include "libslic3r/ExtrusionEntity.hpp" -#include "libslic3r/Polygon.hpp" -#include "libslic3r/PrintConfig.hpp" -#include "libslic3r/BoundingBox.hpp" -#include "libslic3r/AABBTreeIndirect.hpp" #include "libslic3r/KDTreeIndirect.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp index fec0e4aa88..e33f717c8f 100644 --- a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp +++ b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp @@ -16,7 +16,6 @@ #include #include -#include "../libslic3r.h" #include "../PrintConfig.hpp" #include "libslic3r/Exception.hpp" #include "libslic3r/GCode/PchipInterpolatorHelper.hpp" @@ -26,6 +25,7 @@ #include #include #include +#include "libslic3r/Config.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp index 2139e7f438..aa12614851 100644 --- a/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp +++ b/src/libslic3r/GCode/SmallAreaInfillFlowCompensator.hpp @@ -1,12 +1,13 @@ #ifndef slic3r_GCode_SmallAreaInfillFlowCompensator_hpp_ #define slic3r_GCode_SmallAreaInfillFlowCompensator_hpp_ -#include "../libslic3r.h" #include "../PrintConfig.hpp" -#include "../ExtrusionEntity.hpp" -#include "PchipInterpolatorHelper.hpp" #include #include +#include + +class PchipInterpolatorHelper; +namespace Slic3r { enum ExtrusionRole : uint8_t; } namespace Slic3r { diff --git a/src/libslic3r/GCode/SpiralVase.cpp b/src/libslic3r/GCode/SpiralVase.cpp index d96f99de4f..c90a42119d 100644 --- a/src/libslic3r/GCode/SpiralVase.cpp +++ b/src/libslic3r/GCode/SpiralVase.cpp @@ -1,5 +1,4 @@ #include "SpiralVase.hpp" -#include "GCode.hpp" #include "libslic3r/libslic3r.h" #include #include @@ -8,6 +7,8 @@ #include #include #include +#include "libslic3r/GCodeReader.hpp" +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/SpiralVase.hpp b/src/libslic3r/GCode/SpiralVase.hpp index b1e7c79f7e..490ecfcd08 100644 --- a/src/libslic3r/GCode/SpiralVase.hpp +++ b/src/libslic3r/GCode/SpiralVase.hpp @@ -1,12 +1,12 @@ #ifndef slic3r_SpiralVase_hpp_ #define slic3r_SpiralVase_hpp_ -#include "../libslic3r.h" #include "../GCodeReader.hpp" #include "libslic3r/PrintConfig.hpp" #include #include #include +#include "libslic3r/Config.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/Thumbnails.cpp b/src/libslic3r/GCode/Thumbnails.cpp index 9d32b0b63b..06127056ec 100644 --- a/src/libslic3r/GCode/Thumbnails.cpp +++ b/src/libslic3r/GCode/Thumbnails.cpp @@ -1,5 +1,4 @@ #include "Thumbnails.hpp" -#include "../miniz_extension.hpp" #include "libslic3r/GCode/ThumbnailData.hpp" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Point.hpp" diff --git a/src/libslic3r/GCode/Thumbnails.hpp b/src/libslic3r/GCode/Thumbnails.hpp index fd72973bac..a5fd598519 100644 --- a/src/libslic3r/GCode/Thumbnails.hpp +++ b/src/libslic3r/GCode/Thumbnails.hpp @@ -4,9 +4,7 @@ #include "../Point.hpp" #include "../PrintConfig.hpp" #include "../enum_bitmask.hpp" -#include "libslic3r/Config.hpp" #include "ThumbnailData.hpp" -#include "../enum_bitmask.hpp" #include #include @@ -17,6 +15,8 @@ #include +namespace Slic3r { class ConfigBase; } + namespace Slic3r { enum class ThumbnailError : int { InvalidVal, OutOfRange, InvalidExt }; using ThumbnailErrors = enum_bitmask; diff --git a/src/libslic3r/GCode/TimelapsePosPicker.cpp b/src/libslic3r/GCode/TimelapsePosPicker.cpp index fded08c1ce..84b6677b94 100644 --- a/src/libslic3r/GCode/TimelapsePosPicker.cpp +++ b/src/libslic3r/GCode/TimelapsePosPicker.cpp @@ -18,6 +18,9 @@ #include #include "libslic3r/Utils.hpp" #include "libslic3r/Polyline.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Slicing.hpp" constexpr int FILTER_THRESHOLD = 5; constexpr int MAX_CANDIDATE_SIZE = 5; diff --git a/src/libslic3r/GCode/TimelapsePosPicker.hpp b/src/libslic3r/GCode/TimelapsePosPicker.hpp index af102e6340..77f3c82886 100644 --- a/src/libslic3r/GCode/TimelapsePosPicker.hpp +++ b/src/libslic3r/GCode/TimelapsePosPicker.hpp @@ -9,7 +9,9 @@ #include "libslic3r/Point.hpp" #include "libslic3r/ExPolygon.hpp" #include "libslic3r/Print.hpp" -#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" + +namespace Slic3r { enum class PrintSequence; } namespace Slic3r { diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp index 38532a2f67..701c2a5858 100644 --- a/src/libslic3r/GCode/ToolOrdering.cpp +++ b/src/libslic3r/GCode/ToolOrdering.cpp @@ -52,6 +52,11 @@ #include #include +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/ExtrusionEntityCollection.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/SurfaceCollection.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/ToolOrdering.hpp b/src/libslic3r/GCode/ToolOrdering.hpp index 70b55fdb33..5cb3d4e977 100644 --- a/src/libslic3r/GCode/ToolOrdering.hpp +++ b/src/libslic3r/GCode/ToolOrdering.hpp @@ -18,13 +18,15 @@ #include #include -#include "../FilamentGroup.hpp" #include "../FilamentMixer.hpp" #include "../MultiNozzleUtils.hpp" -#include "../ExtrusionEntity.hpp" #include "../ObjectID.hpp" #include "../PrintConfig.hpp" +namespace Slic3r { class ExtrusionEntity; } +namespace Slic3r { class ExtrusionEntityCollection; } +namespace Slic3r { enum ExtrusionRole : uint8_t; } + namespace Slic3r { class Print; diff --git a/src/libslic3r/GCode/WipePathHelpers.cpp b/src/libslic3r/GCode/WipePathHelpers.cpp index 2c2ef7ff74..6e4518bb08 100644 --- a/src/libslic3r/GCode/WipePathHelpers.cpp +++ b/src/libslic3r/GCode/WipePathHelpers.cpp @@ -14,6 +14,7 @@ #include #include #include +#include "libslic3r/Polyline.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/WipeTower.cpp b/src/libslic3r/GCode/WipeTower.cpp index cef86313ba..bd68ec1abd 100644 --- a/src/libslic3r/GCode/WipeTower.cpp +++ b/src/libslic3r/GCode/WipeTower.cpp @@ -34,6 +34,7 @@ #include "libslic3r/TriangleMesh.hpp" #include "Triangulation.hpp" #include "libslic3r/libslic3r.h" +#include "libslic3r/Config.hpp" namespace Slic3r diff --git a/src/libslic3r/GCode/WipeTower2.cpp b/src/libslic3r/GCode/WipeTower2.cpp index 9b92f4c26a..21556e65ba 100644 --- a/src/libslic3r/GCode/WipeTower2.cpp +++ b/src/libslic3r/GCode/WipeTower2.cpp @@ -37,10 +37,10 @@ #include "libslic3r/Polyline.hpp" #include "PrintConfig.hpp" #include "Surface.hpp" -#include "Fill/FillRectilinear.hpp" #include "libslic3r/libslic3r.h" #include +#include "libslic3r/Config.hpp" namespace Slic3r diff --git a/src/libslic3r/GCode/WipeTower2.hpp b/src/libslic3r/GCode/WipeTower2.hpp index 408a5f6607..4ca320c329 100644 --- a/src/libslic3r/GCode/WipeTower2.hpp +++ b/src/libslic3r/GCode/WipeTower2.hpp @@ -16,6 +16,8 @@ #include "libslic3r/Point.hpp" #include "libslic3r/Polygon.hpp" #include "WipeTower.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCode/WipeTowerEstimate.cpp b/src/libslic3r/GCode/WipeTowerEstimate.cpp index 223850d4f0..c421689b6d 100644 --- a/src/libslic3r/GCode/WipeTowerEstimate.cpp +++ b/src/libslic3r/GCode/WipeTowerEstimate.cpp @@ -12,6 +12,7 @@ #include #include #include +#include "libslic3r/clonable_ptr.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCodeReader.cpp b/src/libslic3r/GCodeReader.cpp index 20acecec76..eff557d817 100644 --- a/src/libslic3r/GCodeReader.cpp +++ b/src/libslic3r/GCodeReader.cpp @@ -26,6 +26,7 @@ #include #include #include +#include "Config.hpp" namespace Slic3r { diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp index a862ebf2f1..72c1812da5 100644 --- a/src/libslic3r/GCodeWriter.cpp +++ b/src/libslic3r/GCodeWriter.cpp @@ -1,6 +1,5 @@ #include "GCodeWriter.hpp" #include "Config.hpp" -#include "CustomGCode.hpp" #include "Extruder.hpp" #include "I18N.hpp" #include "Point.hpp" diff --git a/src/libslic3r/GCodeWriter.hpp b/src/libslic3r/GCodeWriter.hpp index 447d70b552..abeca9bc03 100644 --- a/src/libslic3r/GCodeWriter.hpp +++ b/src/libslic3r/GCodeWriter.hpp @@ -14,7 +14,7 @@ #include "Point.hpp" #include "Polygon.hpp" #include "PrintConfig.hpp" -#include "GCode/CoolingBuffer.hpp" +#include "Config.hpp" namespace Slic3r { diff --git a/src/libslic3r/Geometry.cpp b/src/libslic3r/Geometry.cpp index 6c097428f4..ca134eda79 100644 --- a/src/libslic3r/Geometry.cpp +++ b/src/libslic3r/Geometry.cpp @@ -3,11 +3,8 @@ #include "MultiPoint.hpp" #include "BoundingBox.hpp" #include "libslic3r.h" -#include "Exception.hpp" #include "Geometry.hpp" #include "ClipperUtils.hpp" -#include "ExPolygon.hpp" -#include "Line.hpp" #include #include #include @@ -32,6 +29,8 @@ #include #include +namespace boost::polygon { template class point_data; } + #if defined(_MSC_VER) && defined(__clang__) #define BOOST_NO_CXX17_HDR_STRING_VIEW #endif diff --git a/src/libslic3r/Geometry/Circle.cpp b/src/libslic3r/Geometry/Circle.cpp index f8dc0d273d..5cde6a6ef5 100644 --- a/src/libslic3r/Geometry/Circle.cpp +++ b/src/libslic3r/Geometry/Circle.cpp @@ -1,6 +1,5 @@ #include "Circle.hpp" -#include "../Polygon.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" diff --git a/src/libslic3r/Geometry/ConvexHull.cpp b/src/libslic3r/Geometry/ConvexHull.cpp index 80617c0caf..133b144a1b 100644 --- a/src/libslic3r/Geometry/ConvexHull.cpp +++ b/src/libslic3r/Geometry/ConvexHull.cpp @@ -1,7 +1,6 @@ #include "libslic3r/Polygon.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/Polyline.hpp" -#include "libslic3r.h" #include "ConvexHull.hpp" #include "BoundingBox.hpp" #include "../Geometry.hpp" @@ -14,6 +13,7 @@ #include #include #include +#include "libslic3r/ExPolygon.hpp" namespace Slic3r { namespace Geometry { diff --git a/src/libslic3r/Geometry/Voronoi.hpp b/src/libslic3r/Geometry/Voronoi.hpp index 23a50bb8f7..c2cd579218 100644 --- a/src/libslic3r/Geometry/Voronoi.hpp +++ b/src/libslic3r/Geometry/Voronoi.hpp @@ -6,8 +6,6 @@ #include #include -#include "../Line.hpp" -#include "../Polyline.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" diff --git a/src/libslic3r/Geometry/VoronoiOffset.hpp b/src/libslic3r/Geometry/VoronoiOffset.hpp index 747538e8b6..564ee6713d 100644 --- a/src/libslic3r/Geometry/VoronoiOffset.hpp +++ b/src/libslic3r/Geometry/VoronoiOffset.hpp @@ -7,7 +7,6 @@ #include #include -#include "libslic3r/libslic3r.h" #include "Voronoi.hpp" #include "libslic3r/Line.hpp" #include "libslic3r/Point.hpp" diff --git a/src/libslic3r/Geometry/VoronoiUtils.hpp b/src/libslic3r/Geometry/VoronoiUtils.hpp index 6872e4ea72..d9b15fd839 100644 --- a/src/libslic3r/Geometry/VoronoiUtils.hpp +++ b/src/libslic3r/Geometry/VoronoiUtils.hpp @@ -6,7 +6,6 @@ #include #include "libslic3r/Geometry/Voronoi.hpp" -#include "libslic3r/Arachne/utils/PolygonsSegmentIndex.hpp" #include "libslic3r/Arachne/utils/PolygonsPointIndex.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" diff --git a/src/libslic3r/Geometry/VoronoiUtilsCgal.hpp b/src/libslic3r/Geometry/VoronoiUtilsCgal.hpp index baafbc7a1a..0f6149ed4e 100644 --- a/src/libslic3r/Geometry/VoronoiUtilsCgal.hpp +++ b/src/libslic3r/Geometry/VoronoiUtilsCgal.hpp @@ -4,8 +4,6 @@ #include #include -#include "Voronoi.hpp" -#include "../Arachne/utils/PolygonsSegmentIndex.hpp" namespace Slic3r::Geometry { class VoronoiDiagram; diff --git a/src/libslic3r/IntersectionPoints.cpp b/src/libslic3r/IntersectionPoints.cpp index 7db77d0787..293217155f 100644 --- a/src/libslic3r/IntersectionPoints.cpp +++ b/src/libslic3r/IntersectionPoints.cpp @@ -5,6 +5,7 @@ #include "libslic3r/Point.hpp" #include "libslic3r/Polygon.hpp" #include "libslic3r/ExPolygon.hpp" +#include "libslic3r/AABBTreeIndirect.hpp" //NOTE: using CGAL SweepLines is slower !!! (example in git history) diff --git a/src/libslic3r/LayOnFace.cpp b/src/libslic3r/LayOnFace.cpp index 3cc5c2fdce..a66139a17b 100644 --- a/src/libslic3r/LayOnFace.cpp +++ b/src/libslic3r/LayOnFace.cpp @@ -14,6 +14,7 @@ #include #include #include +#include "BoundingBox.hpp" namespace Slic3r { diff --git a/src/libslic3r/Layer.cpp b/src/libslic3r/Layer.cpp index 7f27012dc4..5439e0fa7a 100644 --- a/src/libslic3r/Layer.cpp +++ b/src/libslic3r/Layer.cpp @@ -7,7 +7,6 @@ #include "Exception.hpp" #include "Flow.hpp" #include "Print.hpp" -#include "Fill/Fill.hpp" #include "PrintConfig.hpp" #include "ShortestPath.hpp" #include "SVG.hpp" @@ -23,6 +22,9 @@ #include #include #include +#include "Config.hpp" +#include "MultiMaterialSegmentation.hpp" +#include "ObjectID.hpp" namespace Slic3r { diff --git a/src/libslic3r/Layer.hpp b/src/libslic3r/Layer.hpp index 600e4c4062..3bc25a0363 100644 --- a/src/libslic3r/Layer.hpp +++ b/src/libslic3r/Layer.hpp @@ -3,19 +3,22 @@ #include "Polyline.hpp" #include "Polygon.hpp" -#include "ExtrusionEntity.hpp" #include "Line.hpp" #include "libslic3r.h" #include "BoundingBox.hpp" #include "Flow.hpp" #include "SurfaceCollection.hpp" #include "ExtrusionEntityCollection.hpp" -#include "BoundingBox.hpp" #include #include #include #include #include +#include "ExPolygon.hpp" + +namespace Slic3r { class ExtrusionLoop; } +namespace Slic3r { class ExtrusionMultiPath; } +namespace Slic3r { class ExtrusionPath; } namespace Slic3r { class ExPolygon; diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp index 3132dd348d..99b20e50f3 100644 --- a/src/libslic3r/LayerRegion.cpp +++ b/src/libslic3r/LayerRegion.cpp @@ -39,6 +39,9 @@ #include #include #include +#include "ExtrusionEntityCollection.hpp" +#include "MultiMaterialSegmentation.hpp" +#include "SurfaceCollection.hpp" namespace Slic3r { diff --git a/src/libslic3r/Line.cpp b/src/libslic3r/Line.cpp index 5c40e48e63..772001f78e 100644 --- a/src/libslic3r/Line.cpp +++ b/src/libslic3r/Line.cpp @@ -1,7 +1,6 @@ #include "Geometry.hpp" #include "Line.hpp" #include "Point.hpp" -#include "Polyline.hpp" #include #include "libslic3r.h" #include @@ -9,6 +8,7 @@ #include #include #include +#include "BoundingBox.hpp" namespace Slic3r { diff --git a/src/libslic3r/Measure.cpp b/src/libslic3r/Measure.cpp index e2ef912f37..918bbac1f2 100644 --- a/src/libslic3r/Measure.cpp +++ b/src/libslic3r/Measure.cpp @@ -31,6 +31,8 @@ #include #include +namespace Slic3r { enum Face_index : int; } + #define DEBUG_EXTRACT_ALL_FEATURES_AT_ONCE 0 namespace Slic3r { diff --git a/src/libslic3r/MinAreaBoundingBox.cpp b/src/libslic3r/MinAreaBoundingBox.cpp index ccc2eb981b..b172908382 100644 --- a/src/libslic3r/MinAreaBoundingBox.cpp +++ b/src/libslic3r/MinAreaBoundingBox.cpp @@ -23,6 +23,7 @@ #include #include +#include "Polygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index e60b520f6e..39993895b0 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -85,6 +85,7 @@ // Transtltion #include "I18N.hpp" +#include "ExPolygon.hpp" // ModelIO support #ifdef __APPLE__ diff --git a/src/libslic3r/ModelArrange.cpp b/src/libslic3r/ModelArrange.cpp index df95b92b99..c5c952577c 100644 --- a/src/libslic3r/ModelArrange.cpp +++ b/src/libslic3r/ModelArrange.cpp @@ -11,9 +11,11 @@ #include "Config.hpp" #include #include -#include "MTUtils.hpp" #include "Point.hpp" #include "PrintConfig.hpp" +#include "BoundingBox.hpp" +#include "ExPolygon.hpp" +#include "Polygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp index 9119498a1e..b7dfd6a160 100644 --- a/src/libslic3r/MultiMaterialSegmentation.cpp +++ b/src/libslic3r/MultiMaterialSegmentation.cpp @@ -18,15 +18,14 @@ #include "MutablePolygon.hpp" #include "Utils.hpp" #include "PrintConfig.hpp" -#include "TriangleSelector.hpp" #include "TriangleMeshSlicer.hpp" #include "Surface.hpp" -#include "format.hpp" #include "libslic3r.h" #include #include #include +#include #include #include #include @@ -44,6 +43,9 @@ #include #include #include +#include "SurfaceCollection.hpp" + +namespace Slic3r { enum class EnforcerBlockerType : int8_t; } //#define MM_SEGMENTATION_DEBUG_GRAPH //#define MM_SEGMENTATION_DEBUG_REGIONS diff --git a/src/libslic3r/MutablePolygon.cpp b/src/libslic3r/MutablePolygon.cpp index 60484dc3aa..03d6043160 100644 --- a/src/libslic3r/MutablePolygon.cpp +++ b/src/libslic3r/MutablePolygon.cpp @@ -1,5 +1,4 @@ #include "MutablePolygon.hpp" -#include "Line.hpp" #include "Point.hpp" #include "libslic3r.h" #include diff --git a/src/libslic3r/NSVGUtils.hpp b/src/libslic3r/NSVGUtils.hpp index 846c4adfb8..4010ec178c 100644 --- a/src/libslic3r/NSVGUtils.hpp +++ b/src/libslic3r/NSVGUtils.hpp @@ -8,7 +8,6 @@ #include #include "Point.hpp" #include "Polygon.hpp" -#include "ExPolygon.hpp" #include "EmbossShape.hpp" // ExPolygonsWithIds #include "libslic3r.h" #include "nanosvg/nanosvg.h" // load SVG file diff --git a/src/libslic3r/Orient.cpp b/src/libslic3r/Orient.cpp index b72401f36b..4af8ffe6cf 100644 --- a/src/libslic3r/Orient.cpp +++ b/src/libslic3r/Orient.cpp @@ -15,7 +15,6 @@ #include "Model.hpp" #include "PrintConfig.hpp" #include -#include #include #include #include @@ -32,6 +31,7 @@ #include #include +#include "BoundingBox.hpp" #undef MAX3 #define MAX3(a,b,c) std::max(std::max(a,b),c) diff --git a/src/libslic3r/Orient.hpp b/src/libslic3r/Orient.hpp index 6839665e01..dc83fceca4 100644 --- a/src/libslic3r/Orient.hpp +++ b/src/libslic3r/Orient.hpp @@ -4,12 +4,14 @@ #include "TriangleMesh.hpp" #include "Point.hpp" #include "PrintConfig.hpp" -#include "libslic3r/Model.hpp" #include #include #include #include +namespace Slic3r { class ModelInstance; } +namespace Slic3r { class ModelObject; } + namespace Slic3r { namespace orientation { diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp index 5b775f7e25..44d30aa789 100644 --- a/src/libslic3r/PerimeterGenerator.cpp +++ b/src/libslic3r/PerimeterGenerator.cpp @@ -1,5 +1,4 @@ #include "PerimeterGenerator.hpp" -#include "AABBTreeLines.hpp" #include "Arachne/utils/ExtrusionLine.hpp" #include "Arachne/utils/ExtrusionJunction.hpp" #include "BridgeDetector.hpp" @@ -37,7 +36,9 @@ #include "libslic3r.h" #include #include "libslic3r/AABBTreeLines.hpp" -#include "Print.hpp" +#include "BoundingBox.hpp" +#include "MultiMaterialSegmentation.hpp" +#include "SurfaceCollection.hpp" static const int overhang_sampling_number = 6; static const double narrow_loop_length_threshold = 10; //BBS: when the width of expolygon is smaller than diff --git a/src/libslic3r/PerimeterGenerator.hpp b/src/libslic3r/PerimeterGenerator.hpp index c4d5b06095..ceaa2252d1 100644 --- a/src/libslic3r/PerimeterGenerator.hpp +++ b/src/libslic3r/PerimeterGenerator.hpp @@ -1,7 +1,6 @@ #ifndef slic3r_PerimeterGenerator_hpp_ #define slic3r_PerimeterGenerator_hpp_ -#include "ExtrusionEntityCollection.hpp" #include "Point.hpp" #include "Surface.hpp" #include "libslic3r.h" @@ -15,7 +14,11 @@ #include "Flow.hpp" #include "Polygon.hpp" #include "PrintConfig.hpp" -#include "SurfaceCollection.hpp" +#include "Config.hpp" +#include "ExPolygon.hpp" + +namespace Slic3r { class ExtrusionEntityCollection; } +namespace Slic3r { class SurfaceCollection; } namespace Slic3r { struct FuzzySkinConfig diff --git a/src/libslic3r/PlaceholderParser.hpp b/src/libslic3r/PlaceholderParser.hpp index 962517a252..1ac758267b 100644 --- a/src/libslic3r/PlaceholderParser.hpp +++ b/src/libslic3r/PlaceholderParser.hpp @@ -2,7 +2,6 @@ #define slic3r_PlaceholderParser_hpp_ #include "Config.hpp" -#include "libslic3r.h" #include #include #include @@ -10,7 +9,8 @@ #include #include #include -#include "PrintConfig.hpp" + +namespace Slic3r { class DynamicPrintConfig; } namespace Slic3r { diff --git a/src/libslic3r/PolygonTrimmer.hpp b/src/libslic3r/PolygonTrimmer.hpp index 4f0608169b..4dc6dd1f39 100644 --- a/src/libslic3r/PolygonTrimmer.hpp +++ b/src/libslic3r/PolygonTrimmer.hpp @@ -2,12 +2,8 @@ #define slic3r_PolygonTrimmer_hpp_ #include "Point.hpp" -#include "libslic3r.h" #include #include -#include "Line.hpp" -#include "MultiPoint.hpp" -#include "Polyline.hpp" #include "Polygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/Polyline.cpp b/src/libslic3r/Polyline.cpp index 278522bfd9..89c0243a07 100644 --- a/src/libslic3r/Polyline.cpp +++ b/src/libslic3r/Polyline.cpp @@ -2,11 +2,9 @@ #include "BoundingBox.hpp" #include "Polyline.hpp" #include "Exception.hpp" -#include "ExPolygon.hpp" #include "Line.hpp" #include "Point.hpp" #include "MultiPoint.hpp" -#include "Polygon.hpp" #include #include #include @@ -16,6 +14,7 @@ #include #include #include +#include "Circle.hpp" namespace Slic3r { diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 321fab6310..b47a0f4695 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -83,7 +83,6 @@ #include "InstanceLock.hpp" #include -#include "Time.hpp" #include "PlaceholderParser.hpp" #include "libslic3r/GCode/Thumbnails.hpp" diff --git a/src/libslic3r/PresetCacheFormat.hpp b/src/libslic3r/PresetCacheFormat.hpp index 8ad1c5bde5..261e7ef796 100644 --- a/src/libslic3r/PresetCacheFormat.hpp +++ b/src/libslic3r/PresetCacheFormat.hpp @@ -16,6 +16,9 @@ #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Semver.hpp" +namespace cereal { class BinaryInputArchive; } +namespace cereal { class BinaryOutputArchive; } + namespace Slic3r { // How the preset cache writes a DynamicPrintConfig. diff --git a/src/libslic3r/PrincipalComponents2D.hpp b/src/libslic3r/PrincipalComponents2D.hpp index adf8e77a20..ecebc8ecd3 100644 --- a/src/libslic3r/PrincipalComponents2D.hpp +++ b/src/libslic3r/PrincipalComponents2D.hpp @@ -1,10 +1,7 @@ #ifndef slic3r_PrincipalComponents2D_hpp_ #define slic3r_PrincipalComponents2D_hpp_ -#include "AABBTreeLines.hpp" -#include "BoundingBox.hpp" #include "Point.hpp" -#include "libslic3r.h" #include #include #include "Polygon.hpp" diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index 6dc8811e0e..4e6ec96ee9 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -98,9 +98,11 @@ #include "nlohmann/json.hpp" #include "GCode/ConflictChecker.hpp" -#include "ParameterUtils.hpp" #include +#include "Format/STEP.hpp" +#include "PlaceholderParser.hpp" +#include "SurfaceCollection.hpp" namespace fs = boost::filesystem; diff --git a/src/libslic3r/PrintApply.cpp b/src/libslic3r/PrintApply.cpp index 926a6fbca6..1a7bf41aed 100644 --- a/src/libslic3r/PrintApply.cpp +++ b/src/libslic3r/PrintApply.cpp @@ -30,6 +30,10 @@ #include #include #include +#include "MultiNozzleUtils.hpp" +#include "ObjectID.hpp" +#include "PlaceholderParser.hpp" +#include "TriangleMesh.hpp" namespace Slic3r { diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 17ca44d526..104b2f2bd7 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -10,7 +10,6 @@ #include "Print.hpp" #include "BoundingBox.hpp" #include "ClipperUtils.hpp" -#include "ElephantFootCompensation.hpp" #include "Geometry.hpp" #include "I18N.hpp" #include "Layer.hpp" @@ -25,12 +24,10 @@ #include "Slicing.hpp" #include "Tesselate.hpp" #include "TriangleMeshSlicer.hpp" -#include "TriangleSelector.hpp" #include "Utils.hpp" #include "Fill/FillAdaptive.hpp" #include "Fill/Fill.hpp" #include "Fill/FillLightning.hpp" -#include "Format/STL.hpp" #include "format.hpp" #include "AABBTreeIndirect.hpp" #include "AABBTreeLines.hpp" @@ -77,6 +74,14 @@ #include #include +#include +#include "ExtrusionEntityCollection.hpp" +#include "Fill/FillBase.hpp" +#include "Fill/Lightning/Generator.hpp" +#include "SurfaceCollection.hpp" +#include "TriangleMesh.hpp" + +namespace Slic3r { enum class EnforcerBlockerType : int8_t; } using namespace std::literals; diff --git a/src/libslic3r/PrintObjectSlice.cpp b/src/libslic3r/PrintObjectSlice.cpp index 0581e9c6fd..038797ed3c 100644 --- a/src/libslic3r/PrintObjectSlice.cpp +++ b/src/libslic3r/PrintObjectSlice.cpp @@ -38,6 +38,8 @@ #include "Surface.hpp" #include "Utils.hpp" #include "libslic3r/Feature/Interlocking/InterlockingGenerator.hpp" +#include "Config.hpp" +#include "SurfaceCollection.hpp" //! macro used to mark string used at localization, return same string #define L(s) Slic3r::I18N::translate(s) diff --git a/src/libslic3r/ProjectTask.cpp b/src/libslic3r/ProjectTask.cpp index 33be040999..e003c4fec5 100644 --- a/src/libslic3r/ProjectTask.cpp +++ b/src/libslic3r/ProjectTask.cpp @@ -1,6 +1,3 @@ -#include "libslic3r.h" -#include "Time.hpp" -#include "Thread.hpp" #include "ProjectTask.hpp" diff --git a/src/libslic3r/SLA/Clustering.hpp b/src/libslic3r/SLA/Clustering.hpp index 0f1e113b22..c1a475b53b 100644 --- a/src/libslic3r/SLA/Clustering.hpp +++ b/src/libslic3r/SLA/Clustering.hpp @@ -8,7 +8,6 @@ #include #include -#include #include namespace Slic3r { namespace sla { diff --git a/src/libslic3r/SLA/ConcaveHull.cpp b/src/libslic3r/SLA/ConcaveHull.cpp index 8d361fc5b5..9fa47c17f2 100644 --- a/src/libslic3r/SLA/ConcaveHull.cpp +++ b/src/libslic3r/SLA/ConcaveHull.cpp @@ -8,12 +8,12 @@ #include #include -#include #include #include #include #include +#include "libslic3r/Line.hpp" namespace Slic3r { namespace sla { diff --git a/src/libslic3r/SLA/Hollowing.cpp b/src/libslic3r/SLA/Hollowing.cpp index d21744a026..db8402e636 100644 --- a/src/libslic3r/SLA/Hollowing.cpp +++ b/src/libslic3r/SLA/Hollowing.cpp @@ -28,10 +28,11 @@ #include -#include #include #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/SLA/Pad.hpp" //! macro used to mark string used at localization, //! return same string diff --git a/src/libslic3r/SLA/Pad.cpp b/src/libslic3r/SLA/Pad.cpp index 887676174d..f4f5d48e03 100644 --- a/src/libslic3r/SLA/Pad.cpp +++ b/src/libslic3r/SLA/Pad.cpp @@ -2,7 +2,6 @@ #include #include #include -#include //#include #include @@ -29,6 +28,8 @@ #include #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Polygon.hpp" //! macro used to mark string used at localization, //! return same string diff --git a/src/libslic3r/SLA/RasterToPolygons.cpp b/src/libslic3r/SLA/RasterToPolygons.cpp index 88620831d8..b779665db6 100644 --- a/src/libslic3r/SLA/RasterToPolygons.cpp +++ b/src/libslic3r/SLA/RasterToPolygons.cpp @@ -6,13 +6,13 @@ #include "libslic3r/Polygon.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/MarchingSquares.hpp" -#include "MTUtils.hpp" #include "ClipperUtils.hpp" #include #include #include #include #include +#include "libslic3r/SLA/RasterBase.hpp" namespace marchsq { diff --git a/src/libslic3r/SLA/Rotfinder.cpp b/src/libslic3r/SLA/Rotfinder.cpp index 8134fb1d6c..39b816465b 100644 --- a/src/libslic3r/SLA/Rotfinder.cpp +++ b/src/libslic3r/SLA/Rotfinder.cpp @@ -10,10 +10,8 @@ #include #include -#include #include -#include #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" @@ -21,13 +19,15 @@ #include "libslic3r/Model.hpp" #include "libslic3r/Optimize/Optimizer.hpp" #include "libslic3r/BoundingBox.hpp" -#include "libslic3r/SLAPrint.hpp" #include "libslic3r/PrintConfig.hpp" #include #include #include +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/TriangleMesh.hpp" namespace Slic3r { namespace sla { diff --git a/src/libslic3r/SLA/SupportPointGenerator.cpp b/src/libslic3r/SLA/SupportPointGenerator.cpp index f63430bede..037c778f7f 100644 --- a/src/libslic3r/SLA/SupportPointGenerator.cpp +++ b/src/libslic3r/SLA/SupportPointGenerator.cpp @@ -15,12 +15,10 @@ #include "SupportPointGenerator.hpp" #include "Geometry/ConvexHull.hpp" #include "Concurrency.hpp" -#include "Model.hpp" #include "ExPolygon.hpp" #include "libslic3r/SLA/IndexedMesh.hpp" #include "libslic3r/SLA/SupportPoint.hpp" #include "libslic3r/Polygon.hpp" -#include "SVG.hpp" #include "Point.hpp" #include "ClipperUtils.hpp" #include "Tesselate.hpp" @@ -32,6 +30,7 @@ #include #include #include +#include "libslic3r/ExtrusionEntity.hpp" namespace Slic3r { namespace sla { diff --git a/src/libslic3r/SLA/SupportPointGenerator.hpp b/src/libslic3r/SLA/SupportPointGenerator.hpp index e48fa05335..0bd445ed41 100644 --- a/src/libslic3r/SLA/SupportPointGenerator.hpp +++ b/src/libslic3r/SLA/SupportPointGenerator.hpp @@ -11,7 +11,6 @@ #include #include -#include #include #include @@ -22,6 +21,8 @@ #include #include +namespace Slic3r::sla { class IndexedMesh; } + // #define SLA_SUPPORTPOINTGEN_DEBUG namespace Slic3r { namespace sla { diff --git a/src/libslic3r/SLA/SupportTree.cpp b/src/libslic3r/SLA/SupportTree.cpp index 4de28ca45b..06ade65743 100644 --- a/src/libslic3r/SLA/SupportTree.cpp +++ b/src/libslic3r/SLA/SupportTree.cpp @@ -11,21 +11,20 @@ #include #include #include -#include #include #include -#include -#include -#include #include #include #include #include -#include #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/ExtrusionEntity.hpp" +#include "libslic3r/SLA/IndexedMesh.hpp" +#include "libslic3r/SLA/JobController.hpp" //! macro used to mark string used at localization, //! return same string diff --git a/src/libslic3r/SLA/SupportTreeBuilder.cpp b/src/libslic3r/SLA/SupportTreeBuilder.cpp index 635b5452d1..ac254f15d4 100644 --- a/src/libslic3r/SLA/SupportTreeBuilder.cpp +++ b/src/libslic3r/SLA/SupportTreeBuilder.cpp @@ -20,6 +20,7 @@ #include #include #include +#include "libslic3r/SLA/JobController.hpp" //#include namespace Slic3r { diff --git a/src/libslic3r/SLA/SupportTreeBuildsteps.hpp b/src/libslic3r/SLA/SupportTreeBuildsteps.hpp index 850f35bdeb..e2ebc6804d 100644 --- a/src/libslic3r/SLA/SupportTreeBuildsteps.hpp +++ b/src/libslic3r/SLA/SupportTreeBuildsteps.hpp @@ -11,7 +11,6 @@ #include #include "libslic3r/SLA/SupportTree.hpp" #include "libslic3r/SLA/IndexedMesh.hpp" -#include "libslic3r/SLA/SupportPoint.hpp" #include "libslic3r/SLA/Pad.hpp" #include #include @@ -20,11 +19,13 @@ #include #include -#include #include #include #include #include +#include "libslic3r/MTUtils.hpp" + +namespace Slic3r::sla { struct SupportPoint; } namespace Slic3r { namespace sla { diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp index 336143c764..88ceafc443 100644 --- a/src/libslic3r/SLAPrint.cpp +++ b/src/libslic3r/SLAPrint.cpp @@ -8,12 +8,10 @@ #include "Config.hpp" #include "PrintBase.hpp" #include "SLA/SupportPoint.hpp" -#include "Polygon.hpp" #include "ExPolygon.hpp" #include "SLA/Hollowing.hpp" #include "SLAPrintSteps.hpp" -#include "ClipperUtils.hpp" #include "Geometry.hpp" #include "MTUtils.hpp" #include "Thread.hpp" @@ -45,6 +43,9 @@ #endif #include "I18N.hpp" +#include "PlaceholderParser.hpp" + +namespace Slic3r { class Polygon; } //! macro used to mark string used at localization, //! return same string diff --git a/src/libslic3r/SLAPrintSteps.cpp b/src/libslic3r/SLAPrintSteps.cpp index 51c2e6ef9f..05846f848f 100644 --- a/src/libslic3r/SLAPrintSteps.cpp +++ b/src/libslic3r/SLAPrintSteps.cpp @@ -12,18 +12,15 @@ #include #include -#include #include // Need the cylinder method for the drainholes in hollowing step -#include #include #include #include #include -#include #include @@ -45,6 +42,13 @@ #include "SLA/JobController.hpp" #include "SLA/SupportTree.hpp" #include "SLA/RasterBase.hpp" +#include "BoundingBox.hpp" +#include "Config.hpp" +#include "Polygon.hpp" +#include "PrintConfig.hpp" +#include "SLA/IndexedMesh.hpp" + +namespace Slic3r::sla { struct Interior; } //! macro used to mark string used at localization, //! return same string diff --git a/src/libslic3r/SLAPrintSteps.hpp b/src/libslic3r/SLAPrintSteps.hpp index 8d1ca12179..708a3b4538 100644 --- a/src/libslic3r/SLAPrintSteps.hpp +++ b/src/libslic3r/SLAPrintSteps.hpp @@ -7,8 +7,6 @@ #include -#include -#include #include namespace Slic3r { diff --git a/src/libslic3r/Semver.cpp b/src/libslic3r/Semver.cpp index f052ba6bdb..c6618d7a3a 100644 --- a/src/libslic3r/Semver.cpp +++ b/src/libslic3r/Semver.cpp @@ -1,5 +1,4 @@ #include "Semver.hpp" -#include "libslic3r.h" #include "libslic3r_version.h" namespace Slic3r { diff --git a/src/libslic3r/ShortestPath.cpp b/src/libslic3r/ShortestPath.cpp index 0b31a66919..bbea1a6900 100644 --- a/src/libslic3r/ShortestPath.cpp +++ b/src/libslic3r/ShortestPath.cpp @@ -28,6 +28,7 @@ #include #include +#include "MultiMaterialSegmentation.hpp" namespace Slic3r { diff --git a/src/libslic3r/ShortestPath.hpp b/src/libslic3r/ShortestPath.hpp index d8cd7a025f..53ec00f9e4 100644 --- a/src/libslic3r/ShortestPath.hpp +++ b/src/libslic3r/ShortestPath.hpp @@ -2,14 +2,17 @@ #define slic3r_ShortestPath_hpp_ #include "Polyline.hpp" -#include "libslic3r.h" -#include "ExtrusionEntity.hpp" #include "Point.hpp" #include #include #include #include +#include "ExPolygon.hpp" + +namespace Slic3r { class ExtrusionEntity; } +namespace Slic3r { class ExtrusionPath; } +namespace Slic3r { class Line; } namespace Slic3r { diff --git a/src/libslic3r/SlicesToTriangleMesh.cpp b/src/libslic3r/SlicesToTriangleMesh.cpp index a536bc0d5e..ed47bd0936 100644 --- a/src/libslic3r/SlicesToTriangleMesh.cpp +++ b/src/libslic3r/SlicesToTriangleMesh.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "ExPolygon.hpp" namespace Slic3r { diff --git a/src/libslic3r/Slicing.cpp b/src/libslic3r/Slicing.cpp index 92bdac10e3..31134e7cfb 100644 --- a/src/libslic3r/Slicing.cpp +++ b/src/libslic3r/Slicing.cpp @@ -13,6 +13,7 @@ #include "SlicingAdaptive.hpp" #include "PrintConfig.hpp" #include "Model.hpp" +#include "Config.hpp" // #define SLIC3R_DEBUG diff --git a/src/libslic3r/SlicingAdaptive.hpp b/src/libslic3r/SlicingAdaptive.hpp index 99479bb8b6..6d828f9a41 100644 --- a/src/libslic3r/SlicingAdaptive.hpp +++ b/src/libslic3r/SlicingAdaptive.hpp @@ -9,6 +9,8 @@ #include #include +namespace Slic3r { class ModelObject; } + namespace Slic3r { diff --git a/src/libslic3r/Support/SupportCommon.cpp b/src/libslic3r/Support/SupportCommon.cpp index 46ed7e968c..59463b4cc6 100644 --- a/src/libslic3r/Support/SupportCommon.cpp +++ b/src/libslic3r/Support/SupportCommon.cpp @@ -47,6 +47,11 @@ #endif #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Flow.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" namespace Slic3r { diff --git a/src/libslic3r/Support/SupportCommon.hpp b/src/libslic3r/Support/SupportCommon.hpp index e6f5b3e1ef..c32efd4697 100644 --- a/src/libslic3r/Support/SupportCommon.hpp +++ b/src/libslic3r/Support/SupportCommon.hpp @@ -1,20 +1,20 @@ #ifndef slic3r_SupportCommon_hpp_ #define slic3r_SupportCommon_hpp_ -#include "../Layer.hpp" #include "../Polygon.hpp" #include "../Print.hpp" #include "libslic3r/PrintConfig.hpp" -#include "libslic3r/Slicing.hpp" #include "libslic3r/ExtrusionEntity.hpp" -#include "libslic3r/Flow.hpp" -#include "libslic3r/Fill/FillBase.hpp" #include "SupportLayer.hpp" #include "SupportParameters.hpp" #include #include #include +namespace Slic3r { class Fill; } +namespace Slic3r { class Flow; } +namespace Slic3r { struct SlicingParameters; } + namespace Slic3r { class PrintObject; diff --git a/src/libslic3r/Support/SupportMaterial.cpp b/src/libslic3r/Support/SupportMaterial.cpp index ab40c155af..2f4665e9e2 100644 --- a/src/libslic3r/Support/SupportMaterial.cpp +++ b/src/libslic3r/Support/SupportMaterial.cpp @@ -74,6 +74,11 @@ // #undef NDEBUG #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Line.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "libslic3r/Support/SupportParameters.hpp" +#include "libslic3r/SurfaceCollection.hpp" namespace Slic3r { diff --git a/src/libslic3r/Support/SupportMaterial.hpp b/src/libslic3r/Support/SupportMaterial.hpp index 1d5bec31b5..cba88d9bf3 100644 --- a/src/libslic3r/Support/SupportMaterial.hpp +++ b/src/libslic3r/Support/SupportMaterial.hpp @@ -1,15 +1,14 @@ #ifndef slic3r_SupportMaterial_hpp_ #define slic3r_SupportMaterial_hpp_ -#include "Flow.hpp" #include "libslic3r/Polygon.hpp" #include "PrintConfig.hpp" #include "Slicing.hpp" -#include "Fill/FillBase.hpp" #include "SupportLayer.hpp" #include "SupportParameters.hpp" #include #include "libslic3r/libslic3r.h" +#include "libslic3r/Config.hpp" namespace Slic3r { class PrintObject; diff --git a/src/libslic3r/Support/SupportSpotsGenerator.cpp b/src/libslic3r/Support/SupportSpotsGenerator.cpp index a3c312ee15..740521df78 100644 --- a/src/libslic3r/Support/SupportSpotsGenerator.cpp +++ b/src/libslic3r/Support/SupportSpotsGenerator.cpp @@ -1,6 +1,5 @@ #include "SupportSpotsGenerator.hpp" -#include "BoundingBox.hpp" #include "ExPolygon.hpp" #include "ExtrusionEntity.hpp" #include "ExtrusionEntityCollection.hpp" @@ -8,13 +7,6 @@ #include "GCode/ExtrusionProcessor.hpp" #include "Line.hpp" #include "Point.hpp" -#include "Polygon.hpp" -#include "PrincipalComponents2D.hpp" -#include "Print.hpp" -#include "PrintBase.hpp" -#include "PrintConfig.hpp" -#include "Tesselate.hpp" -#include "libslic3r.h" #include "tbb/parallel_for.h" #include "tbb/blocked_range.h" #include "tbb/blocked_range2d.h" @@ -34,10 +26,7 @@ #include #include "AABBTreeLines.hpp" -#include "KDTreeIndirect.hpp" #include "libslic3r/Layer.hpp" -#include "libslic3r/ClipperUtils.hpp" -#include "Geometry/ConvexHull.hpp" // #define DETAILED_DEBUG_LOGS // #define DEBUG_FILES diff --git a/src/libslic3r/Support/SupportSpotsGenerator.hpp b/src/libslic3r/Support/SupportSpotsGenerator.hpp index e3c3245d47..6e82084cfa 100644 --- a/src/libslic3r/Support/SupportSpotsGenerator.hpp +++ b/src/libslic3r/Support/SupportSpotsGenerator.hpp @@ -1,9 +1,6 @@ #ifndef SRC_LIBSLIC3R_SUPPORTABLEISSUESSEARCH_HPP_ #define SRC_LIBSLIC3R_SUPPORTABLEISSUESSEARCH_HPP_ -#include "Layer.hpp" -#include "Line.hpp" -#include "PrintBase.hpp" #include "PrintConfig.hpp" #include "MaterialType.hpp" #include @@ -12,6 +9,8 @@ #include #include +namespace Slic3r { class Layer; } + namespace Slic3r { diff --git a/src/libslic3r/Support/TreeModelVolumes.cpp b/src/libslic3r/Support/TreeModelVolumes.cpp index 5d1a3bdb20..d1d1b4d8cc 100644 --- a/src/libslic3r/Support/TreeModelVolumes.cpp +++ b/src/libslic3r/Support/TreeModelVolumes.cpp @@ -13,11 +13,9 @@ #include "../BuildVolume.hpp" #include "../ClipperUtils.hpp" -#include "../Flow.hpp" #include "../Layer.hpp" #include "../Point.hpp" #include "../Print.hpp" -#include "../PrintConfig.hpp" #include "../Utils.hpp" #include "../format.hpp" #include "libslic3r/libslic3r.h" diff --git a/src/libslic3r/Support/TreeModelVolumes.hpp b/src/libslic3r/Support/TreeModelVolumes.hpp index b2c1226dfe..36f5de9fd4 100644 --- a/src/libslic3r/Support/TreeModelVolumes.hpp +++ b/src/libslic3r/Support/TreeModelVolumes.hpp @@ -26,7 +26,6 @@ #include "../Point.hpp" #include "../Polygon.hpp" -#include "../PrintConfig.hpp" #include "libslic3r/libslic3r.h" namespace Slic3r diff --git a/src/libslic3r/Support/TreeSupport.cpp b/src/libslic3r/Support/TreeSupport.cpp index 10467012ff..26838de593 100644 --- a/src/libslic3r/Support/TreeSupport.cpp +++ b/src/libslic3r/Support/TreeSupport.cpp @@ -35,7 +35,6 @@ #include "Print.hpp" #include "ShortestPath.hpp" #include "SupportCommon.hpp" -#include "SVG.hpp" #include "TreeSupportCommon.hpp" #include "TreeSupport.hpp" #include "TreeSupport3D.hpp" @@ -63,6 +62,13 @@ #include #include #include +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/ExtrusionEntityCollection.hpp" +#include "libslic3r/Fill/Lightning/Layer.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/SurfaceCollection.hpp" #ifndef M_PI #define M_PI 3.1415926535897932384626433832795 diff --git a/src/libslic3r/Support/TreeSupport3D.cpp b/src/libslic3r/Support/TreeSupport3D.cpp index 09f741ec25..efd7492b00 100644 --- a/src/libslic3r/Support/TreeSupport3D.cpp +++ b/src/libslic3r/Support/TreeSupport3D.cpp @@ -67,6 +67,10 @@ #include #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "libslic3r/Slicing.hpp" #if defined(TREE_SUPPORT_SHOW_ERRORS) && defined(_WIN32) #define TREE_SUPPORT_SHOW_ERRORS_WIN32 diff --git a/src/libslic3r/Support/TreeSupport3D.hpp b/src/libslic3r/Support/TreeSupport3D.hpp index 65a5e22975..36fa251a95 100644 --- a/src/libslic3r/Support/TreeSupport3D.hpp +++ b/src/libslic3r/Support/TreeSupport3D.hpp @@ -10,14 +10,11 @@ #define slic3r_TreeSupport_hpp #include "libslic3r/Polygon.hpp" -#include "libslic3r/Layer.hpp" #include "SupportLayer.hpp" #include "TreeModelVolumes.hpp" #include "TreeSupportCommon.hpp" -#include "../BoundingBox.hpp" #include "../Point.hpp" -#include "../Utils.hpp" #include "libslic3r/libslic3r.h" #include @@ -29,6 +26,8 @@ #include #include +namespace Slic3r { class TreeSupport; } + // #define TREE_SUPPORT_SHOW_ERRORS diff --git a/src/libslic3r/Surface.hpp b/src/libslic3r/Surface.hpp index 1849e3462a..5e0c0461e4 100644 --- a/src/libslic3r/Surface.hpp +++ b/src/libslic3r/Surface.hpp @@ -2,15 +2,14 @@ #define slic3r_Surface_hpp_ #include "Polygon.hpp" -#include "Line.hpp" #include "Point.hpp" -#include "libslic3r.h" #include "ExPolygon.hpp" #include #include #include #include #include +#include "BoundingBox.hpp" namespace Slic3r { diff --git a/src/libslic3r/SurfaceCollection.hpp b/src/libslic3r/SurfaceCollection.hpp index 3b6316e0a4..3cc70e53f4 100644 --- a/src/libslic3r/SurfaceCollection.hpp +++ b/src/libslic3r/SurfaceCollection.hpp @@ -3,7 +3,6 @@ #include "Polygon.hpp" #include "ExPolygon.hpp" -#include "libslic3r.h" #include "Surface.hpp" #include #include diff --git a/src/libslic3r/Tesselate.cpp b/src/libslic3r/Tesselate.cpp index be7087a311..8222445622 100644 --- a/src/libslic3r/Tesselate.cpp +++ b/src/libslic3r/Tesselate.cpp @@ -12,6 +12,9 @@ #include #include #include +#include "Polygon.hpp" + +class GLUtesselator; namespace Slic3r { diff --git a/src/libslic3r/TextureBake/TextureBakeDebug.hpp b/src/libslic3r/TextureBake/TextureBakeDebug.hpp index b0cf0c1952..04dd91ab60 100644 --- a/src/libslic3r/TextureBake/TextureBakeDebug.hpp +++ b/src/libslic3r/TextureBake/TextureBakeDebug.hpp @@ -22,7 +22,8 @@ #include #include "libslic3r/Point.hpp" -#include "TextureBakeIndex.hpp" + +namespace Slic3r::TextureBake { struct TriSoup; } namespace Slic3r { diff --git a/src/libslic3r/TextureBake/TextureBakePipeline.hpp b/src/libslic3r/TextureBake/TextureBakePipeline.hpp index 43429ce22f..dbcc46259a 100644 --- a/src/libslic3r/TextureBake/TextureBakePipeline.hpp +++ b/src/libslic3r/TextureBake/TextureBakePipeline.hpp @@ -25,7 +25,6 @@ #include "TextureBakeRegularize.hpp" #include "TextureBakeFlip.hpp" #include "TextureBakeRelocate.hpp" -#include "TextureBakeRepair.hpp" #include "TextureBakeSubdivide.hpp" namespace Slic3r { diff --git a/src/libslic3r/TextureDisplacement.cpp b/src/libslic3r/TextureDisplacement.cpp index 46a7cb18b4..165605b738 100644 --- a/src/libslic3r/TextureDisplacement.cpp +++ b/src/libslic3r/TextureDisplacement.cpp @@ -47,6 +47,7 @@ #include "TextureBake/TextureBakeDebug.hpp" #include "TextureBake/TextureBakeMesh.hpp" #include "TextureBake/TextureBakePipeline.hpp" +#include "TextureBake/TextureBakeIndex.hpp" namespace Slic3r { diff --git a/src/libslic3r/TextureDisplacement.hpp b/src/libslic3r/TextureDisplacement.hpp index afe6a42911..94d717dea6 100644 --- a/src/libslic3r/TextureDisplacement.hpp +++ b/src/libslic3r/TextureDisplacement.hpp @@ -18,7 +18,6 @@ #include #include "Point.hpp" -#include "TriangleMesh.hpp" #include "TriangleSelector.hpp" namespace Slic3r { diff --git a/src/libslic3r/TexturePainting.cpp b/src/libslic3r/TexturePainting.cpp index e44f870b5d..1bcddfd3d2 100644 --- a/src/libslic3r/TexturePainting.cpp +++ b/src/libslic3r/TexturePainting.cpp @@ -28,6 +28,7 @@ #include "TextureToColor/TriMesh.hpp" #include "TriangleMesh.hpp" #include "TriangleSelector.hpp" +#include "BoundingBox.hpp" namespace Slic3r { diff --git a/src/libslic3r/TextureToColor/ColorUtils.hpp b/src/libslic3r/TextureToColor/ColorUtils.hpp index 89e6095923..e9b1be3623 100644 --- a/src/libslic3r/TextureToColor/ColorUtils.hpp +++ b/src/libslic3r/TextureToColor/ColorUtils.hpp @@ -1,6 +1,5 @@ #pragma once -#include "Callbacks.hpp" #include "libslic3r/Point.hpp" #include "TriMesh.hpp" #include diff --git a/src/libslic3r/TextureToColor/TextureToColor.hpp b/src/libslic3r/TextureToColor/TextureToColor.hpp index a88fe2086e..49b8f4fc68 100644 --- a/src/libslic3r/TextureToColor/TextureToColor.hpp +++ b/src/libslic3r/TextureToColor/TextureToColor.hpp @@ -11,6 +11,8 @@ #include #include +namespace cv { class Mat; } + namespace Slic3r { namespace tex2color { enum class MeshRepairDecision { diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp index 066656c9ed..ce3e5e8bdd 100644 --- a/src/libslic3r/Thread.cpp +++ b/src/libslic3r/Thread.cpp @@ -22,7 +22,6 @@ #include #include "Thread.hpp" -#include "Utils.hpp" namespace Slic3r { diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp index 2f047e4e7f..c0623ac824 100644 --- a/src/libslic3r/TriangleMesh.cpp +++ b/src/libslic3r/TriangleMesh.cpp @@ -1,5 +1,4 @@ #include "BoundingBox.hpp" -#include "Exception.hpp" #include "TriangleMesh.hpp" #include "Polygon.hpp" #include "TriangleMeshSlicer.hpp" @@ -10,9 +9,7 @@ #include "Point.hpp" #include "Execution/ExecutionTBB.hpp" #include "Execution/ExecutionSeq.hpp" -#include "CutUtils.hpp" #include "Utils.hpp" -#include "Format/STL.hpp" #include "libslic3r.h" #include #include @@ -46,6 +43,7 @@ #include #include +#include "ExtrusionEntity.hpp" namespace Slic3r { diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp index 2bd5e94622..23674b738b 100644 --- a/src/libslic3r/TriangleMeshSlicer.cpp +++ b/src/libslic3r/TriangleMeshSlicer.cpp @@ -1,6 +1,5 @@ #include "ClipperUtils.hpp" #include "ExPolygon.hpp" -#include "Geometry.hpp" #include "Point.hpp" #include "Line.hpp" #include "MultiPoint.hpp" @@ -10,7 +9,6 @@ #include "TriangleMeshSlicer.hpp" #include "Utils.hpp" // BBS -#include "MeshBoolean.hpp" #include "libslic3r.h" #include diff --git a/src/libslic3r/TriangleSelector.cpp b/src/libslic3r/TriangleSelector.cpp index 7314b00082..df23e3db85 100644 --- a/src/libslic3r/TriangleSelector.cpp +++ b/src/libslic3r/TriangleSelector.cpp @@ -1,6 +1,5 @@ #include "TriangleSelector.hpp" #include "Geometry.hpp" -#include "Model.hpp" #include "AABBTreeIndirect.hpp" #include "Point.hpp" #include "libslic3r.h" diff --git a/src/libslic3r/TriangulateWall.cpp b/src/libslic3r/TriangulateWall.cpp index b8746ef0d2..df8fffe184 100644 --- a/src/libslic3r/TriangulateWall.cpp +++ b/src/libslic3r/TriangulateWall.cpp @@ -1,5 +1,4 @@ #include "TriangulateWall.hpp" -#include "MTUtils.hpp" namespace Slic3r { diff --git a/src/libslic3r/VariableWidth.hpp b/src/libslic3r/VariableWidth.hpp index 7b8f1f4b0a..9518a4b073 100644 --- a/src/libslic3r/VariableWidth.hpp +++ b/src/libslic3r/VariableWidth.hpp @@ -1,12 +1,12 @@ #ifndef slic3r_VariableWidth_hpp_ #define slic3r_VariableWidth_hpp_ -#include "Polygon.hpp" #include "ExtrusionEntity.hpp" -#include "Flow.hpp" #include "Polyline.hpp" #include +namespace Slic3r { class Flow; } + namespace Slic3r { ExtrusionMultiPath thick_polyline_to_multi_path(const ThickPolyline& thick_polyline, ExtrusionRole role, const Flow& flow, const float tolerance, const float merge_tolerance); void variable_width(const ThickPolylines& polylines, ExtrusionRole role, const Flow& flow, std::vector& out); diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp index dd6d8592b7..a6aecda210 100644 --- a/src/libslic3r/calib.cpp +++ b/src/libslic3r/calib.cpp @@ -18,6 +18,7 @@ #include #include #include +#include "clonable_ptr.hpp" namespace Slic3r { diff --git a/src/libslic3r/clonable_ptr.hpp b/src/libslic3r/clonable_ptr.hpp index a3b7ee2446..d2fcd6a535 100644 --- a/src/libslic3r/clonable_ptr.hpp +++ b/src/libslic3r/clonable_ptr.hpp @@ -1,3 +1,5 @@ +#pragma once + // clonable_ptr: a smart pointer with a usage similar to unique_ptr, with the exception, that // the copy constructor / copy assignment operator work by calling the ->clone() method. diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h index bc32a8c60f..d3b0faa57f 100644 --- a/src/libslic3r/libslic3r.h +++ b/src/libslic3r/libslic3r.h @@ -38,7 +38,6 @@ #include #endif // _WIN32 -#include "Technologies.hpp" #include "Semver.hpp" #if 0 diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index 6205f11219..a8e47ddded 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -54,7 +54,6 @@ #include "Semver.hpp" #include "format.hpp" #include "Platform.hpp" -#include "Time.hpp" #include "libslic3r.h" // For the vendor-installation helpers: the vendor profile version // (get_version_from_json) and the preset cache stamp (VendorCacheFile). @@ -120,6 +119,8 @@ // We are using quite an old TBB 2017 U7, which does not support global control API officially. // Before we update our build servers, let's use the old API, which is deprecated in up to date TBB. #include + +namespace boost::posix_time { class ptime; } #if ! defined(TBB_VERSION_MAJOR) #include #endif diff --git a/src/slic3r/Config/Version.hpp b/src/slic3r/Config/Version.hpp index 5e10e9ab95..9a9d0d090e 100644 --- a/src/slic3r/Config/Version.hpp +++ b/src/slic3r/Config/Version.hpp @@ -7,7 +7,6 @@ #include -#include "libslic3r/FileParserError.hpp" #include "libslic3r/Semver.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp index 4bf71c2d50..46335271f4 100644 --- a/src/slic3r/GUI/2DBed.cpp +++ b/src/slic3r/GUI/2DBed.cpp @@ -3,6 +3,7 @@ #include "3DBed.hpp" #include "PartPlate.hpp" +#include "I18N.hpp" #include #include "libslic3r/Polyline.hpp" @@ -15,7 +16,6 @@ #include "libslic3r/Color.hpp" #include #include -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include "slic3r/GUI/Widgets/StateColor.hpp" #include #include @@ -29,6 +29,8 @@ #include "libslic3r/Geometry.hpp" #include "libslic3r/ClipperUtils.hpp" +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/AVVideoDecoder.hpp b/src/slic3r/GUI/AVVideoDecoder.hpp index 2e3a7ab616..1ba64be944 100644 --- a/src/slic3r/GUI/AVVideoDecoder.hpp +++ b/src/slic3r/GUI/AVVideoDecoder.hpp @@ -13,6 +13,9 @@ extern "C" { #include #include +class wxImage; +struct SwsContext; + class wxBitmap; class AVVideoDecoder diff --git a/src/slic3r/GUI/AboutDialog.hpp b/src/slic3r/GUI/AboutDialog.hpp index 61ccb4bc72..87864fd0e1 100644 --- a/src/slic3r/GUI/AboutDialog.hpp +++ b/src/slic3r/GUI/AboutDialog.hpp @@ -13,6 +13,12 @@ #include "GUI_Utils.hpp" #include "wxExtensions.hpp" +class wxEvent; +class wxHtmlLinkEvent; +class wxHtmlWindow; +class wxStaticBitmap; +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index b1d5f7948e..ad657f35b3 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -2,14 +2,12 @@ #include "I18N.hpp" #include "libslic3r/Utils.hpp" -#include "libslic3r/Thread.hpp" #include "slic3r/Utils/WxFontUtils.hpp" #include "GUI.hpp" #include "GUI_App.hpp" #include "DeviceCore/DevConfigUtil.h" #include "GUI_Preview.hpp" #include "MainFrame.hpp" -#include "format.hpp" #include "Widgets/ProgressDialog.hpp" #include #include @@ -57,7 +55,6 @@ #include #include #include "Plater.hpp" -#include "BitmapCache.hpp" #include "BindDialog.hpp" #include "FilamentBitmapUtils.hpp" @@ -68,6 +65,11 @@ #include "DeviceTab/wgtDeviceNozzleSelect.h" #include "DeviceTab/wgtMsgPanel.h" +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" namespace Slic3r { namespace GUI { #define MATERIAL_ITEM_SIZE wxSize(FromDIP(65), FromDIP(50)) diff --git a/src/slic3r/GUI/AmsMappingPopupUpdate.cpp b/src/slic3r/GUI/AmsMappingPopupUpdate.cpp index 4aed4e6545..309cdab868 100644 --- a/src/slic3r/GUI/AmsMappingPopupUpdate.cpp +++ b/src/slic3r/GUI/AmsMappingPopupUpdate.cpp @@ -16,10 +16,6 @@ #include "GUI_App.hpp" #include "GUI_Preview.hpp" #include "MainFrame.hpp" -#include "format.hpp" -#include "Widgets/ProgressDialog.hpp" -#include "Widgets/RoundedRectangle.hpp" -#include "Widgets/StaticBox.hpp" #include #include @@ -41,7 +37,6 @@ #include #include #include "Plater.hpp" -#include "BitmapCache.hpp" #include "DeviceCore/DevFilaSystem.h" #include "DeviceCore/DevFilaSwitch.h" @@ -50,6 +45,15 @@ #include "DeviceTab/wgtDeviceNozzleSelect.h" #include "DeviceTab/wgtMsgPanel.h" +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" +#include "slic3r/GUI/DeviceCore/DevUtil.h" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/wxExtensions.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/AmsWidgets.cpp b/src/slic3r/GUI/AmsWidgets.cpp index effbbaabc7..7d7a1d459c 100644 --- a/src/slic3r/GUI/AmsWidgets.cpp +++ b/src/slic3r/GUI/AmsWidgets.cpp @@ -4,16 +4,13 @@ #include #include #include +#include #include -#include "GUI_App.hpp" -#include "GUI_ObjectList.hpp" -#include "Plater.hpp" -#include "MainFrame.hpp" -#include "Widgets/Label.hpp" -#include "format.hpp" #include "DeviceCore/DevFilaSystem.h" +#include "slic3r/GUI/DeviceCore/DevUtil.h" +#include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index cc30da4b4a..cabda0fc84 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -26,7 +26,6 @@ #include "slic3r/GUI/Tabbook.hpp" #include #include -#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include "slic3r/GUI/Widgets/ComboBox.hpp" #include #include @@ -64,6 +63,8 @@ #include "GUI_ObjectList.hpp" #include "MainFrame.hpp" #include "Widgets/Label.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Plater.hpp" namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp index 2022722da7..e1bd6ef8a7 100644 --- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp +++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp @@ -1,6 +1,4 @@ #include "AuxiliaryDataViewModel.hpp" -#include "libslic3r/libslic3r.h" -#include "libslic3r/Model.hpp" #include "libslic3r/Format/bbs_3mf.hpp" @@ -20,6 +18,9 @@ #include #include #include +#include "libslic3r/Format/STEP.hpp" +#include "slic3r/GUI/I18N.hpp" +#include namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp index 3b7764f16d..026f22421b 100644 --- a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp +++ b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp @@ -6,7 +6,6 @@ #include "wx/hashmap.h" #include "wx/vector.h" -#include "I18N.hpp" #include #include diff --git a/src/slic3r/GUI/AuxiliaryDialog.cpp b/src/slic3r/GUI/AuxiliaryDialog.cpp index 64c333146f..5c941f4fa4 100644 --- a/src/slic3r/GUI/AuxiliaryDialog.cpp +++ b/src/slic3r/GUI/AuxiliaryDialog.cpp @@ -2,7 +2,6 @@ #include "I18N.hpp" #include "GUI_AuxiliaryList.hpp" -#include "libslic3r/Utils.hpp" #include #include "slic3r/GUI/GUI_Utils.hpp" @@ -11,6 +10,8 @@ #include #include +class wxWindow; + namespace pt = boost::property_tree; typedef pt::ptree JSON; diff --git a/src/slic3r/GUI/AuxiliaryDialog.hpp b/src/slic3r/GUI/AuxiliaryDialog.hpp index 09a3dc8145..0cb6525d6f 100644 --- a/src/slic3r/GUI/AuxiliaryDialog.hpp +++ b/src/slic3r/GUI/AuxiliaryDialog.hpp @@ -6,7 +6,8 @@ #include #include "GUI_Utils.hpp" -#include "wxExtensions.hpp" + +class wxWindow; class AuxiliaryList; diff --git a/src/slic3r/GUI/BBLStatusBar.cpp b/src/slic3r/GUI/BBLStatusBar.cpp index 37e1bcf9d3..727644013e 100644 --- a/src/slic3r/GUI/BBLStatusBar.cpp +++ b/src/slic3r/GUI/BBLStatusBar.cpp @@ -13,7 +13,6 @@ #include #include -#include "GUI_App.hpp" #include "I18N.hpp" diff --git a/src/slic3r/GUI/BBLStatusBarBind.cpp b/src/slic3r/GUI/BBLStatusBarBind.cpp index c2da7f59ea..c7236f85ad 100644 --- a/src/slic3r/GUI/BBLStatusBarBind.cpp +++ b/src/slic3r/GUI/BBLStatusBarBind.cpp @@ -12,11 +12,10 @@ #include #include "wx/evtloop.h" #include -#include "GUI_App.hpp" -#include "I18N.hpp" #include +#include "slic3r/GUI/Widgets/Button.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/BBLStatusBarBind.hpp b/src/slic3r/GUI/BBLStatusBarBind.hpp index f46dec4bcc..dd647aa26c 100644 --- a/src/slic3r/GUI/BBLStatusBarBind.hpp +++ b/src/slic3r/GUI/BBLStatusBarBind.hpp @@ -11,19 +11,16 @@ #include #include #include +#include #include "Jobs/ProgressIndicator.hpp" -#include "Widgets/Label.hpp" -#include "Widgets/Button.hpp" -class wxTimer; +class Button; +class wxBoxSizer; +class wxPanel; +class wxStaticText; + class wxGauge; -class wxButton; -class wxTimerEvent; -class wxStatusBar; class wxWindow; -class wxFrame; -class wxString; -class wxFont; namespace Slic3r { diff --git a/src/slic3r/GUI/BBLStatusBarPrint.cpp b/src/slic3r/GUI/BBLStatusBarPrint.cpp index 88d33dcbdc..bbacc84bf4 100644 --- a/src/slic3r/GUI/BBLStatusBarPrint.cpp +++ b/src/slic3r/GUI/BBLStatusBarPrint.cpp @@ -17,7 +17,6 @@ #include #include "wx/evtloop.h" #include -#include "GUI_App.hpp" #include "I18N.hpp" diff --git a/src/slic3r/GUI/BBLStatusBarSend.cpp b/src/slic3r/GUI/BBLStatusBarSend.cpp index 4ada6ac95a..381281ea0a 100644 --- a/src/slic3r/GUI/BBLStatusBarSend.cpp +++ b/src/slic3r/GUI/BBLStatusBarSend.cpp @@ -15,7 +15,6 @@ #include #include "wx/evtloop.h" #include -#include "GUI_App.hpp" #include "I18N.hpp" diff --git a/src/slic3r/GUI/BBLTopbar.cpp b/src/slic3r/GUI/BBLTopbar.cpp index ba377ca21d..581c4b3523 100644 --- a/src/slic3r/GUI/BBLTopbar.cpp +++ b/src/slic3r/GUI/BBLTopbar.cpp @@ -28,6 +28,7 @@ #include "PartPlate.hpp" #include +#include "libslic3r/AppConfig.hpp" #ifdef __WXGTK__ #include diff --git a/src/slic3r/GUI/BBLTopbar.hpp b/src/slic3r/GUI/BBLTopbar.hpp index c2ee17a2b7..d84d922c72 100644 --- a/src/slic3r/GUI/BBLTopbar.hpp +++ b/src/slic3r/GUI/BBLTopbar.hpp @@ -4,12 +4,19 @@ #include "wx/aui/auibar.h" #include "SelectMachine.hpp" -#include "DeviceManager.hpp" #include #include #include #include +#include "slic3r/GUI/DeviceCore/DevDefs.h" + +class wxFrame; +class wxMenuEvent; +class wxMenuItem; +class wxMouseCaptureLostEvent; +class wxMouseEvent; +class wxWindow; using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp index 423f8b68b2..f2da864a4d 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp @@ -56,6 +56,10 @@ #include "libslic3r_version.h" #include "slic3r/GUI/Plater.hpp" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/Utils/PrintHost.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.hpp b/src/slic3r/GUI/BackgroundSlicingProcess.hpp index b1020cf4c9..cebeb52e0f 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.hpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.hpp @@ -23,7 +23,11 @@ #include "libslic3r/Format/SL1.hpp" #include "slic3r/Utils/PrintHost.hpp" #include "libslic3r/GCode/GCodeProcessor.hpp" -#include "PartPlate.hpp" + +namespace Slic3r { class Polygon; } +namespace Slic3r { class Print; } +namespace Slic3r::GUI { class PartPlate; } +namespace Slic3r::GUI { class Plater; } namespace boost { namespace filesystem { class path; } } diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp index 81e0fb7baf..14575aa988 100644 --- a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp +++ b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp @@ -4,7 +4,6 @@ #include "slic3r/GUI/Widgets/StateColor.hpp" #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/Widgets/Label.hpp" -#include "slic3r/GUI/Event.hpp" #include #include #include @@ -13,20 +12,16 @@ #include #include #include "GUI_App.hpp" -#include "Tab.hpp" -#include "PartPlate.hpp" -#include "I18N.hpp" #include "MainFrame.hpp" #include "Widgets/Button.hpp" -#include "Widgets/TextInput.hpp" -#include "Notebook.hpp" #include #include #include #include #include "Widgets/Button.hpp" -#include "Widgets/CheckBox.hpp" #include "CapsuleButton.hpp" + +namespace Slic3r::GUI { struct IntEvent; } using namespace Slic3r; using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.hpp b/src/slic3r/GUI/BaseTransparentDPIFrame.hpp index e63e23c079..05fcdc9436 100644 --- a/src/slic3r/GUI/BaseTransparentDPIFrame.hpp +++ b/src/slic3r/GUI/BaseTransparentDPIFrame.hpp @@ -2,18 +2,22 @@ #define _BaseTransparentDPIFrame_H_ #include -#include "slic3r/GUI/Event.hpp" #include -#include "GUI_App.hpp" #include "GUI_Utils.hpp" #include #include #include #include +class wxBoxSizer; +class wxSizer; +class wxTimer; +class wxTimerEvent; +class wxWindow; +namespace Slic3r::GUI { struct IntEvent; } + class Button; class Label; -class CheckBox; namespace Slic3r { namespace GUI { class CapsuleButton; diff --git a/src/slic3r/GUI/BonjourDialog.hpp b/src/slic3r/GUI/BonjourDialog.hpp index 2af82f8410..24b70b71de 100644 --- a/src/slic3r/GUI/BonjourDialog.hpp +++ b/src/slic3r/GUI/BonjourDialog.hpp @@ -2,7 +2,6 @@ #define slic3r_BonjourDialog_hpp_ #include -#include "libslic3r/Config.hpp" #include #include @@ -12,13 +11,15 @@ #include #include -#include "libslic3r/PrintConfig.hpp" +class wxWindow; +namespace Slic3r { enum PrinterTechnology : unsigned char; } +namespace boost::asio::ip { class address; } + class wxListView; class wxStaticText; class wxTimer; class wxTimerEvent; -class address; namespace Slic3r { diff --git a/src/slic3r/GUI/CAD/DesignCanvas.cpp b/src/slic3r/GUI/CAD/DesignCanvas.cpp index 1abfd81feb..03fa10cfeb 100644 --- a/src/slic3r/GUI/CAD/DesignCanvas.cpp +++ b/src/slic3r/GUI/CAD/DesignCanvas.cpp @@ -42,6 +42,7 @@ #include #include #include +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CAD/DesignCanvas.hpp b/src/slic3r/GUI/CAD/DesignCanvas.hpp index 3f87eb434b..56d765d702 100644 --- a/src/slic3r/GUI/CAD/DesignCanvas.hpp +++ b/src/slic3r/GUI/CAD/DesignCanvas.hpp @@ -3,7 +3,6 @@ #include #include "libslic3r/Point.hpp" -#include "libslic3r/CAD/CadDocument.hpp" #include "libslic3r/Color.hpp" #include #include @@ -22,8 +21,14 @@ #include "libslic3r/CAD/SketchEngine.hpp" #include "slic3r/GUI/CAD/DesignSketchTool.hpp" +class wxActivateEvent; +class wxEvent; +class wxIconizeEvent; +class wxPopupWindow; +class wxWindow; +namespace Slic3r { struct CadBody; } + class wxGLCanvas; -class wxFrame; class wxStaticText; namespace Slic3r { diff --git a/src/slic3r/GUI/CAD/DesignPanel.cpp b/src/slic3r/GUI/CAD/DesignPanel.cpp index 3b4f9bd640..d51da4c6b4 100644 --- a/src/slic3r/GUI/CAD/DesignPanel.cpp +++ b/src/slic3r/GUI/CAD/DesignPanel.cpp @@ -87,7 +87,6 @@ #include "slic3r/GUI/wxExtensions.hpp" // ScalableButton, create_scaled_bitmap #include "slic3r/GUI/Widgets/Label.hpp" // HarmonyOS Sans fonts (Head_*/Body_*) shared with the rest of Orca #include "slic3r/GUI/Widgets/DropDown.hpp" // Orca-themed combo dropdown (white/teal selector) for the tool flyouts -#include "slic3r/GUI/Widgets/Button.hpp" // Orca-styled Button (ButtonStyle/ButtonType) — same look as Prepare #include "slic3r/GUI/Widgets/CheckBox.hpp" // Orca teal check (label lives in the row's left column) #include "slic3r/GUI/Widgets/ComboBox.hpp" // Orca dropdown — replaces wxChoice in every Design card #include "slic3r/GUI/Widgets/StaticBox.hpp" // Prepare's rounded white card frame around each tool dialog @@ -99,6 +98,7 @@ #include "libslic3r/BuildVolume.hpp" #include "slic3r/GUI/MainFrame.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" +#include "slic3r/GUI/I18N.hpp" // English-only pin for the Design tab (see design-ux-contract): one lever // de-translates this whole TU so our strings never half-translate against the host's diff --git a/src/slic3r/GUI/CAD/DesignSketchTool.cpp b/src/slic3r/GUI/CAD/DesignSketchTool.cpp index d4883b4ba6..5e27a0781a 100644 --- a/src/slic3r/GUI/CAD/DesignSketchTool.cpp +++ b/src/slic3r/GUI/CAD/DesignSketchTool.cpp @@ -42,6 +42,11 @@ #include #include #include +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/GLSelectionRectangle.hpp" + +class TopoDS_Shape; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CAD/DesignSketchTool.hpp b/src/slic3r/GUI/CAD/DesignSketchTool.hpp index a68cfc2b88..f6a3dd2f07 100644 --- a/src/slic3r/GUI/CAD/DesignSketchTool.hpp +++ b/src/slic3r/GUI/CAD/DesignSketchTool.hpp @@ -5,7 +5,6 @@ #include "libslic3r/CAD/SketchEngine.hpp" #include "libslic3r/CAD/CadDocument.hpp" // CadBody for per-body solid picking #include "libslic3r/CAD/SketchInference.hpp" -#include "libslic3r/CAD/SketchSolver.hpp" #include "slic3r/GUI/GLModel.hpp" #include "slic3r/GUI/GLSelectionRectangle.hpp" // left-drag rubber band over the committed bodies #include diff --git a/src/slic3r/GUI/CAD/SketchInlineEditor.cpp b/src/slic3r/GUI/CAD/SketchInlineEditor.cpp index effb949f66..d2376be633 100644 --- a/src/slic3r/GUI/CAD/SketchInlineEditor.cpp +++ b/src/slic3r/GUI/CAD/SketchInlineEditor.cpp @@ -1,7 +1,6 @@ #include "slic3r/GUI/CAD/SketchInlineEditor.hpp" #include "slic3r/GUI/ImGuiWrapper.hpp" -#include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "libslic3r/Color.hpp" diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp index babc7e959f..290c0052cb 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp @@ -1,8 +1,6 @@ #include "CalibrationWizardCaliPage.hpp" #include "CalibUtils.hpp" -#include "MainFrame.hpp" #include "I18N.hpp" -#include "Widgets/Label.hpp" #include "DeviceCore/DevManager.h" #include @@ -22,6 +20,14 @@ #include "slic3r/GUI/GUI.hpp" #include "libslic3r/Utils.hpp" #include +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/Monitor.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" + +class wxWindow; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index 0c4abb8070..7017d52e34 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -19,7 +19,6 @@ #include #include #include "slic3r/GUI/PresetComboBoxes.hpp" -#include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/wxExtensions.hpp" #include #include "slic3r/GUI/Widgets/HyperLink.hpp" @@ -31,6 +30,8 @@ #include #include +namespace Slic3r { class DynamicPrintConfig; } + namespace Slic3r { namespace GUI { wxDEFINE_EVENT(EVT_CALI_ACTION, wxCommandEvent); diff --git a/src/slic3r/GUI/CameraPopup.cpp b/src/slic3r/GUI/CameraPopup.cpp index 299aaa85fc..32e64d5e65 100644 --- a/src/slic3r/GUI/CameraPopup.cpp +++ b/src/slic3r/GUI/CameraPopup.cpp @@ -3,7 +3,6 @@ #include "I18N.hpp" #include "Widgets/Label.hpp" #include "libslic3r/Utils.hpp" -#include "BitmapCache.hpp" #include #include "slic3r/GUI/Widgets/PopupWindow.hpp" #include diff --git a/src/slic3r/GUI/CameraUtils.cpp b/src/slic3r/GUI/CameraUtils.cpp index ace1225394..7f58243612 100644 --- a/src/slic3r/GUI/CameraUtils.cpp +++ b/src/slic3r/GUI/CameraUtils.cpp @@ -14,6 +14,8 @@ #include "slic3r/GUI/3DScene.hpp" // GLVolume #include "libslic3r/Geometry/ConvexHull.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Geometry.hpp" using namespace Slic3r; using namespace GUI; diff --git a/src/slic3r/GUI/CloneDialog.cpp b/src/slic3r/GUI/CloneDialog.cpp index 1c52b8cdb4..a34dbfa4a4 100644 --- a/src/slic3r/GUI/CloneDialog.cpp +++ b/src/slic3r/GUI/CloneDialog.cpp @@ -4,7 +4,6 @@ #include "MainFrame.hpp" #include "slic3r/GUI/GUI_Utils.hpp" #include -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include #include "slic3r/GUI/Widgets/Label.hpp" @@ -20,6 +19,12 @@ #include "slic3r/GUI/Selection.hpp" #include #include "slic3r/GUI/Jobs/Job.hpp" +#include "libslic3r/AppConfig.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Plater.hpp" + +class wxWindow; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ColorDecomposeSupport.cpp b/src/slic3r/GUI/ColorDecomposeSupport.cpp index 35ba3ffeb8..60de61991c 100644 --- a/src/slic3r/GUI/ColorDecomposeSupport.cpp +++ b/src/slic3r/GUI/ColorDecomposeSupport.cpp @@ -21,6 +21,10 @@ #include "libslic3r/Config.hpp" #include #include +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/ColorDecomposeRecipe.hpp" +#include "libslic3r/FilamentMixer.hpp" +#include "libslic3r/PrintConfig.hpp" using json = nlohmann::json; diff --git a/src/slic3r/GUI/ConfigManipulation.hpp b/src/slic3r/GUI/ConfigManipulation.hpp index 8e189a541c..d2316e69bb 100644 --- a/src/slic3r/GUI/ConfigManipulation.hpp +++ b/src/slic3r/GUI/ConfigManipulation.hpp @@ -8,8 +8,6 @@ * and local config (overrides options on sidebar) * */ -#include "libslic3r/PrintConfig.hpp" -#include "Field.hpp" #include #include #include @@ -18,6 +16,10 @@ #include #include +class wxWindow; +namespace Slic3r { class DynamicPrintConfig; } +namespace boost { class any; } + namespace Slic3r { class ModelConfig; diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 2ff1dd0ee3..1cbadfff01 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -64,7 +64,6 @@ #include #endif // _MSW_DARK_MODE -#include "libslic3r/Platform.hpp" #include "libslic3r/Utils.hpp" #include "libslic3r/Config.hpp" #include "libslic3r/libslic3r.h" diff --git a/src/slic3r/GUI/CrealityDiscoveryDialog.hpp b/src/slic3r/GUI/CrealityDiscoveryDialog.hpp index 2aa347a456..dec962a184 100644 --- a/src/slic3r/GUI/CrealityDiscoveryDialog.hpp +++ b/src/slic3r/GUI/CrealityDiscoveryDialog.hpp @@ -6,6 +6,8 @@ #include #include +class wxWindow; + class wxListView; class wxStaticText; diff --git a/src/slic3r/GUI/DailyTips.cpp b/src/slic3r/GUI/DailyTips.cpp index 51079f856c..8bace894e1 100644 --- a/src/slic3r/GUI/DailyTips.cpp +++ b/src/slic3r/GUI/DailyTips.cpp @@ -9,10 +9,10 @@ #include "slic3r/GUI/ImGuiWrapper.hpp" #include #include -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include "slic3r/GUI/HintNotification.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/I18N.hpp" #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp index aa5097a60e..9dc5655709 100644 --- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp +++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "slic3r/GUI/Plater.hpp" #ifdef __linux__ #include "DesktopIntegrationDialog.hpp" #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp index d1e210f940..ee9c8f00e8 100644 --- a/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp @@ -2,7 +2,6 @@ #include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" -#include "slic3r/Utils/NetworkAgent.hpp" #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevCtrl.cpp index e9301ad9a8..56547e2a03 100644 --- a/src/slic3r/GUI/DeviceCore/DevCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevCtrl.cpp @@ -4,7 +4,6 @@ #include "DevCtrl.h" // TODO: remove this include -#include "DevUtil.h" #include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevCtrl.h b/src/slic3r/GUI/DeviceCore/DevCtrl.h index 8dde98ec35..55d0dc4c3e 100644 --- a/src/slic3r/GUI/DeviceCore/DevCtrl.h +++ b/src/slic3r/GUI/DeviceCore/DevCtrl.h @@ -1,5 +1,4 @@ #pragma once -#include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" #include diff --git a/src/slic3r/GUI/DeviceCore/DevFan.cpp b/src/slic3r/GUI/DeviceCore/DevFan.cpp index 30edbcdf35..52ac9f1d76 100644 --- a/src/slic3r/GUI/DeviceCore/DevFan.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFan.cpp @@ -8,8 +8,6 @@ #include #include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" -#include "slic3r/GUI/GUI.hpp" -#include "slic3r/GUI/GUI_App.hpp" using namespace nlohmann; void Slic3r::DevFan::converse_to_duct(bool is_suppt_part_fun, bool is_suppt_aux_fun, bool is_suppt_cham_fun) diff --git a/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.cpp b/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.cpp index 119fd443c4..c14e5fbd84 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.cpp @@ -1,5 +1,6 @@ #include "DevFilaAmsSetting.h" #include "DevUtil.h" +#include "slic3r/GUI/DeviceCore/DevCtrl.h" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp index d9342a4c21..cc8312ce9a 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp @@ -4,6 +4,7 @@ #include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include +#include "slic3r/GUI/DeviceCore/DevCtrl.h" namespace Slic3r { int DevAmsSystemFirmwareSwitch::CrtlSwitchFirmware(int firmware_idx) diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp index bef0391109..14880a6ef3 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp @@ -24,11 +24,12 @@ // TODO: remove this include #include "slic3r/GUI/DeviceManager.hpp" -#include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "DevUtil.h" #include "DevUtilBackend.h" +#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h" +#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp index e2972a3254..16121f00d2 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp @@ -4,7 +4,6 @@ #include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp"// TODO: remove this include -#include "DevUtil.h" using namespace nlohmann; namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevFirmware.cpp b/src/slic3r/GUI/DeviceCore/DevFirmware.cpp index 1975bbe41a..5aa5a90d81 100644 --- a/src/slic3r/GUI/DeviceCore/DevFirmware.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFirmware.cpp @@ -1,2 +1 @@ #include "DevFirmware.h" -#include "slic3r/GUI/DeviceManager.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevHMS.h b/src/slic3r/GUI/DeviceCore/DevHMS.h index 6be4545e89..82022833cf 100644 --- a/src/slic3r/GUI/DeviceCore/DevHMS.h +++ b/src/slic3r/GUI/DeviceCore/DevHMS.h @@ -1,5 +1,4 @@ #pragma once -#include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" #include diff --git a/src/slic3r/GUI/DeviceCore/DevInfo.cpp b/src/slic3r/GUI/DeviceCore/DevInfo.cpp index 4c97ee36f5..25914a4b41 100644 --- a/src/slic3r/GUI/DeviceCore/DevInfo.cpp +++ b/src/slic3r/GUI/DeviceCore/DevInfo.cpp @@ -1,5 +1,4 @@ #include "DevInfo.h" -#include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevInfo.h b/src/slic3r/GUI/DeviceCore/DevInfo.h index 259c277e46..7603992478 100644 --- a/src/slic3r/GUI/DeviceCore/DevInfo.h +++ b/src/slic3r/GUI/DeviceCore/DevInfo.h @@ -1,6 +1,5 @@ #pragma once #include -#include "slic3r/Utils/json_diff.hpp" #include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.cpp b/src/slic3r/GUI/DeviceCore/DevMapping.cpp index c98fc4bbfb..1ad35d3ee9 100644 --- a/src/slic3r/GUI/DeviceCore/DevMapping.cpp +++ b/src/slic3r/GUI/DeviceCore/DevMapping.cpp @@ -19,7 +19,6 @@ // TODO: remove this include #include "slic3r/GUI/DeviceManager.hpp" -#include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/GuiColor.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.h b/src/slic3r/GUI/DeviceCore/DevMapping.h index 52094f92b9..215c849be3 100644 --- a/src/slic3r/GUI/DeviceCore/DevMapping.h +++ b/src/slic3r/GUI/DeviceCore/DevMapping.h @@ -1,11 +1,10 @@ #pragma once -#include "libslic3r/CommonDefs.hpp" -#include "libslic3r/ProjectTask.hpp" -#include "slic3r/Utils/json_diff.hpp" #include #include +namespace Slic3r { struct FilamentInfo; } + namespace Slic3r { //Previous definitions diff --git a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp index 125e0acc68..ee935a58a0 100644 --- a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp +++ b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp @@ -1,4 +1,3 @@ -#include "DevMapping.h" #include "DevMappingNozzle.h" #include "DevNozzleRack.h" @@ -9,7 +8,6 @@ #include "json_diff.hpp" #include "libslic3r/MultiNozzleUtils.hpp" -#include "libslic3r/Print.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/Plater.hpp" @@ -29,6 +27,8 @@ #include #include #include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/ProjectTask.hpp" using namespace nlohmann; namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp index df82de7855..af0919dcde 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp @@ -1,7 +1,6 @@ #include "DevNozzleRack.h" #include "DevUtil.h" -#include "slic3r/GUI/DeviceManager.hpp" #include #include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" #include "slic3r/GUI/DeviceCore/DevFirmware.h" diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp index a2c56ce804..e8d720a324 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp @@ -1,5 +1,4 @@ #include "DevNozzleRack.h" -#include "DevUtil.h" #include "DevExtruderSystem.h" #include "json_diff.hpp" @@ -11,6 +10,8 @@ #include #include "slic3r/GUI/DeviceCore/DevDefs.h" #include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevPrintOptions.h b/src/slic3r/GUI/DeviceCore/DevPrintOptions.h index 587d5eef38..179a15e89e 100644 --- a/src/slic3r/GUI/DeviceCore/DevPrintOptions.h +++ b/src/slic3r/GUI/DeviceCore/DevPrintOptions.h @@ -2,7 +2,6 @@ #include #include #include -#include "slic3r/Utils/json_diff.hpp" #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevStatus.cpp b/src/slic3r/GUI/DeviceCore/DevStatus.cpp index cbf350339a..6beddbcc66 100644 --- a/src/slic3r/GUI/DeviceCore/DevStatus.cpp +++ b/src/slic3r/GUI/DeviceCore/DevStatus.cpp @@ -1,5 +1,4 @@ #include "DevStatus.h" -#include "slic3r/GUI/DeviceManager.hpp" #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevStatus.h b/src/slic3r/GUI/DeviceCore/DevStatus.h index 4ed0d5c416..fbd976d1de 100644 --- a/src/slic3r/GUI/DeviceCore/DevStatus.h +++ b/src/slic3r/GUI/DeviceCore/DevStatus.h @@ -1,9 +1,7 @@ #pragma once #include #include -#include "slic3r/Utils/json_diff.hpp" -#include "DevDefs.h" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevStorage.cpp b/src/slic3r/GUI/DeviceCore/DevStorage.cpp index c70a717336..b2bd9f06ef 100644 --- a/src/slic3r/GUI/DeviceCore/DevStorage.cpp +++ b/src/slic3r/GUI/DeviceCore/DevStorage.cpp @@ -1,6 +1,5 @@ #include "DevStorage.h" #include "json_diff.hpp" -#include "slic3r/GUI/DeviceManager.hpp" #include diff --git a/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp index 6c46a0ef32..a6d4550a2b 100644 --- a/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp @@ -1,5 +1,4 @@ #include "DevUpgrade.h" -#include "DevUtil.h" #include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp b/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp index 8c423977a3..6ad0afcf66 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp @@ -2,7 +2,6 @@ #include "slic3r/GUI/BackgroundSlicingProcess.hpp" -#include "slic3r/GUI/PartPlate.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -21,6 +20,9 @@ #include "libslic3r/Preset.hpp" #include "libslic3r/Config.hpp" #include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUtilBackend.h b/src/slic3r/GUI/DeviceCore/DevUtilBackend.h index 44540ae62c..f1b7322dfb 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtilBackend.h +++ b/src/slic3r/GUI/DeviceCore/DevUtilBackend.h @@ -8,7 +8,6 @@ #pragma once #include "DevDefs.h" -#include "DevNozzleSystem.h" #include "DevFilaSystem.h" #include "libslic3r/MultiNozzleUtils.hpp" @@ -17,6 +16,8 @@ #include #include +namespace Slic3r { struct DevNozzle; } + // Forward declarations namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceErrorDialog.hpp b/src/slic3r/GUI/DeviceErrorDialog.hpp index fd195242e7..235f400043 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.hpp +++ b/src/slic3r/GUI/DeviceErrorDialog.hpp @@ -19,6 +19,13 @@ #include "Widgets/StateColor.hpp" #include +class wxBoxSizer; +class wxScrolledWindow; +class wxStaticBitmap; +class wxTimer; +class wxTimerEvent; +class wxWindow; + class Label; class Button; diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 290f1dc4ca..64c101671c 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1,19 +1,14 @@ #include "PrinterNetworkTypes.hpp" #include "json_diff.hpp" -#include "libslic3r/libslic3r.h" #include "DeviceManager.hpp" #include "HMS.hpp" #include "I18N.hpp" -#include "libslic3r/Time.hpp" #include "libslic3r/Thread.hpp" #include "slic3r/Utils/Http.hpp" #include "slic3r/Utils/NetworkAgent.hpp" -#include "slic3r/plugin/PluginManager.hpp" #include "slic3r/Utils/NetworkAgentFactory.hpp" -#include "GuiColor.hpp" #include "GUI_App.hpp" -#include "MsgDialog.hpp" #include "DeviceErrorDialog.hpp" #include "Plater.hpp" #include "GUI_App.hpp" @@ -90,12 +85,10 @@ #include "DeviceCore/DevConfig.h" #include "DeviceCore/DevCtrl.h" -#include "DeviceCore/DevInfo.h" #include "DeviceCore/DevPrintOptions.h" #include "DeviceCore/DevPrintTaskInfo.h" #include "DeviceCore/DevHMS.h" -#include "DeviceCore/DevMapping.h" #include "DeviceCore/DevMappingNozzle.h" #include "DeviceCore/DevManager.h" #include "DeviceCore/DevUtil.h" @@ -107,6 +100,12 @@ #include "DeviceCore/DevUpgrade.h" #include "IPrinterAgent.hpp" +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" + +class wxWindow; namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp index 462fcf892e..49338d4d66 100644 --- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp +++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp @@ -7,11 +7,9 @@ #include "uiAmsHumidityPopup.h" -#include "slic3r/Utils/WxFontUtils.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" -#include "slic3r/GUI/Widgets/StateColor.hpp" #include @@ -23,6 +21,9 @@ #include #include #include +#include "slic3r/GUI/wxExtensions.hpp" + +class wxWindow; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp b/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp index 504602bd79..80110cec77 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp @@ -1,8 +1,6 @@ #include "wgtMsgBox.h" -#include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Widgets/Label.hpp" -#include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/Widgets/StaticBox.hpp" #include @@ -10,6 +8,9 @@ #include #include +class wxCommandEvent; +class wxWindow; + namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp index 747fc96a02..01fe0a4cca 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp @@ -1,10 +1,8 @@ #include "wgtMsgPanel.h" -#include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/Widgets/Label.hpp" #include "slic3r/GUI/Widgets/StateColor.hpp" -#include "slic3r/GUI/wxExtensions.hpp" #include #include diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h index f710bd51fa..186577f1bc 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h +++ b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h @@ -8,6 +8,10 @@ #include #include +class wxHyperlinkCtrl; +class wxHyperlinkEvent; +class wxWindow; + class Label; namespace Slic3r diff --git a/src/slic3r/GUI/DockPanel.hpp b/src/slic3r/GUI/DockPanel.hpp index 0eb1129787..d2370acf4e 100644 --- a/src/slic3r/GUI/DockPanel.hpp +++ b/src/slic3r/GUI/DockPanel.hpp @@ -6,6 +6,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { // Stable across sessions so the saved layout finds the pane; free of wxAuiManager layout delimiters. diff --git a/src/slic3r/GUI/DownloadProgressDialog.cpp b/src/slic3r/GUI/DownloadProgressDialog.cpp index cc04efdda5..b72bacf7ea 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.cpp +++ b/src/slic3r/GUI/DownloadProgressDialog.cpp @@ -25,12 +25,8 @@ #include #include -#include "libslic3r/libslic3r.h" -#include "libslic3r/Utils.hpp" -#include "GUI.hpp" #include "I18N.hpp" //#include "ConfigWizard.hpp" -#include "wxExtensions.hpp" #include "slic3r/GUI/MainFrame.hpp" #include "slic3r/GUI/MsgDialog.hpp" #include "GUI_App.hpp" @@ -38,6 +34,9 @@ #include "Jobs/PlaterWorker.hpp" #include "Widgets/HyperLink.hpp" // ORCA +#include "libslic3r/AppConfig.hpp" + +class wxWindow; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Downloader.hpp b/src/slic3r/GUI/Downloader.hpp index 308c9b2198..b337c2bbee 100644 --- a/src/slic3r/GUI/Downloader.hpp +++ b/src/slic3r/GUI/Downloader.hpp @@ -1,7 +1,6 @@ #ifndef slic3r_Downloader_hpp_ #define slic3r_Downloader_hpp_ -#include "DownloaderFileGet.hpp" #include #include #include @@ -10,6 +9,8 @@ #include #include +namespace Slic3r::GUI { class FileGet; } + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DownloaderFileGet.cpp b/src/slic3r/GUI/DownloaderFileGet.cpp index a35df951ff..7c2415b83b 100644 --- a/src/slic3r/GUI/DownloaderFileGet.cpp +++ b/src/slic3r/GUI/DownloaderFileGet.cpp @@ -26,6 +26,7 @@ #include "GUI.hpp" #include "I18N.hpp" #include "libslic3r/Utils.hpp" +#include "slic3r/Utils/Http.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DownloaderFileGet.hpp b/src/slic3r/GUI/DownloaderFileGet.hpp index 483ae8b1a5..ec6148ac9e 100644 --- a/src/slic3r/GUI/DownloaderFileGet.hpp +++ b/src/slic3r/GUI/DownloaderFileGet.hpp @@ -1,7 +1,6 @@ #ifndef slic3r_DownloaderFileGet_hpp_ #define slic3r_DownloaderFileGet_hpp_ -#include "../Utils/Http.hpp" #include #include diff --git a/src/slic3r/GUI/DragCanvas.cpp b/src/slic3r/GUI/DragCanvas.cpp index 353ab9416e..a41b1ffde8 100644 --- a/src/slic3r/GUI/DragCanvas.cpp +++ b/src/slic3r/GUI/DragCanvas.cpp @@ -1,6 +1,5 @@ #include "DragCanvas.hpp" #include "wxExtensions.hpp" -#include "GUI_App.hpp" #include "Widgets/StateColor.hpp" #include #include @@ -13,6 +12,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { #define CANVAS_WIDTH FromDIP(240) diff --git a/src/slic3r/GUI/DragCanvas.hpp b/src/slic3r/GUI/DragCanvas.hpp index d61fa26eeb..bafc5e199e 100644 --- a/src/slic3r/GUI/DragCanvas.hpp +++ b/src/slic3r/GUI/DragCanvas.hpp @@ -11,6 +11,12 @@ #include #include +class wxDC; +class wxEraseEvent; +class wxMouseEvent; +class wxPaintEvent; +class wxWindow; + namespace Slic3r { namespace GUI { class DragShape : public wxObject diff --git a/src/slic3r/GUI/ExportPresetBundleDialog.cpp b/src/slic3r/GUI/ExportPresetBundleDialog.cpp index f4e27c4367..e02abb54ab 100644 --- a/src/slic3r/GUI/ExportPresetBundleDialog.cpp +++ b/src/slic3r/GUI/ExportPresetBundleDialog.cpp @@ -1,9 +1,7 @@ #include "ExportPresetBundleDialog.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "GUI_App.hpp" -#include "ConfigWizard.hpp" #include "I18N.hpp" -#include "GUI_App.hpp" #include #include #include @@ -12,7 +10,6 @@ #include #include #include -#include #include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" #include #include @@ -36,6 +33,8 @@ #include #include +class wxWindow; + using json = nlohmann::json; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp index 56311406cc..7cd488e664 100644 --- a/src/slic3r/GUI/ExtraRenderers.cpp +++ b/src/slic3r/GUI/ExtraRenderers.cpp @@ -20,6 +20,8 @@ #include #include #include +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Widgets/DropDown.hpp" #ifdef wxHAS_GENERIC_DATAVIEWCTRL #include "wx/generic/private/markuptext.h" #include "wx/generic/private/rowheightcache.h" diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp index a2d14fa370..6c68b716ee 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.cpp +++ b/src/slic3r/GUI/ExtrusionCalibration.cpp @@ -1,6 +1,5 @@ #include "ExtrusionCalibration.hpp" #include "GUI_App.hpp" -#include "GUI.hpp" #include "MsgDialog.hpp" #include "libslic3r/Preset.hpp" #include diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp index da078d37a4..81a14be3ac 100644 --- a/src/slic3r/GUI/Field.hpp +++ b/src/slic3r/GUI/Field.hpp @@ -29,13 +29,17 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/Config.hpp" -#include "libslic3r/Utils.hpp" -#include "GUI.hpp" #include "wxExtensions.hpp" #include "Widgets/SpinInput.hpp" -#include "Widgets/TextInput.hpp" -#include "Widgets/ComboBox.hpp" + +class ComboBox; +class TextInput; +class wxBitmap; +class wxBoxSizer; +class wxCommandEvent; +class wxEvent; +class wxSizer; #ifdef __WXMSW__ #define wxMSW true diff --git a/src/slic3r/GUI/FilamentPickerDialog.cpp b/src/slic3r/GUI/FilamentPickerDialog.cpp index 8821a43c52..b5e85ab72b 100644 --- a/src/slic3r/GUI/FilamentPickerDialog.cpp +++ b/src/slic3r/GUI/FilamentPickerDialog.cpp @@ -4,7 +4,6 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" #include "EncodedFilament.hpp" -#include "Widgets/Label.hpp" #include "Widgets/Button.hpp" #include "Widgets/StateColor.hpp" #include "Widgets/DialogButtons.hpp" diff --git a/src/slic3r/GUI/FileArchiveDialog.cpp b/src/slic3r/GUI/FileArchiveDialog.cpp index 42fdc9a700..40d9d2de8c 100644 --- a/src/slic3r/GUI/FileArchiveDialog.cpp +++ b/src/slic3r/GUI/FileArchiveDialog.cpp @@ -2,10 +2,8 @@ #include "I18N.hpp" #include "GUI_App.hpp" -#include "GUI.hpp" #include "MainFrame.hpp" -#include "ExtraRenderers.hpp" -#include "format.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/FrameProfiler.cpp b/src/slic3r/GUI/FrameProfiler.cpp index 19881dfe35..6012f64ef0 100644 --- a/src/slic3r/GUI/FrameProfiler.cpp +++ b/src/slic3r/GUI/FrameProfiler.cpp @@ -1,4 +1,3 @@ -#include "libslic3r/libslic3r.h" #include "FrameProfiler.hpp" #include "3DScene.hpp" diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index a79f0f1f23..e3d7d14d30 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -2,7 +2,6 @@ #include "GCodeViewer.hpp" #include "libslic3r/BuildVolume.hpp" -#include "libslic3r/ClipperUtils.hpp" #include "libslic3r/Print.hpp" #include "libslic3r/Geometry.hpp" #include "libslic3r/Model.hpp" @@ -10,23 +9,16 @@ #include "libslic3r/LocalesUtils.hpp" #include "libslic3r/PresetBundle.hpp" //BBS: add convex hull logic for toolpath check -#include "libslic3r/Geometry/ConvexHull.hpp" #include "GUI_App.hpp" -#include "MainFrame.hpp" #include "Plater.hpp" #include "Camera.hpp" #include "I18N.hpp" #include "format.hpp" -#include "GUI_Utils.hpp" #include "GUI.hpp" #include "GLCanvas3D.hpp" #include "FilamentGroupPopup.hpp" #include "GLToolbar.hpp" -#include "GUI_Preview.hpp" -#include "libslic3r/Print.hpp" -#include "libslic3r/Layer.hpp" -#include "Widgets/ProgressDialog.hpp" #include "MsgDialog.hpp" #include #include "slic3r/GUI/MeshUtils.hpp" @@ -66,7 +58,6 @@ #include "slic3r/GUI/3DScene.hpp" #include "libslic3r/Color.hpp" #include -#include "libslic3r/PrintBase.hpp" #include #include #include @@ -95,6 +86,15 @@ #include #include #include +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/GCode/ToolOrdering.hpp" +#include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" +#include "slic3r/GUI/PartPlate.hpp" + +namespace Slic3r { class PrintBase; } namespace Slic3r { diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 22ff3140a0..3f099108f9 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -100,7 +100,6 @@ #include "Mouse3DController.hpp" #include "I18N.hpp" #include "NotificationManager.hpp" -#include "format.hpp" #include "DailyTips.hpp" #include "FilamentMapDialog.hpp" #include "Gizmos/GLGizmoUtils.hpp" @@ -152,6 +151,24 @@ #include #include +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/EmbossShape.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "libslic3r/SLA/Pad.hpp" +#include "libslic3r/TextConfiguration.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/3DBed.hpp" +#include "slic3r/GUI/FrameProfiler.hpp" +#include "slic3r/GUI/GLSelectionRectangle.hpp" +#include "slic3r/GUI/IMToolbar.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/KeyChord.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/SceneCache.hpp" +#include "slic3r/Utils/NetworkAgent.hpp" #ifdef __WXMSW__ #if wxUSE_POPUPWIN diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 84fac13ff1..cf2a2aa96d 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -15,11 +15,8 @@ #include "libslic3r/Technologies.hpp" #include "libslic3r/Model.hpp" #include "libvgcode/include/Types.hpp" -#include "libvgcode/include/PathVertex.hpp" -#include "libslic3r/Color.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/Line.hpp" -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include #include @@ -33,7 +30,6 @@ #include "GUI_ObjectLayers.hpp" #include "GLSelectionRectangle.hpp" #include "MeshUtils.hpp" -#include "libslic3r/GCode/GCodeProcessor.hpp" #include "GCodeViewer.hpp" #include "Camera.hpp" #include "SceneRaycaster.hpp" @@ -55,6 +51,14 @@ #include #include +namespace Slic3r { class ColorRGBA; } +namespace Slic3r { class DynamicPrintConfig; } +namespace Slic3r { class GLShaderProgram; } +namespace Slic3r { struct GCodeProcessorResult; } +namespace Slic3r::GUI { class ImGuiWrapper; } +namespace libvgcode { struct PathVertex; } +struct ImVec2; + class wxSizeEvent; class wxIdleEvent; class wxKeyEvent; diff --git a/src/slic3r/GUI/GLSelectionRectangle.cpp b/src/slic3r/GUI/GLSelectionRectangle.cpp index 0f7ac82862..f9301bafe7 100644 --- a/src/slic3r/GUI/GLSelectionRectangle.cpp +++ b/src/slic3r/GUI/GLSelectionRectangle.cpp @@ -16,6 +16,8 @@ #include "slic3r/GUI/OpenGLManager.hpp" #include #include "libslic3r/Color.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/GLShader.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp index 7d091e74f3..91140b379c 100644 --- a/src/slic3r/GUI/GLShader.cpp +++ b/src/slic3r/GUI/GLShader.cpp @@ -1,4 +1,3 @@ -#include "libslic3r/libslic3r.h" #include "GLShader.hpp" #include "3DScene.hpp" diff --git a/src/slic3r/GUI/GLTexture.hpp b/src/slic3r/GUI/GLTexture.hpp index 9ec20dcde6..9bd539d3dd 100644 --- a/src/slic3r/GUI/GLTexture.hpp +++ b/src/slic3r/GUI/GLTexture.hpp @@ -12,7 +12,8 @@ #include #include -class wxImage; +class wxFont; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index 91afb33370..efbf8e9d6b 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -1,5 +1,4 @@ #include "libslic3r/Point.hpp" -#include "libslic3r/libslic3r.h" #include "GLToolbar.hpp" @@ -11,7 +10,6 @@ #include #include -#include "slic3r/GUI/Event.hpp" #include "libslic3r/Utils.hpp" #include #include @@ -22,6 +20,11 @@ #include #include #include +#include "slic3r/GUI/GLTexture.hpp" + +class wxFont; +namespace Slic3r::GUI { struct IntEvent; } +namespace Slic3r::GUI { struct SimpleEvent; } namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 639905a31b..7de994960e 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -4,7 +4,6 @@ #include "format.hpp" #include "I18N.hpp" -#include "libslic3r/LocalesUtils.hpp" #include "libslic3r/Config.hpp" #include #include diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 73a58c5b51..52ff520c8c 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -240,6 +240,21 @@ #include "PluginsDialog.hpp" #include "SpeedDialDialog.hpp" #include "TerminalDialog.hpp" +#include "libslic3r/Format/STEP.hpp" +#include "libslic3r/Semver.hpp" +#include "slic3r/GUI/ActionRegistry.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/ConfigWizard.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/HttpServer.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/ParamsDialog.hpp" +#include "slic3r/GUI/ParamsPanel.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/plugin/host/PluginPages.hpp" +#include //#ifdef WIN32 //#include "BaseException.h" diff --git a/src/slic3r/GUI/GUI_AuxiliaryList.hpp b/src/slic3r/GUI/GUI_AuxiliaryList.hpp index 88bab94a3d..04277f5909 100644 --- a/src/slic3r/GUI/GUI_AuxiliaryList.hpp +++ b/src/slic3r/GUI/GUI_AuxiliaryList.hpp @@ -15,7 +15,15 @@ #include #include -#include "AuxiliaryDataViewModel.hpp" +class AuxiliaryModel; +class AuxiliaryModelNode; +class wxButton; +class wxCommandEvent; +class wxKeyEvent; +class wxMouseEvent; +class wxSizer; +class wxWindow; + class AuxiliaryList : public wxDataViewCtrl { diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 7913a33e7c..239e29ba41 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -14,7 +14,6 @@ #include "OptionsGroup.hpp" #include "GLCanvas3D.hpp" #include "Selection.hpp" -#include "format.hpp" //BBS: add partplate related logic #include "PartPlate.hpp" #include "Gizmos/GLGizmoEmboss.hpp" diff --git a/src/slic3r/GUI/GUI_Geometry.cpp b/src/slic3r/GUI/GUI_Geometry.cpp index b0ed0e04fc..0406e201b2 100644 --- a/src/slic3r/GUI/GUI_Geometry.cpp +++ b/src/slic3r/GUI/GUI_Geometry.cpp @@ -1,4 +1,3 @@ -#include "libslic3r/libslic3r.h" #include "GUI_Geometry.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/GUI_Init.cpp b/src/slic3r/GUI/GUI_Init.cpp index 0eb2110b19..6b8166d67e 100644 --- a/src/slic3r/GUI/GUI_Init.cpp +++ b/src/slic3r/GUI/GUI_Init.cpp @@ -2,13 +2,11 @@ #include "libslic3r/AppConfig.hpp" -#include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" -#include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/InstanceCheck.hpp" #include "slic3r/GUI/format.hpp" #include "slic3r/GUI/MainFrame.hpp" -#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/I18N.hpp" // To show a message box if GUI initialization ends up with an exception thrown. #include @@ -17,7 +15,6 @@ #include "libslic3r/Exception.hpp" #include #include -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 59e26663a2..f6ac5f64df 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -51,7 +51,6 @@ #include "libslic3r/Point.hpp" #include #include "libslic3r/LocalesUtils.hpp" -#include "libslic3r/Format/STEP.hpp" #include #include "slic3r/GUI/ParamsPanel.hpp" #include "slic3r/GUI/GUI_ObjectLayers.hpp" @@ -103,6 +102,9 @@ #include "Gizmos/GLGizmoScale.hpp" #include "libslic3r/TriangleMeshDeal.hpp" + +class wxMenu; +namespace Slic3r { class Step; } namespace Slic3r { namespace GUI diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 1f2d970cef..d297b65b2d 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -20,11 +20,12 @@ #include #include "Event.hpp" -#include "wxExtensions.hpp" #include "ObjectDataViewModel.hpp" #include "libslic3r/PrintConfig.hpp" +class wxBitmap; + class wxBoxSizer; class wxBitmapComboBox; class wxMenuItem; diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp index efe7f71899..2e34d58fa6 100644 --- a/src/slic3r/GUI/GUI_ObjectSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp @@ -1,19 +1,16 @@ #include "GUI_ObjectSettings.hpp" #include "GUI_ObjectList.hpp" -#include "GUI_Factories.hpp" #include "Tab.hpp" #include "MainFrame.hpp" #include "OptionsGroup.hpp" #include "GUI_App.hpp" -#include "wxExtensions.hpp" #include "Plater.hpp" #include "libslic3r/PresetBundle.hpp" #include "libslic3r/Model.hpp" #include -#include "I18N.hpp" #include "ConfigManipulation.hpp" #include @@ -26,6 +23,12 @@ #include "libslic3r/Config.hpp" #include #include +#include "libslic3r/Preset.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/ParamsPanel.hpp" +#include "slic3r/GUI/PartPlate.hpp" + +namespace Slic3r { class ObjectBase; } namespace Slic3r { diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp index 822b42c696..526592a5cc 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.cpp +++ b/src/slic3r/GUI/GUI_ObjectTable.cpp @@ -1,20 +1,15 @@ #include "wx/clipbrd.h" #include "wx/display.h" -#include "SelectMachine.hpp" #include "I18N.hpp" -#include "libslic3r/Utils.hpp" #include "libslic3r/PresetBundle.hpp" //#include "libslic3r/Model.hpp" //#include "Plater.hpp" #include "Widgets/Label.hpp" #include "GUI.hpp" #include "GUI_App.hpp" -#include "MainFrame.hpp" #include "Tab.hpp" -#include "format.hpp" -#include "BitmapCache.hpp" #include "GUI_ObjectTable.hpp" #include "GUI_ObjectList.hpp" #include @@ -50,6 +45,11 @@ #include "slic3r/GUI/GUI_Utils.hpp" #include #include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/GUI_ObjectTableSettings.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include //use wxGridWindow to compute position //#include "wx/generic/private/grid.h" diff --git a/src/slic3r/GUI/GUI_ObjectTableSettings.hpp b/src/slic3r/GUI/GUI_ObjectTableSettings.hpp index 490df76a75..7808d6e87e 100644 --- a/src/slic3r/GUI/GUI_ObjectTableSettings.hpp +++ b/src/slic3r/GUI/GUI_ObjectTableSettings.hpp @@ -11,6 +11,9 @@ #include "wxExtensions.hpp" #include "libslic3r/PrintConfig.hpp" +class wxSizer; +class wxWindow; + class wxBoxSizer; namespace Slic3r { diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 7ea2bba557..1968df996f 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -4,7 +4,6 @@ #include "IMSlider.hpp" #include "GUI_Preview.hpp" #include "GUI_App.hpp" -#include "GUI.hpp" #include #include #include @@ -21,19 +20,16 @@ #include "libslic3r/PrintConfig.hpp" #include "libslic3r/ExPolygon.hpp" #include -#include "libvgcode/include/Types.hpp" +#include #if ENABLE_OPENGL_AUTO_AA_SAMPLES #include "GUI_Init.hpp" #endif // ENABLE_OPENGL_AUTO_AA_SAMPLES #include "I18N.hpp" -#include "3DScene.hpp" #include "BackgroundSlicingProcess.hpp" #include "OpenGLManager.hpp" #include "GLCanvas3D.hpp" -#include "libslic3r/PresetBundle.hpp" #include "Plater.hpp" #include "MainFrame.hpp" -#include "format.hpp" #include #include @@ -47,8 +43,15 @@ // this include must follow the wxWidgets ones or it won't compile on Windows -> see http://trac.wxwidgets.org/ticket/2421 #include "libslic3r/Print.hpp" -#include "libslic3r/SLAPrint.hpp" #include "NotificationManager.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "slic3r/GUI/GCodeViewer.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/Selection.hpp" + +class wxDropTarget; +namespace libvgcode { enum class EViewType : uint8_t; } #ifdef _WIN32 #include "BitmapComboBox.hpp" diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp index 3080b7a89a..b8bf09bd65 100644 --- a/src/slic3r/GUI/GUI_Preview.hpp +++ b/src/slic3r/GUI/GUI_Preview.hpp @@ -7,17 +7,19 @@ #include #include -#include "libslic3r/Point.hpp" #include "libslic3r/CustomGCode.hpp" //BBS: add print base -#include "libslic3r/PrintBase.hpp" #include -#include "libslic3r/GCode/GCodeProcessor.hpp" -#include #include +class wxDropTarget; +class wxSizeEvent; +class wxWindow; +namespace Slic3r { class PrintBase; } +namespace Slic3r { struct GCodeProcessorResult; } + class wxGLCanvas; class wxBoxSizer; class wxStaticText; @@ -156,7 +158,7 @@ public: //BBS: add m_loaded_print logic bool is_loaded() const { return (m_loaded_print != nullptr); } //BBS - void on_tick_changed(Type type); + void on_tick_changed(CustomGCode::Type type); void show_sliders(bool show = true); void show_moves_sliders(bool show = true); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp index ae45707682..d36efa7d58 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp @@ -3,12 +3,8 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" -#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" -#include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" -#include "libslic3r/PresetBundle.hpp" -#include "libslic3r/MeasureUtils.hpp" #include #include @@ -22,12 +18,15 @@ #include #include "slic3r/GUI/Gizmos/GLGizmoMeasure.hpp" -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include #include #include #include +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/I18N.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 90b175ddfd..ac158fcf00 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -29,6 +29,12 @@ #include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GUI_Colors.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/Selection.hpp" // TODO: Display tooltips quicker on Linux diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp index 944cfaad7a..1387b7d2f8 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp @@ -28,7 +28,6 @@ #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Config.hpp" #include "libslic3r/Polygon.hpp" -#include "slic3r/GUI/GUI_ObjectLayers.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/MultiPoint.hpp" #include "libslic3r/TriangleMeshSlicer.hpp" @@ -45,6 +44,15 @@ #include "libslic3r/ClipperUtils.hpp" #include "libslic3r/ExPolygon.hpp" #include "GLGizmoUtils.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/GLSelectionRectangle.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 9ad06dcdf9..2800b2b146 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -58,13 +58,21 @@ #include "slic3r/GUI/format.hpp" #include "slic3r/Utils/UndoRedo.hpp" #include "libslic3r/AppConfig.hpp" -#include "libslic3r/TriangleMeshSlicer.hpp" #include "GLGizmoUtils.hpp" #include "imgui/imgui_internal.h" -#include "slic3r/GUI/Field.hpp" #include "slic3r/GUI/MsgDialog.hpp" #include "FixModelByCgal.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GLSelectionRectangle.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/GUI_ObjectList.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/Selection.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index 38aeb26bdf..5ccd3ef369 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -14,7 +14,6 @@ #include "slic3r/GUI/CameraUtils.hpp" #include "slic3r/GUI/Jobs/EmbossJob.hpp" #include "slic3r/GUI/Jobs/CreateFontNameImageJob.hpp" -#include "slic3r/GUI/Jobs/NotificationProgressIndicator.hpp" #include "slic3r/Utils/WxFontUtils.hpp" #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" @@ -24,10 +23,7 @@ #include "libslic3r/Model.hpp" #include "libslic3r/Preset.hpp" -#include "libslic3r/ClipperUtils.hpp" // union_ex #include "libslic3r/AppConfig.hpp" // store/load font list -#include "libslic3r/Format/OBJ.hpp" // load obj file for default object -#include "libslic3r/BuildVolume.hpp" #include "imgui/imgui_stdlib.h" // using std::string for inputs #include @@ -1583,6 +1579,15 @@ void GLGizmoEmboss::draw_window(float x, float y) } #include "imgui/imgui_internal.h" // scroll bar existence +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoRotate.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/Utils/RaycastManager.hpp" + +namespace Slic3r::GUI { struct Camera; } void GLGizmoEmboss::draw_text_input() { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index 7ed567ac33..95faae41a9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -45,6 +45,18 @@ #include "libslic3r/ExtrusionEntity.hpp" #include "slic3r/GUI/3DScene.hpp" #include +#include "libslic3r/Color.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/ExtrusionEntityCollection.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Print.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp index 5d9c4b15b7..e58b115c76 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp @@ -27,6 +27,10 @@ #include #include #include "slic3r/GUI/MeshUtils.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" +#include "slic3r/GUI/I18N.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp index e03912456a..0ddf665c06 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp @@ -32,6 +32,12 @@ #include "libslic3r/Color.hpp" #include "slic3r/GUI/3DScene.hpp" #include +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "slic3r/GUI/I18N.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index 087e6e7af1..c1da2f416f 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -8,7 +8,6 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" -#include "libslic3r/PresetBundle.hpp" #include "libslic3r/MeasureUtils.hpp" #include @@ -57,6 +56,15 @@ #include #include #include +#include "libslic3r/AppConfig.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp index 1d76810050..7035c07e39 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp @@ -7,7 +7,6 @@ #include "slic3r/GUI/MeshUtils.hpp" #include "slic3r/GUI/I18N.hpp" #include "libslic3r/Measure.hpp" -#include "libslic3r/Model.hpp" #include "libslic3r/Color.hpp" #include #include @@ -15,13 +14,15 @@ #include "slic3r/GUI/SceneRaycaster.hpp" #include #include -#include "slic3r/GUI/3DScene.hpp" #include #include #include #include #include +namespace Slic3r { class GLVolume; } +namespace Slic3r::GUI { class GLCanvas3D; } + namespace Slic3r { enum class ModelVolumeType : int; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp index f8ffe44b85..a70c404ad4 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp @@ -31,6 +31,13 @@ #define IMGUI_DEFINE_MATH_OPERATORS #endif #include +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index a08ded3003..d505dd5845 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -39,6 +39,13 @@ #include "libslic3r/Format/bbs_3mf.hpp" #include "slic3r/GUI/OpenGLManager.hpp" #include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 87ffbb762f..58fd0ce583 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -4,7 +4,6 @@ #include "slic3r/GUI/Shortcuts.hpp" //BBS: GUI refactor #include "slic3r/GUI/Plater.hpp" -#include "libslic3r/AppConfig.hpp" #include @@ -27,6 +26,12 @@ #include "libslic3r/Model.hpp" #include #include +#include "libslic3r/Color.hpp" +#include "libslic3r/Line.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" +#include "slic3r/GUI/I18N.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp index 75d2905a86..f6266a0da0 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp @@ -40,8 +40,16 @@ #include "slic3r/GUI/3DScene.hpp" #include #include -#include "slic3r/GUI/ImGuiWrapper.hpp" #include +#include "libslic3r/Color.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "slic3r/GUI/Selection.hpp" + +namespace Slic3r::GUI { class ImGuiWrapper; } +namespace cereal { class BinaryInputArchive; } namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp index e03b561c38..9e6ec9bc57 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp @@ -1,9 +1,7 @@ #include "GLGizmoPrimitive.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/ImGuiWrapper.hpp" -#include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/Plater.hpp" -#include "slic3r/GUI/GUI_ObjectList.hpp" #include "slic3r/GUI/NotificationManager.hpp" #include "libslic3r/Model.hpp" #include @@ -21,6 +19,8 @@ #define IMGUI_DEFINE_MATH_OPERATORS #endif #include +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/I18N.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 8d1b3e50df..507d2568c7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -4,7 +4,6 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Shortcuts.hpp" -#include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Jobs/RotoptimizeJob.hpp" @@ -32,6 +31,16 @@ #include #include "slic3r/GUI/Jobs/Worker.hpp" #include +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp index 56c0944da9..4842f93f34 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp @@ -18,7 +18,6 @@ #include "libslic3r/libslic3r.h" #include #include -#include "libslic3r/Model.hpp" #include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/OpenGLManager.hpp" #include "slic3r/GUI/GLShader.hpp" @@ -26,6 +25,15 @@ #include "libslic3r/Geometry.hpp" #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Line.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" +#include "slic3r/GUI/I18N.hpp" + +namespace Slic3r { class ModelVolume; } namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp index 60e8e383c6..786928cbe5 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp @@ -1,9 +1,7 @@ #include "GLGizmoSketch.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/ImGuiWrapper.hpp" -#include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/Plater.hpp" -#include "slic3r/GUI/GUI_ObjectList.hpp" #include "slic3r/GUI/NotificationManager.hpp" #include "libslic3r/Model.hpp" #include @@ -32,6 +30,9 @@ #define IMGUI_DEFINE_MATH_OPERATORS #endif #include +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Selection.hpp" #define UL(s) Slic3r::GUI::I18N::translate_utf8((s)).c_str() diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp index 9d684cdb88..e391022d6c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp @@ -4,12 +4,7 @@ #include #include "slic3r/GUI/GLCanvas3D.hpp" -#include "libslic3r/SLAPrint.hpp" -#include "slic3r/GUI/GUI_App.hpp" -#include "slic3r/GUI/Camera.hpp" -#include "slic3r/GUI/Plater.hpp" -#include "libslic3r/PresetBundle.hpp" #include #include @@ -23,6 +18,10 @@ #include #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/TriangleMesh.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index c7f79e0d17..f8c65e9ac9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -1,4 +1,3 @@ -#include "libslic3r/libslic3r.h" #include "GLGizmosManager.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/3DScene.hpp" @@ -56,13 +55,18 @@ #include "slic3r/GUI/Gizmos/GLGizmoSketch.hpp" #endif -#include "libslic3r/format.hpp" #include "libslic3r/Model.hpp" -#include "libslic3r/PresetBundle.hpp" #include #include +#include "slic3r/GUI/GLTexture.hpp" +#include "slic3r/GUI/GLToolbar.hpp" +#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/KeyChord.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp index 3d9d18883d..9d655b8c6a 100644 --- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp +++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp @@ -35,6 +35,10 @@ #include #include #include "libslic3r/Color.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/I18N.hpp" #define MAX_NUM 9999.99 #define MAX_SIZE std::string_view{"9999.99"} diff --git a/src/slic3r/GUI/GradientCurveEditor.hpp b/src/slic3r/GUI/GradientCurveEditor.hpp index f2e082aff5..dd2cea249f 100644 --- a/src/slic3r/GUI/GradientCurveEditor.hpp +++ b/src/slic3r/GUI/GradientCurveEditor.hpp @@ -10,6 +10,8 @@ #include "libslic3r/FilamentMixer.hpp" +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GuiColor.hpp b/src/slic3r/GUI/GuiColor.hpp index 6eac14f510..d7f3d277bf 100644 --- a/src/slic3r/GUI/GuiColor.hpp +++ b/src/slic3r/GUI/GuiColor.hpp @@ -2,7 +2,6 @@ #define slic3r_GUI_Color_hpp_ #include #include "libslic3r/Color.hpp" -#include "slic3r/Utils/ColorSpaceConvert.hpp" struct ColorDistValue { diff --git a/src/slic3r/GUI/HMSPanel.cpp b/src/slic3r/GUI/HMSPanel.cpp index c767c8613c..7d0146e243 100644 --- a/src/slic3r/GUI/HMSPanel.cpp +++ b/src/slic3r/GUI/HMSPanel.cpp @@ -3,8 +3,6 @@ #include "slic3r/GUI/DeviceCore/DevHMS.h" #include #include -#include -#include #include #include #include @@ -20,6 +18,8 @@ #include "MainFrame.hpp" #include "Monitor.hpp" +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp index 2267918b5a..433a829c29 100644 --- a/src/slic3r/GUI/HintNotification.cpp +++ b/src/slic3r/GUI/HintNotification.cpp @@ -2,7 +2,6 @@ #include "ImGuiWrapper.hpp" #include "format.hpp" #include "I18N.hpp" -#include "GUI_ObjectList.hpp" #include "GLCanvas3D.hpp" #include "MainFrame.hpp" #include "Preferences.hpp" diff --git a/src/slic3r/GUI/HintNotification.hpp b/src/slic3r/GUI/HintNotification.hpp index cb05697869..83f279fbdf 100644 --- a/src/slic3r/GUI/HintNotification.hpp +++ b/src/slic3r/GUI/HintNotification.hpp @@ -9,6 +9,9 @@ #include #include +class wxEvtHandler; +namespace Slic3r::GUI { class ImGuiWrapper; } + namespace Slic3r {namespace GUI { // Database of hints updatable diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp index 239882457f..dab0c229e2 100644 --- a/src/slic3r/GUI/IMSlider.cpp +++ b/src/slic3r/GUI/IMSlider.cpp @@ -1,5 +1,4 @@ #include "IMSlider.hpp" -#include "libslic3r/GCode.hpp" #include "GUI_App.hpp" #include "GUI.hpp" #include "NotificationManager.hpp" @@ -24,7 +23,6 @@ #include "slic3r/GUI/GUI_Utils.hpp" #include #include -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include #include @@ -36,6 +34,15 @@ #define IMGUI_DEFINE_MATH_OPERATORS #endif #include +#include "libslic3r/Config.hpp" +#include "libslic3r/Layer.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Print.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Plater.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/IMSlider.hpp b/src/slic3r/GUI/IMSlider.hpp index 41e3d6747f..9df84a7a75 100644 --- a/src/slic3r/GUI/IMSlider.hpp +++ b/src/slic3r/GUI/IMSlider.hpp @@ -14,7 +14,8 @@ #include -class wxMenu; +class wxMouseEvent; + struct IMGUI_API ImRect; namespace Slic3r { diff --git a/src/slic3r/GUI/IMToolbar.hpp b/src/slic3r/GUI/IMToolbar.hpp index bf5bf70756..ce8770d27f 100644 --- a/src/slic3r/GUI/IMToolbar.hpp +++ b/src/slic3r/GUI/IMToolbar.hpp @@ -6,7 +6,6 @@ #include #include "GLTexture.hpp" -#include "Event.hpp" #include #define DEFAULT_TOOLBAR_BUTTON_WIDTH 80.0f diff --git a/src/slic3r/GUI/IconManager.cpp b/src/slic3r/GUI/IconManager.cpp index ebdf9b93a4..a014202b84 100644 --- a/src/slic3r/GUI/IconManager.cpp +++ b/src/slic3r/GUI/IconManager.cpp @@ -367,6 +367,7 @@ void priv::draw_transparent_icon(const IconManager::Icon &icon) } #include "imgui/imgui_internal.h" //ImGuiWindow +#include "slic3r/GUI/GLTexture.hpp" namespace Slic3r::GUI { void draw(const IconManager::Icon &icon, const ImVec2 &size, const ImVec4 &tint_col, const ImVec4 &border_col) diff --git a/src/slic3r/GUI/IdleScheduler.cpp b/src/slic3r/GUI/IdleScheduler.cpp index bfece0e3fe..bd40288678 100644 --- a/src/slic3r/GUI/IdleScheduler.cpp +++ b/src/slic3r/GUI/IdleScheduler.cpp @@ -10,6 +10,7 @@ #include #include "libslic3r/Utils.hpp" +#include "slic3r/GUI/PrebuildQueue.hpp" #ifdef _WIN32 #include diff --git a/src/slic3r/GUI/IdleScheduler.hpp b/src/slic3r/GUI/IdleScheduler.hpp index a210971e74..205b00c3d0 100644 --- a/src/slic3r/GUI/IdleScheduler.hpp +++ b/src/slic3r/GUI/IdleScheduler.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include "slic3r/GUI/Lazy.hpp" #include #include @@ -9,6 +8,8 @@ #include "PrebuildQueue.hpp" +namespace Slic3r::GUI { class LazyBase; } + namespace Slic3r { namespace GUI { // Runs the queue's units while the user is idle. Once the user has been idle long enough, diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 41663d147e..5728ad5697 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -63,7 +63,6 @@ #include "BitmapCache.hpp" #include "GUI_App.hpp" -#include "../Utils/MacDarkMode.hpp" #include #include #include "OpenGLManager.hpp" diff --git a/src/slic3r/GUI/ImageDPIFrame.cpp b/src/slic3r/GUI/ImageDPIFrame.cpp index 655fa87633..83904fe650 100644 --- a/src/slic3r/GUI/ImageDPIFrame.cpp +++ b/src/slic3r/GUI/ImageDPIFrame.cpp @@ -10,9 +10,6 @@ #include #include #include "GUI_App.hpp" -#include "Tab.hpp" -#include "PartPlate.hpp" -#include "I18N.hpp" #include "MainFrame.hpp" #include #include diff --git a/src/slic3r/GUI/Jobs/BindJob.cpp b/src/slic3r/GUI/Jobs/BindJob.cpp index 502511ca7e..b5ce645e35 100644 --- a/src/slic3r/GUI/Jobs/BindJob.cpp +++ b/src/slic3r/GUI/Jobs/BindJob.cpp @@ -1,10 +1,7 @@ #include "BindJob.hpp" #include "bambu_networking.hpp" -#include "slic3r/GUI/Plater.hpp" -#include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" -#include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/HMS.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/Utils/NetworkAgent.hpp" diff --git a/src/slic3r/GUI/Jobs/BindJob.hpp b/src/slic3r/GUI/Jobs/BindJob.hpp index 7670b58611..06de566e52 100644 --- a/src/slic3r/GUI/Jobs/BindJob.hpp +++ b/src/slic3r/GUI/Jobs/BindJob.hpp @@ -9,6 +9,8 @@ #include #include "Job.hpp" +class wxWindow; + namespace fs = boost::filesystem; namespace Slic3r { diff --git a/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp b/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp index 9f1f52c763..7366123623 100644 --- a/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp +++ b/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp @@ -11,6 +11,7 @@ #include "slic3r/GUI/Jobs/Job.hpp" #include "BoostThreadWorker.hpp" +#include "slic3r/GUI/Jobs/ProgressIndicator.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp index f2f37c0418..e1f9970f5b 100644 --- a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp +++ b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp @@ -4,7 +4,6 @@ #include #include #include -#include #include "slic3r/Utils/EmbossStyleManager.hpp" #include "Job.hpp" diff --git a/src/slic3r/GUI/Jobs/EmbossJob.cpp b/src/slic3r/GUI/Jobs/EmbossJob.cpp index e92ab2b1ed..57f14a6953 100644 --- a/src/slic3r/GUI/Jobs/EmbossJob.cpp +++ b/src/slic3r/GUI/Jobs/EmbossJob.cpp @@ -8,7 +8,6 @@ #include "libslic3r/Emboss.hpp" #include #include -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include "libslic3r/Polygon.hpp" #include "libslic3r/Config.hpp" #include "libslic3r/Geometry.hpp" @@ -41,20 +40,23 @@ #include "libslic3r/libslic3r.h" #include "slic3r/GUI/Plater.hpp" -#include "slic3r/GUI/NotificationManager.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" -#include "slic3r/GUI/MainFrame.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" -#include "slic3r/GUI/Gizmos/GLGizmoEmboss.hpp" #include "slic3r/GUI/Selection.hpp" #include "slic3r/GUI/CameraUtils.hpp" -#include "slic3r/GUI/format.hpp" -#include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/Jobs/Worker.hpp" #include "slic3r/Utils/UndoRedo.hpp" #include "slic3r/Utils/RaycastManager.hpp" +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/I18N.hpp" + +namespace Slic3r { class GLVolume; } // #define EXECUTE_UPDATE_ON_MAIN_THREAD // debug execution on main thread diff --git a/src/slic3r/GUI/Jobs/FillBedJob.cpp b/src/slic3r/GUI/Jobs/FillBedJob.cpp index f01dc846ca..33eccd0ede 100644 --- a/src/slic3r/GUI/Jobs/FillBedJob.cpp +++ b/src/slic3r/GUI/Jobs/FillBedJob.cpp @@ -6,7 +6,6 @@ #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_ObjectList.hpp" -#include "slic3r/plugin/PluginManager.hpp" #include "libnest2d/common.hpp" #include @@ -25,9 +24,14 @@ #include "slic3r/GUI/GUI_App.hpp" #include #include -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include "slic3r/GUI/Jobs/Job.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OAuthJob.hpp b/src/slic3r/GUI/Jobs/OAuthJob.hpp index 0377cada59..9988594be9 100644 --- a/src/slic3r/GUI/Jobs/OAuthJob.hpp +++ b/src/slic3r/GUI/Jobs/OAuthJob.hpp @@ -12,6 +12,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OrientJob.cpp b/src/slic3r/GUI/Jobs/OrientJob.cpp index e9f5048c43..d9325ba05f 100644 --- a/src/slic3r/GUI/Jobs/OrientJob.cpp +++ b/src/slic3r/GUI/Jobs/OrientJob.cpp @@ -5,12 +5,10 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/NotificationManager.hpp" -#include "slic3r/plugin/PluginManager.hpp" #include "libslic3r/PresetBundle.hpp" #include #include #include -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include "slic3r/GUI/PartPlate.hpp" #include #include @@ -25,6 +23,10 @@ #include "libslic3r/LifecycleEvents.hpp" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Config.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp index d1e803c5a7..29f2e5b403 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.cpp +++ b/src/slic3r/GUI/Jobs/PrintJob.cpp @@ -1,8 +1,6 @@ #include "PrintJob.hpp" #include "libslic3r/LifecycleEvents.hpp" -#include "libslic3r/MTUtils.hpp" #include "libslic3r/Model.hpp" -#include "libslic3r/PresetBundle.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -16,7 +14,6 @@ #include "slic3r/Utils/FileTransferUtils.hpp" #include "slic3r/Utils/BBLNetworkPlugin.hpp" #include "NetworkAgent.hpp" -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include "libslic3r/Utils.hpp" #include @@ -35,6 +32,10 @@ #include #include "slic3r/GUI/DeviceCore/DevStorage.h" #include +#include "libslic3r/AppConfig.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" #include namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp index 72dc7419f3..4c425aca9f 100644 --- a/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp +++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp @@ -1,10 +1,8 @@ #include "RotoptimizeJob.hpp" -#include "libslic3r/MTUtils.hpp" #include "libslic3r/SLA/Rotfinder.hpp" #include "libslic3r/MinAreaBoundingBox.hpp" #include "libslic3r/Model.hpp" -#include "libslic3r/SLAPrint.hpp" #include "slic3r/GUI/Plater.hpp" #include "libslic3r/PresetBundle.hpp" @@ -17,6 +15,12 @@ #include #include #include "libslic3r/libslic3r.h" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Selection.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.cpp b/src/slic3r/GUI/Jobs/SLAImportJob.cpp index d592bcbe21..65f7832660 100644 --- a/src/slic3r/GUI/Jobs/SLAImportJob.cpp +++ b/src/slic3r/GUI/Jobs/SLAImportJob.cpp @@ -15,11 +15,13 @@ #include "libslic3r/Config.hpp" #include #include "slic3r/GUI/GUI_App.hpp" -#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include "libslic3r/PrintConfig.hpp" #include #include +#include "libslic3r/SLAPrint.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/I18N.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp index 03b4b14fc1..71c4f4afe7 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp @@ -23,6 +23,8 @@ #include "slic3r/GUI/NotificationManager.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/Utils/UndoRedo.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/TriangleMesh.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp index 43358e40e3..1fd61da0fe 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp @@ -7,13 +7,14 @@ #include "libslic3r/Point.hpp" #include -#include "libslic3r/Color.hpp" #include "libslic3r/ObjectID.hpp" #include "libslic3r/TextureDisplacement.hpp" #include "libslic3r/TriangleMesh.hpp" #include "Job.hpp" +namespace Slic3r { class ModelVolume; } + namespace Slic3r::GUI { // Everything process() needs, captured by value on the main thread when the job is queued so the diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp index 10709a8346..e70125a521 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp @@ -16,6 +16,8 @@ #include #include "slic3r/GUI/Jobs/Worker.hpp" #include +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/TriangleMesh.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp index 91e0621985..f4f9f88f4e 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp @@ -10,7 +10,6 @@ #include "libslic3r/ObjectID.hpp" #include "libslic3r/TextureBake/TextureBakeDebug.hpp" #include "libslic3r/TextureDisplacement.hpp" -#include "libslic3r/TriangleMesh.hpp" #include "Job.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp index 24dcc2baa6..17d60d1fad 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp @@ -21,6 +21,8 @@ #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp" #include "slic3r/Utils/UndoRedo.hpp" +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/TriangleMesh.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp index c1d51a0c6b..5fc173975f 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp @@ -8,10 +8,8 @@ #include "Job.hpp" -#include "libslic3r/Color.hpp" #include "libslic3r/ObjectID.hpp" #include "libslic3r/TextureDisplacement.hpp" -#include "libslic3r/TriangleMesh.hpp" namespace Slic3r { class ModelVolume; diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp index e8c7dfca01..49cbae4e81 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp @@ -1,6 +1,5 @@ #include "TextureDisplacementPreviewJob.hpp" -#include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp" #include #include diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp index 5aa5d82d16..e927f4d4a3 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp @@ -9,9 +9,7 @@ #include #include -#include "libslic3r/Color.hpp" #include "libslic3r/TextureDisplacement.hpp" -#include "libslic3r/TriangleMesh.hpp" #include "Job.hpp" diff --git a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp index 5b6288ff6a..77a1e9544d 100644 --- a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp +++ b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp @@ -10,6 +10,8 @@ #include #include +class wxWindow; + namespace fs = boost::filesystem; namespace Slic3r { diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 903ce4c43a..260392a274 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -1,9 +1,6 @@ -#include "libslic3r/libslic3r.h" #include "KBShortcutsDialog.hpp" #include "I18N.hpp" -#include "libslic3r/Utils.hpp" #include "GUI.hpp" -#include "Notebook.hpp" #include #include "slic3r/GUI/Shortcuts.hpp" #include diff --git a/src/slic3r/GUI/KBShortcutsDialog.hpp b/src/slic3r/GUI/KBShortcutsDialog.hpp index 4be3967eb1..1e7344a7d5 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.hpp +++ b/src/slic3r/GUI/KBShortcutsDialog.hpp @@ -11,12 +11,21 @@ #include #include #include +#include #include "GUI_Utils.hpp" -#include "Shortcuts.hpp" -#include "wxExtensions.hpp" #include +class ScalableButton; +class wxKeyEvent; +class wxPanel; +class wxSimplebook; +class wxStaticText; +class wxWindow; +namespace Slic3r::GUI { enum class Shortcut : uint8_t; } +namespace Slic3r::GUI { enum class ShortcutContext : uint8_t; } +namespace Slic3r::GUI { enum class ShortcutSection : uint8_t; } + class Button; class Label; class TabCtrl; diff --git a/src/slic3r/GUI/Lazy.hpp b/src/slic3r/GUI/Lazy.hpp index 33e092d887..7f36f00d9e 100644 --- a/src/slic3r/GUI/Lazy.hpp +++ b/src/slic3r/GUI/Lazy.hpp @@ -9,7 +9,8 @@ #include #include -#include "StagedBuild.hpp" +namespace Slic3r::GUI { class StagedBuild; } + class wxBusyCursor; diff --git a/src/slic3r/GUI/LazyPage.hpp b/src/slic3r/GUI/LazyPage.hpp index fc85f69285..520c2bf824 100644 --- a/src/slic3r/GUI/LazyPage.hpp +++ b/src/slic3r/GUI/LazyPage.hpp @@ -9,6 +9,7 @@ #include #include "Lazy.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp index 7c9d6e651d..40ff181fb9 100644 --- a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp +++ b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp @@ -31,6 +31,10 @@ #include "../../src/libvgcode/include/GCodeInputData.hpp" #include "../../src/libvgcode/include/PathVertex.hpp" #include "libvgcode/include/Types.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/Slicing.hpp" +#include "libslic3r/SurfaceCollection.hpp" namespace libvgcode { class Viewer; diff --git a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp index 35b5bd7b44..dfcce08b69 100644 --- a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp +++ b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp @@ -17,7 +17,6 @@ #include "../../src/libvgcode/include/Types.hpp" #include "libslic3r/Color.hpp" #include "libslic3r/GCode/GCodeProcessor.hpp" -#include "slic3r/GUI/GUI_Preview.hpp" #include "libslic3r/ExtrusionEntity.hpp" #include "libslic3r/Point.hpp" diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 07d51f9f0c..980abfcc2c 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -136,6 +136,20 @@ #include #endif // __WXGTK__ #include +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Model.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/IdleScheduler.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include "slic3r/GUI/KeyChord.hpp" +#include "slic3r/GUI/ParamsPanel.hpp" +#include "slic3r/GUI/Tabbook.hpp" +#include "slic3r/GUI/Widgets/SideButton.hpp" +#include "slic3r/plugin/host/PluginPages.hpp" +#include "slic3r/Utils/NetworkAgent.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/MarkdownTip.hpp b/src/slic3r/GUI/MarkdownTip.hpp index adbb26721d..b905a008a6 100644 --- a/src/slic3r/GUI/MarkdownTip.hpp +++ b/src/slic3r/GUI/MarkdownTip.hpp @@ -7,6 +7,12 @@ #include #include +class wxTimer; +class wxTimerEvent; +class wxWebView; +class wxWebViewEvent; +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp index 23aff37f77..249db6c3d7 100644 --- a/src/slic3r/GUI/MediaFilePanel.cpp +++ b/src/slic3r/GUI/MediaFilePanel.cpp @@ -8,7 +8,6 @@ #include "slic3r/Utils/NetworkAgent.hpp" #include "Plater.hpp" #include "Widgets/Button.hpp" -#include "Widgets/SwitchButton.hpp" #include "Widgets/Label.hpp" #include "Printer/PrinterFileSystem.h" #include "MsgDialog.hpp" diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index d7a80a7823..f62426723e 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -12,7 +12,6 @@ #include "libslic3r_version.h" #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/Utils/NetworkAgentFactory.hpp" -#include "libslic3r/Thread.hpp" #include "libslic3r/AppConfig.hpp" #include "I18N.hpp" #include "MsgDialog.hpp" @@ -74,6 +73,8 @@ #include #include "wx/evtloop.h" +class wxImage; + static std::map error_messages = { {1, L("The device cannot handle more conversations. Please retry later.")}, {2, L("Player is malfunctioning. Please reinstall the system player.")}, diff --git a/src/slic3r/GUI/MediaPlayCtrl.h b/src/slic3r/GUI/MediaPlayCtrl.h index 8a8a15d474..cac07b07c3 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.h +++ b/src/slic3r/GUI/MediaPlayCtrl.h @@ -8,8 +8,6 @@ #ifndef MediaPlayCtrl_h #define MediaPlayCtrl_h -#include "wxMediaCtrl3.h" -#include "IMediaController.hpp" #include "WebRtcMediaController.hpp" #include "slic3r/Utils/IPrinterAgent.hpp" @@ -30,6 +28,11 @@ #include #include +class wxMediaCtrl3; +class wxShowEvent; +class wxWindow; +namespace Slic3r::GUI { class IMediaController; } + class Button; class Label; diff --git a/src/slic3r/GUI/MeshUtils.cpp b/src/slic3r/GUI/MeshUtils.cpp index db7f9aa5f2..66e3d53c3d 100644 --- a/src/slic3r/GUI/MeshUtils.cpp +++ b/src/slic3r/GUI/MeshUtils.cpp @@ -1,7 +1,6 @@ #include "MeshUtils.hpp" #include "libslic3r/Tesselate.hpp" -#include "libslic3r/TriangleMesh.hpp" #include "libslic3r/TriangleMeshSlicer.hpp" #include "libslic3r/ClipperUtils.hpp" #include "libslic3r/Model.hpp" @@ -39,6 +38,9 @@ #include "libslic3r/Polygon.hpp" #include "libslic3r/ExPolygon.hpp" #include "libslic3r/AABBMesh.hpp" +#include "libslic3r/CSGMesh/CSGMesh.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "slic3r/GUI/GLModel.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/ModelMall.cpp b/src/slic3r/GUI/ModelMall.cpp index bae46f2dcd..66d26f1042 100644 --- a/src/slic3r/GUI/ModelMall.cpp +++ b/src/slic3r/GUI/ModelMall.cpp @@ -20,11 +20,12 @@ #include #include "wx/evtloop.h" -#include "libslic3r/Model.hpp" #include "MainFrame.hpp" #include "GUI_App.hpp" #include "Plater.hpp" +namespace Slic3r::GUI { class Plater; } + namespace Slic3r { namespace GUI { ModelMallDialog::ModelMallDialog(Plater* plater /*= nullptr*/) diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp index b05ededd62..2c800ecebb 100644 --- a/src/slic3r/GUI/Monitor.cpp +++ b/src/slic3r/GUI/Monitor.cpp @@ -1,5 +1,4 @@ #include "Tab.hpp" -#include "libslic3r/Utils.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/AppConfig.hpp" #include "slic3r/Utils/bambu_networking.hpp" @@ -44,8 +43,6 @@ #include "GUI_ObjectList.hpp" #include "Plater.hpp" #include "MainFrame.hpp" -#include "Widgets/Label.hpp" -#include "format.hpp" #include "MediaPlayCtrl.h" #include "MediaFilePanel.h" #include "Plater.hpp" @@ -54,6 +51,11 @@ #include "DeviceCore/DevManager.h" #include +#include "slic3r/GUI/DeviceCore/DevHMS.h" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/HMS.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MonitorBasePanel.cpp b/src/slic3r/GUI/MonitorBasePanel.cpp index 21a49a4c65..d8a1f3b835 100644 --- a/src/slic3r/GUI/MonitorBasePanel.cpp +++ b/src/slic3r/GUI/MonitorBasePanel.cpp @@ -6,8 +6,6 @@ /////////////////////////////////////////////////////////////////////////// #include "MonitorBasePanel.h" -#include "Printer/PrinterFileSystem.h" -#include "Widgets/Label.hpp" #include #include #include @@ -20,6 +18,8 @@ #include #include "slic3r/GUI/Widgets/StaticLine.hpp" +class wxWindow; + /////////////////////////////////////////////////////////////////////////// using namespace Slic3r::GUI; @@ -291,7 +291,6 @@ VideoMonitoringBasePanel::~VideoMonitoringBasePanel() // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#include "MonitorBasePanel.h" /////////////////////////////////////////////////////////////////////////// using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/MonitorBasePanel.h b/src/slic3r/GUI/MonitorBasePanel.h index fbfeec60c6..8e9d4b73be 100644 --- a/src/slic3r/GUI/MonitorBasePanel.h +++ b/src/slic3r/GUI/MonitorBasePanel.h @@ -31,12 +31,12 @@ #include #include #include -#include "Widgets/Button.hpp" -#include "Widgets/SwitchButton.hpp" -#include "Widgets/AxisCtrlButton.hpp" -#include "Widgets/TextInput.hpp" -#include "Widgets/StaticLine.hpp" -#include "MediaPlayCtrl.h" + +class StaticLine; +class wxFlexGridSizer; +class wxStaticBitmap; +class wxStaticText; +class wxWindow; /////////////////////////////////////////////////////////////////////////// diff --git a/src/slic3r/GUI/MonitorPage.cpp b/src/slic3r/GUI/MonitorPage.cpp index 54a9289b5b..f3a93a9cca 100644 --- a/src/slic3r/GUI/MonitorPage.cpp +++ b/src/slic3r/GUI/MonitorPage.cpp @@ -4,6 +4,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MonitorPage.hpp b/src/slic3r/GUI/MonitorPage.hpp index 9e6e86e82d..ec7045aedf 100644 --- a/src/slic3r/GUI/MonitorPage.hpp +++ b/src/slic3r/GUI/MonitorPage.hpp @@ -6,6 +6,9 @@ #include #include +class wxBoxSizer; +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index cc5d97b358..a4d6c15305 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -55,6 +55,7 @@ #include "Widgets/Label.hpp" #include "slic3r/GUI/MainFrame.hpp" #include "GUI_App.hpp" +#include "libslic3r/AppConfig.hpp" #define MSG_DLG_MAX_SIZE wxSize(-1, FromDIP(464))//notice:ban setting the maximum width value namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiChoiceDialog.hpp b/src/slic3r/GUI/MultiChoiceDialog.hpp index a069c5e0df..965256eff6 100644 --- a/src/slic3r/GUI/MultiChoiceDialog.hpp +++ b/src/slic3r/GUI/MultiChoiceDialog.hpp @@ -1,8 +1,6 @@ #ifndef slic3r_GUI_MultiChoiceDialog_hpp_ #define slic3r_GUI_MultiChoiceDialog_hpp_ -#include "Widgets/CheckList.hpp" -#include "Widgets/DialogButtons.hpp" #include "slic3r/GUI/GUI_Utils.hpp" #include @@ -13,6 +11,9 @@ #include #include +class CheckList; +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/NativeCommands.cpp b/src/slic3r/GUI/NativeCommands.cpp index cd983d7e47..e93a1a4635 100644 --- a/src/slic3r/GUI/NativeCommands.cpp +++ b/src/slic3r/GUI/NativeCommands.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -41,6 +40,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { namespace { diff --git a/src/slic3r/GUI/NetworkTestDialog.hpp b/src/slic3r/GUI/NetworkTestDialog.hpp index cb1afe8377..24a0be51dc 100644 --- a/src/slic3r/GUI/NetworkTestDialog.hpp +++ b/src/slic3r/GUI/NetworkTestDialog.hpp @@ -6,8 +6,6 @@ #include #include "GUI_Utils.hpp" -#include "wxExtensions.hpp" -#include #include #include #include @@ -31,6 +29,14 @@ #include #include +class Button; +class wxBoxSizer; +class wxCloseEvent; +class wxStaticText; +class wxTextCtrl; +class wxWindow; +namespace boost { class thread; } + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Notebook.cpp b/src/slic3r/GUI/Notebook.cpp index 54c188fa38..bc71322558 100644 --- a/src/slic3r/GUI/Notebook.cpp +++ b/src/slic3r/GUI/Notebook.cpp @@ -7,7 +7,6 @@ #include "Widgets/Button.hpp" //BBS set font size -#include "Widgets/Label.hpp" #include #include diff --git a/src/slic3r/GUI/Notebook.hpp b/src/slic3r/GUI/Notebook.hpp index 1153161856..e85f3ad723 100644 --- a/src/slic3r/GUI/Notebook.hpp +++ b/src/slic3r/GUI/Notebook.hpp @@ -18,8 +18,11 @@ #include #include #include +#include +#include + +class wxObject; -class ScalableButton; class Button; // custom message the ButtonsListCtrl sends to its parent (Notebook) to notify a selection change: diff --git a/src/slic3r/GUI/OAuthDialog.hpp b/src/slic3r/GUI/OAuthDialog.hpp index 199d8f1c9c..372520a3a8 100644 --- a/src/slic3r/GUI/OAuthDialog.hpp +++ b/src/slic3r/GUI/OAuthDialog.hpp @@ -7,6 +7,9 @@ #include #include +class wxEvent; +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp index 890e85fa9f..0c2fada78c 100644 --- a/src/slic3r/GUI/OG_CustomCtrl.cpp +++ b/src/slic3r/GUI/OG_CustomCtrl.cpp @@ -4,7 +4,6 @@ #include "Plater.hpp" #include "GUI_App.hpp" #include "MsgDialog.hpp" -#include "libslic3r/AppConfig.hpp" #include #include @@ -27,9 +26,7 @@ #include #include #include -#include "libslic3r/Utils.hpp" #include "I18N.hpp" -#include "format.hpp" #include #include diff --git a/src/slic3r/GUI/OG_CustomCtrl.hpp b/src/slic3r/GUI/OG_CustomCtrl.hpp index c0ea80c172..906da83d89 100644 --- a/src/slic3r/GUI/OG_CustomCtrl.hpp +++ b/src/slic3r/GUI/OG_CustomCtrl.hpp @@ -8,7 +8,6 @@ #include #include #include -#include "slic3r/GUI/Field.hpp" #include #include #include @@ -20,10 +19,16 @@ #include #include "libslic3r/Config.hpp" -#include "libslic3r/PrintConfig.hpp" #include "OptionsGroup.hpp" -#include "I18N.hpp" + +class wxColour; +class wxDC; +class wxMouseEvent; +class wxPaintEvent; +class wxSizer; +class wxWindow; +namespace Slic3r::GUI { class Field; } // Translate the ifdef #ifdef __WXOSX__ diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index eea00e57e6..2028516f40 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -1,5 +1,4 @@ #include "ObjectDataViewModel.hpp" -#include "slic3r/GUI/wxExtensions.hpp" #include "wxExtensions.hpp" #include "BitmapCache.hpp" #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/OpenGLManager.cpp b/src/slic3r/GUI/OpenGLManager.cpp index 0224de1b8a..971a5282fc 100644 --- a/src/slic3r/GUI/OpenGLManager.cpp +++ b/src/slic3r/GUI/OpenGLManager.cpp @@ -32,6 +32,7 @@ #include #include "GUI_Init.hpp" +#include "slic3r/GUI/GLShadersManager.hpp" #ifdef __APPLE__ #include "../Utils/MacDarkMode.hpp" diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 711a95e209..27cdf31050 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -1,5 +1,4 @@ #include "OptionsGroup.hpp" -#include "ConfigExceptions.hpp" #include "Plater.hpp" #include "SettingsIndex.hpp" #include "GUI_App.hpp" @@ -7,7 +6,6 @@ #include "OG_CustomCtrl.hpp" #include "MsgDialog.hpp" #include "PluginPickerDialog.hpp" -#include "format.hpp" #include "Widgets/StaticLine.hpp" #include "Widgets/LabeledStaticBox.hpp" @@ -34,8 +32,6 @@ #include #include #include "libslic3r/Exception.hpp" -#include "libslic3r/Utils.hpp" -#include "libslic3r/AppConfig.hpp" #include "slic3r/plugin/PluginManager.hpp" #include "I18N.hpp" #include @@ -43,6 +39,8 @@ #include #include #include +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/wxExtensions.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ParamsDialog.cpp b/src/slic3r/GUI/ParamsDialog.cpp index 1c0da2919c..c7bca55f16 100644 --- a/src/slic3r/GUI/ParamsDialog.cpp +++ b/src/slic3r/GUI/ParamsDialog.cpp @@ -1,12 +1,10 @@ #include "ParamsDialog.hpp" -#include "I18N.hpp" #include "ParamsPanel.hpp" #include "GUI_App.hpp" #include "MainFrame.hpp" #include "Plater.hpp" #include "Tab.hpp" -#include "libslic3r/Utils.hpp" #include "slic3r/GUI/GUI_Utils.hpp" #include "libslic3r/Preset.hpp" #include @@ -19,6 +17,8 @@ #include #include "slic3r/GUI/Event.hpp" +class wxWindow; + namespace pt = boost::property_tree; typedef pt::ptree JSON; diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 674bbcd54f..5b25f292ee 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -8,7 +8,6 @@ #include "libslic3r/Preset.hpp" #include "ParamsPanel.hpp" #include "Tab.hpp" -#include "format.hpp" #include "MainFrame.hpp" #include "GUI_App.hpp" #include "Plater.hpp" @@ -17,6 +16,7 @@ #include "Widgets/SwitchButton.hpp" #include "Widgets/Button.hpp" #include "GUI_Factories.hpp" +#include "I18N.hpp" #include "libslic3r/Config.hpp" #include #include @@ -26,7 +26,6 @@ #include #include #include -#include "slic3r/GUI/Field.hpp" #include "slic3r/GUI/Widgets/CheckBox.hpp" #include #include diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 41233ebc3b..6450bf0747 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -75,7 +75,6 @@ #include "libslic3r/ClipperUtils.hpp" #include "libslic3r/BoundingBox.hpp" #include "libslic3r/Geometry.hpp" -#include "libslic3r/Tesselate.hpp" #include "libslic3r/GCode/ThumbnailData.hpp" #include "libslic3r/Utils.hpp" #include "libslic3r/LifecycleEvents.hpp" @@ -106,6 +105,15 @@ #include #include #include +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/SLA/Pad.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/GLModel.hpp" + +class wxFont; +namespace boost { template class optional; } using boost::optional; namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp index a423802a6c..ddf0d10965 100644 --- a/src/slic3r/GUI/PartSkipDialog.cpp +++ b/src/slic3r/GUI/PartSkipDialog.cpp @@ -54,11 +54,9 @@ #include "Widgets/CheckBox.hpp" #include "Widgets/Label.hpp" -#include "MsgDialog.hpp" #include "Printer/PrinterFileSystem.h" #include "PartSkipDialog.hpp" #include "SkipPartCanvas.hpp" -#include "MediaPlayCtrl.h" #include "DeviceCore/DevManager.h" diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index ffbf98ede2..212e94f133 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -42,7 +42,6 @@ #include #include -#include "libslic3r/libslic3r.h" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/PresetBundle.hpp" @@ -51,17 +50,12 @@ #include "GUI.hpp" #include "GUI_App.hpp" #include "MainFrame.hpp" -#include "format.hpp" #include "Tab.hpp" #include "libslic3r_version.h" -#include "wxExtensions.hpp" #include "PrintHostDialogs.hpp" -#include "../Utils/ASCIIFolding.hpp" #include "../Utils/PrintHost.hpp" #include "../Utils/Flashforge.hpp" #include "../Utils/UndoRedo.hpp" -#include "RemovableDriveManager.hpp" -#include "BitmapCache.hpp" #include "BonjourDialog.hpp" #include "CrealityDiscoveryDialog.hpp" #include "MsgDialog.hpp" diff --git a/src/slic3r/GUI/PluginProgressDialog.cpp b/src/slic3r/GUI/PluginProgressDialog.cpp index aa37655b73..cc7fa36b18 100644 --- a/src/slic3r/GUI/PluginProgressDialog.cpp +++ b/src/slic3r/GUI/PluginProgressDialog.cpp @@ -6,6 +6,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { PluginProgressDialog::PluginProgressDialog(wxWindow* parent, diff --git a/src/slic3r/GUI/PluginProgressDialog.hpp b/src/slic3r/GUI/PluginProgressDialog.hpp index 81e3950441..d7b2ab8329 100644 --- a/src/slic3r/GUI/PluginProgressDialog.hpp +++ b/src/slic3r/GUI/PluginProgressDialog.hpp @@ -11,6 +11,10 @@ #include "Widgets/ProgressDialog.hpp" +class wxTimer; +class wxTimerEvent; +class wxWindow; + namespace Slic3r { namespace GUI { // A host-owned progress dialog for Python plugins. This class is deliberately diff --git a/src/slic3r/GUI/PluginsConfigDialog.hpp b/src/slic3r/GUI/PluginsConfigDialog.hpp index 5ff832d348..a56b54f6d9 100644 --- a/src/slic3r/GUI/PluginsConfigDialog.hpp +++ b/src/slic3r/GUI/PluginsConfigDialog.hpp @@ -10,6 +10,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { // Lists the plugin capabilities the edited preset of `m_type` uses (see capabilities_in_use) and edits diff --git a/src/slic3r/GUI/PluginsDialog.hpp b/src/slic3r/GUI/PluginsDialog.hpp index 272acf8a9e..a2643ae8fd 100644 --- a/src/slic3r/GUI/PluginsDialog.hpp +++ b/src/slic3r/GUI/PluginsDialog.hpp @@ -2,11 +2,7 @@ #define slic3r_PluginsDialog_hpp_ #include "Widgets/WebViewHostDialog.hpp" -#include "Widgets/ProgressDialog.hpp" -#include "PluginSource.hpp" -#include "PluginStatus.hpp" #include "PluginSort.hpp" -#include "slic3r/plugin/PluginDescriptor.hpp" #include #include @@ -32,7 +28,9 @@ #include #include -class wxTimer; +class wxWindow; +namespace Slic3r { struct PluginDescriptor; } + namespace Slic3r { diff --git a/src/slic3r/GUI/PostProcessor.hpp b/src/slic3r/GUI/PostProcessor.hpp index 1c0fc09240..25d2db3351 100644 --- a/src/slic3r/GUI/PostProcessor.hpp +++ b/src/slic3r/GUI/PostProcessor.hpp @@ -4,8 +4,8 @@ #include #include -#include "libslic3r/libslic3r.h" -#include "libslic3r/PrintConfig.hpp" +namespace Slic3r { class DynamicPrintConfig; } + namespace Slic3r { diff --git a/src/slic3r/GUI/PrePrintChecker.cpp b/src/slic3r/GUI/PrePrintChecker.cpp index c15cfb9cbf..40ec5207aa 100644 --- a/src/slic3r/GUI/PrePrintChecker.cpp +++ b/src/slic3r/GUI/PrePrintChecker.cpp @@ -1,5 +1,4 @@ #include "PrePrintChecker.hpp" -#include "GUI_Utils.hpp" #include "I18N.hpp" #include #include @@ -16,6 +15,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 28dfbed4a8..3dfd5e3b0a 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -52,7 +52,6 @@ #include #endif -#include "libslic3r/libslic3r.h" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/PresetBundle.hpp" #include "libslic3r/Color.hpp" @@ -64,9 +63,7 @@ #include "format.hpp" #include "Tab.hpp" #include "ConfigWizard.hpp" -#include "../Utils/ASCIIFolding.hpp" #include "../Utils/UndoRedo.hpp" -#include "../Utils/ColorSpaceConvert.hpp" #include "BitmapCache.hpp" #include "SavePresetDialog.hpp" #include "MsgDialog.hpp" diff --git a/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp index 4f33ee8353..143267752b 100644 --- a/src/slic3r/GUI/PresetHints.cpp +++ b/src/slic3r/GUI/PresetHints.cpp @@ -1,20 +1,15 @@ #include -#include "libslic3r/Flow.hpp" -#include "libslic3r/Slicing.hpp" -#include "libslic3r/libslic3r.h" #include "PresetHints.hpp" #include -#include "libslic3r/Preset.hpp" #include "libslic3r/Config.hpp" -#include "libslic3r/PresetBundle.hpp" #include -#include "GUI.hpp" -#include "format.hpp" -#include "I18N.hpp" +namespace Slic3r { class Preset; } +namespace Slic3r { class PresetBundle; } + namespace Slic3r { diff --git a/src/slic3r/GUI/PresetHints.hpp b/src/slic3r/GUI/PresetHints.hpp index d7a30890e5..3f68a9962f 100644 --- a/src/slic3r/GUI/PresetHints.hpp +++ b/src/slic3r/GUI/PresetHints.hpp @@ -1,10 +1,11 @@ #ifndef slic3r_PresetHints_hpp_ #define slic3r_PresetHints_hpp_ -#include "libslic3r/Preset.hpp" #include -#include "libslic3r/PresetBundle.hpp" +namespace Slic3r { class Preset; } +namespace Slic3r { class PresetBundle; } + namespace Slic3r { diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp index df14efa976..3050ec4d8a 100644 --- a/src/slic3r/GUI/PrintHostDialogs.cpp +++ b/src/slic3r/GUI/PrintHostDialogs.cpp @@ -80,6 +80,11 @@ #include "wxExtensions.hpp" #include +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include namespace fs = boost::filesystem; using json = nlohmann::json; diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp index 89e57806b8..a74780660c 100644 --- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp +++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp @@ -1818,6 +1818,7 @@ void PrinterFileSystem::Reconnect(boost::unique_lock &l, int resul #include +#include "libslic3r/PrintConfig.hpp" #if defined(_MSC_VER) || defined(_WIN32) #include #else diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.hpp b/src/slic3r/GUI/PrinterCloudAuthDialog.hpp index 5095c76875..60595ebd07 100644 --- a/src/slic3r/GUI/PrinterCloudAuthDialog.hpp +++ b/src/slic3r/GUI/PrinterCloudAuthDialog.hpp @@ -11,6 +11,11 @@ #include #include "wx/webview.h" +class wxWebView; +class wxWebViewEvent; +class wxWindow; +namespace Slic3r { class PrintHost; } + #if wxUSE_WEBVIEW_IE #include "wx/msw/webview_ie.h" #endif @@ -18,8 +23,6 @@ #include "wx/msw/webview_edge.h" #endif -#include "GUI_Utils.hpp" -#include "PrintHost.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 7d849da5fd..e96d8c9062 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -1,9 +1,7 @@ #include "PrinterWebView.hpp" -#include "I18N.hpp" #include "PrinterWebViewHandler.hpp" #include "slic3r/GUI/PrinterWebView.hpp" -#include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/MainFrame.hpp" #include "libslic3r_version.h" @@ -25,6 +23,8 @@ #include #include +class wxWindow; + #ifdef __linux__ #include #endif diff --git a/src/slic3r/GUI/PrinterWebViewHandler.hpp b/src/slic3r/GUI/PrinterWebViewHandler.hpp index 02da72c75f..55ed89eb6a 100644 --- a/src/slic3r/GUI/PrinterWebViewHandler.hpp +++ b/src/slic3r/GUI/PrinterWebViewHandler.hpp @@ -5,6 +5,8 @@ #include #include +class wxWebViewEvent; + class wxWebView; namespace Slic3r { diff --git a/src/slic3r/GUI/ProcessRunner.hpp b/src/slic3r/GUI/ProcessRunner.hpp index 95910d4505..0fd902acf5 100644 --- a/src/slic3r/GUI/ProcessRunner.hpp +++ b/src/slic3r/GUI/ProcessRunner.hpp @@ -15,6 +15,8 @@ #include +namespace boost::process { class child; } + namespace Slic3r { namespace GUI { class ProcessRunner : public wxEvtHandler diff --git a/src/slic3r/GUI/ProgressStatusBar.hpp b/src/slic3r/GUI/ProgressStatusBar.hpp index 3ce3c85792..e29883c63e 100644 --- a/src/slic3r/GUI/ProgressStatusBar.hpp +++ b/src/slic3r/GUI/ProgressStatusBar.hpp @@ -11,7 +11,6 @@ class wxTimer; class wxGauge; class wxButton; -class wxTimerEvent; class wxStatusBar; class wxWindow; class wxFrame; diff --git a/src/slic3r/GUI/Project.cpp b/src/slic3r/GUI/Project.cpp index 051590a402..2ce0da582c 100644 --- a/src/slic3r/GUI/Project.cpp +++ b/src/slic3r/GUI/Project.cpp @@ -1,8 +1,6 @@ -#include "Tab.hpp" #include "Project.hpp" #include "libslic3r/Utils.hpp" #include "libslic3r/Model.hpp" -#include "libslic3r/Format/bbs_3mf.hpp" #include #include @@ -18,10 +16,10 @@ #include #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/Auxiliary.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include #include #include -#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include #include #include @@ -52,11 +50,13 @@ #include #include -#include "wxExtensions.hpp" #include "GUI_App.hpp" -#include "GUI_ObjectList.hpp" -#include "MainFrame.hpp" #include +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/Utils/json_diff.hpp" + +class wxWindow; namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/Project.hpp b/src/slic3r/GUI/Project.hpp index 90e6eda1f1..13d234a697 100644 --- a/src/slic3r/GUI/Project.hpp +++ b/src/slic3r/GUI/Project.hpp @@ -1,7 +1,6 @@ #ifndef slic3r_Project_hpp_ #define slic3r_Project_hpp_ -#include "Tabbook.hpp" #include "wx/artprov.h" #include "wx/cmdline.h" #include "wx/notifmsg.h" @@ -14,7 +13,6 @@ #include #include #include -#include "slic3r/GUI/Printer/PrinterFileSystem.h" #if wxUSE_WEBVIEW_EDGE #include "wx/msw/webview_edge.h" @@ -39,12 +37,14 @@ #include #include #include -#include "Event.hpp" -#include "libslic3r/ProjectTask.hpp" -#include "wxExtensions.hpp" -#include "Auxiliary.hpp" #include "Lazy.hpp" +class wxWebView; +class wxWebViewEvent; +class wxWindow; +namespace Slic3r::GUI { class AuxiliaryPanel; } +namespace boost { class thread; } + #define AUFILE_GREY700 wxColour(107, 107, 107) #define AUFILE_GREY500 wxColour(158, 158, 158) #define AUFILE_GREY300 wxColour(238, 238, 238) diff --git a/src/slic3r/GUI/PublishSettingsDialog.hpp b/src/slic3r/GUI/PublishSettingsDialog.hpp index 3b7b8a4e5c..b7f537b4a5 100644 --- a/src/slic3r/GUI/PublishSettingsDialog.hpp +++ b/src/slic3r/GUI/PublishSettingsDialog.hpp @@ -2,7 +2,6 @@ #include "GUI_Utils.hpp" #include "wxExtensions.hpp" -#include "Widgets/TabCtrl.hpp" #include "libslic3r/PublishSettings.hpp" @@ -20,6 +19,19 @@ #include #include +class TabCtrl; +class wxBoxSizer; +class wxCommandEvent; +class wxMouseEvent; +class wxPanel; +class wxScrolledWindow; +class wxSizerItem; +class wxStaticBitmap; +class wxStaticText; +class wxTextCtrl; +class wxWindow; +namespace Slic3r { class DynamicPrintConfig; } + // Forward declarations (all are global classes, see Widgets/TextInput.hpp and // Widgets/StaticLine.hpp). class TextInput; diff --git a/src/slic3r/GUI/RammingChart.cpp b/src/slic3r/GUI/RammingChart.cpp index 6348135d9a..017055a1e6 100644 --- a/src/slic3r/GUI/RammingChart.cpp +++ b/src/slic3r/GUI/RammingChart.cpp @@ -12,8 +12,6 @@ #include #include "RammingChart.hpp" -#include "GUI.hpp" -#include "GUI_App.hpp" #include "I18N.hpp" #include "Widgets/StateColor.hpp" diff --git a/src/slic3r/GUI/RecenterDialog.hpp b/src/slic3r/GUI/RecenterDialog.hpp index 3954d87094..ac3978dae4 100644 --- a/src/slic3r/GUI/RecenterDialog.hpp +++ b/src/slic3r/GUI/RecenterDialog.hpp @@ -7,11 +7,15 @@ #include #include #include -#include "Widgets/Button.hpp" #include #include #include +class wxCommandEvent; +class wxDC; +class wxPaintEvent; +class wxWindow; + namespace Slic3r { namespace GUI { class RecenterDialog : public DPIDialog { diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index fd8c0bad2c..9a0bc54b6e 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -3,16 +3,11 @@ #include "bambu_networking.hpp" #include "libslic3r/Utils.hpp" -#include "libslic3r/Thread.hpp" #include "GUI.hpp" #include "GUI_App.hpp" #include "GUI_Utils.hpp" #include "GUI_Preview.hpp" #include "MainFrame.hpp" -#include "format.hpp" -#include "Widgets/ProgressDialog.hpp" -#include "Widgets/RoundedRectangle.hpp" -#include "Widgets/StaticBox.hpp" #include "Widgets/WebView.hpp" #include "Jobs/BoostThreadWorker.hpp" #include "Jobs/PlaterWorker.hpp" @@ -63,15 +58,24 @@ #include #include #include "Plater.hpp" -#include "BitmapCache.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "DeviceCore/DevManager.h" #include "DeviceCore/DevStorage.h" #include "../Utils/Http.hpp" #include "md4c/src/md4c-html.h" +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/HMS.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/Utils/NetworkAgent.hpp" #include +namespace Slic3r::GUI { class Plater; } + namespace fs = boost::filesystem; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SavePresetDialog.hpp b/src/slic3r/GUI/SavePresetDialog.hpp index 3bbeeb0cde..fccc02ecf1 100644 --- a/src/slic3r/GUI/SavePresetDialog.hpp +++ b/src/slic3r/GUI/SavePresetDialog.hpp @@ -4,13 +4,7 @@ //#include #include "libslic3r/Preset.hpp" -#include "wxExtensions.hpp" #include "GUI_Utils.hpp" -#include "Widgets/RadioGroup.hpp" -#include "Widgets/Button.hpp" -#include "Widgets/RoundedRectangle.hpp" -#include "Widgets/Label.hpp" -#include "Widgets/TextInput.hpp" #include #include #include @@ -18,7 +12,11 @@ #include #include -class wxString; +class RadioGroup; +class TextInput; +class wxBoxSizer; +class wxCommandEvent; + class wxStaticText; class wxComboBox; class wxStaticBitmap; diff --git a/src/slic3r/GUI/SceneBenchmark.cpp b/src/slic3r/GUI/SceneBenchmark.cpp index d98cb4a0c0..a1e60a6fbf 100644 --- a/src/slic3r/GUI/SceneBenchmark.cpp +++ b/src/slic3r/GUI/SceneBenchmark.cpp @@ -55,6 +55,12 @@ #include #include #include +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/GCodeViewer.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" + +class wxWindow; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 2fe8d416c6..36b12017c5 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -9,7 +9,6 @@ #include "GUI_App.hpp" #include "GUI_Preview.hpp" #include "MainFrame.hpp" -#include "format.hpp" #include "Widgets/ProgressDialog.hpp" #include "Widgets/RoundedRectangle.hpp" #include "Widgets/StaticBox.hpp" @@ -120,8 +119,22 @@ #include "Notebook.hpp" #include "BitmapCache.hpp" #include "BindDialog.hpp" +#include "slic3r/GUI/DeviceCore/DevUtil.h" +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "libslic3r/GCode/ToolOrdering.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/Jobs/BindJob.hpp" +#include "slic3r/GUI/Tabbook.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/Utils/NetworkAgent.hpp" #include +namespace Slic3r { class PrintBase; } + namespace fs = boost::filesystem; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SelectMachinePop.cpp b/src/slic3r/GUI/SelectMachinePop.cpp index 6dc39bb1a0..7a847ec9d0 100644 --- a/src/slic3r/GUI/SelectMachinePop.cpp +++ b/src/slic3r/GUI/SelectMachinePop.cpp @@ -10,7 +10,6 @@ #include "GUI_App.hpp" #include "GUI_Preview.hpp" #include "MainFrame.hpp" -#include "format.hpp" #include "Widgets/ProgressDialog.hpp" #include "Widgets/RoundedRectangle.hpp" #include "Widgets/StaticBox.hpp" @@ -53,7 +52,6 @@ #include #include "Plater.hpp" #include "Notebook.hpp" -#include "BitmapCache.hpp" #include "BindDialog.hpp" #include "DeviceCore/DevManager.h" diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index b704ac1fcb..c19ed2fe43 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -4,7 +4,6 @@ #include "3DScene.hpp" #include "GLCanvas3D.hpp" #include "GUI_App.hpp" -#include "GUI.hpp" #include "GUI_ObjectList.hpp" #include "Gizmos/GLGizmoBase.hpp" #include "Camera.hpp" @@ -52,6 +51,16 @@ #include #include #include +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/TextConfiguration.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp" +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/PartPlate.hpp" static const Slic3r::ColorRGBA UNIFORM_SCALE_COLOR = Slic3r::ColorRGBA::ORANGE(); static const Slic3r::ColorRGBA SOLID_PLANE_COLOR = {0.0f, 174.0f / 255.0f, 66.0f / 255.0f, 1.0f}; diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index 809a8b4715..ae528da0d0 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -61,6 +61,18 @@ #include "DeviceCore/DevManager.h" #include "DeviceCore/DevStorage.h" +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Print.hpp" +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/wxExtensions.hpp" #include namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp index 3c16ddde93..5d20e9e478 100644 --- a/src/slic3r/GUI/SendSystemInfoDialog.cpp +++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp @@ -1,4 +1,5 @@ #include "SendSystemInfoDialog.hpp" +#include "libslic3r/Semver.hpp" #include #include #include @@ -45,11 +46,9 @@ #include "slic3r/GUI/format.hpp" #include "slic3r/Utils/Http.hpp" -#include "slic3r/Utils/PresetUpdater.hpp" #include "GUI_App.hpp" #include "GUI_Utils.hpp" -#include "I18N.hpp" #ifdef __WXGTK__ #include "LinuxDisplayBackend.hpp" #endif @@ -75,6 +74,8 @@ #include #include +class wxWindow; + #ifdef _WIN32 #include #include diff --git a/src/slic3r/GUI/SkipPartCanvas.hpp b/src/slic3r/GUI/SkipPartCanvas.hpp index c87c391a6e..ffff21d389 100644 --- a/src/slic3r/GUI/SkipPartCanvas.hpp +++ b/src/slic3r/GUI/SkipPartCanvas.hpp @@ -18,6 +18,10 @@ #include #include "PartSkipCommon.hpp" +class wxGLContext; +class wxTextCtrl; +class wxWindow; + wxDECLARE_EVENT(EVT_ZOOM_PERCENT, wxCommandEvent); wxDECLARE_EVENT(EVT_CANVAS_PART, wxCommandEvent); diff --git a/src/slic3r/GUI/SliceInfoPanel.cpp b/src/slic3r/GUI/SliceInfoPanel.cpp index ed8ad89147..975fc979ec 100644 --- a/src/slic3r/GUI/SliceInfoPanel.cpp +++ b/src/slic3r/GUI/SliceInfoPanel.cpp @@ -22,10 +22,9 @@ #include #include #include -#include "I18N.hpp" -#include "Widgets/Label.hpp" #include "libslic3r/Utils.hpp" -#include "GUI_App.hpp"//for ICON_SIZE (wxSize(FromDIP(16), FromDIP(16))) + +class wxWindow; namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SliceInfoPanel.hpp b/src/slic3r/GUI/SliceInfoPanel.hpp index 94a6a4149f..1213dfb6df 100644 --- a/src/slic3r/GUI/SliceInfoPanel.hpp +++ b/src/slic3r/GUI/SliceInfoPanel.hpp @@ -1,15 +1,10 @@ #ifndef slic3r_SliceInfoPanel_hpp_ #define slic3r_SliceInfoPanel_hpp_ -#include "slic3r/GUI/MonitorBasePanel.h" -#include "libslic3r/ProjectTask.hpp" -#include "DeviceManager.hpp" -#include "GUI.hpp" #include #include #include #include -#include "slic3r/GUI/wxExtensions.hpp" #include #include #include @@ -20,6 +15,15 @@ #include #include "Widgets/PopupWindow.hpp" +class ImageTransientPopup; +class wxBoxSizer; +class wxGridSizer; +class wxScrolledWindow; +class wxStaticBitmap; +class wxStaticText; +class wxWindow; +namespace Slic3r { class BBLSliceInfo; } + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SpeedDialDialog.hpp b/src/slic3r/GUI/SpeedDialDialog.hpp index f0bc5f3f00..7214a5773b 100644 --- a/src/slic3r/GUI/SpeedDialDialog.hpp +++ b/src/slic3r/GUI/SpeedDialDialog.hpp @@ -10,6 +10,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { class SpeedDialWebDialog : public WebViewHostDialog diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 6cea75fb71..7d0cf73581 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -14,7 +14,6 @@ #include "MsgDialog.hpp" #include "bambu_networking.hpp" #include "slic3r/Utils/Http.hpp" -#include "libslic3r/Thread.hpp" #include "DeviceErrorDialog.hpp" #include "RecenterDialog.hpp" diff --git a/src/slic3r/GUI/SurfaceDrag.cpp b/src/slic3r/GUI/SurfaceDrag.cpp index 81b03c4836..b9058f38cd 100644 --- a/src/slic3r/GUI/SurfaceDrag.cpp +++ b/src/slic3r/GUI/SurfaceDrag.cpp @@ -25,6 +25,9 @@ #include "I18N.hpp" #include "GUI_App.hpp" #include "Gizmos/GizmoObjectManipulation.hpp" +#include "libslic3r/EmbossShape.hpp" +#include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/GUI_Geometry.hpp" using namespace Slic3r; diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 67efdd6ff7..cd9ac19182 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -47,15 +47,11 @@ #include #include #include "GUI_App.hpp" -#include "Tab.hpp" #include "PartPlate.hpp" #include "I18N.hpp" #include "MainFrame.hpp" #include "Widgets/Button.hpp" -#include "Widgets/TextInput.hpp" #include "Notebook.hpp" -#include "Jobs/BoostThreadWorker.hpp" -#include "Jobs/PlaterWorker.hpp" #include #include #include @@ -63,7 +59,6 @@ #include #include #include "Widgets/Label.hpp" -#include "Widgets/Button.hpp" #include "Widgets/CheckBox.hpp" #include "Widgets/DialogButtons.hpp" #include "CapsuleButton.hpp" @@ -77,6 +72,17 @@ #include "DeviceCore/DevMapping.h" #include "DeviceCore/DevStorage.h" #include "FilamentBitmapUtils.hpp" +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Print.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/Utils/NetworkAgent.hpp" namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 3050830d56..770e14de9f 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -103,13 +103,11 @@ #include "Widgets/SwitchButton.hpp" #include "Widgets/TabCtrl.hpp" #include "Widgets/ComboBox.hpp" -#include "MarkdownTip.hpp" #include "Search.hpp" #include "BedShapeDialog.hpp" #include "libslic3r/GCode/Thumbnails.hpp" #include "WipeTowerDialog.hpp" -#include "DeviceCore/DevManager.h" #ifdef WIN32 #include diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp index f7c1a55d7c..57df6c1d4a 100644 --- a/src/slic3r/GUI/TabButton.cpp +++ b/src/slic3r/GUI/TabButton.cpp @@ -14,6 +14,7 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" BEGIN_EVENT_TABLE(TabButton, StaticBox) diff --git a/src/slic3r/GUI/TabButton.hpp b/src/slic3r/GUI/TabButton.hpp index e637ea836b..bdc05d32dd 100644 --- a/src/slic3r/GUI/TabButton.hpp +++ b/src/slic3r/GUI/TabButton.hpp @@ -9,6 +9,9 @@ #include #include +class wxDC; +class wxWindow; + class TabButton : public StaticBox { wxSize textSize; diff --git a/src/slic3r/GUI/Tabbook.hpp b/src/slic3r/GUI/Tabbook.hpp index fd18ff0589..4219b1fc0a 100644 --- a/src/slic3r/GUI/Tabbook.hpp +++ b/src/slic3r/GUI/Tabbook.hpp @@ -17,9 +17,13 @@ #include #include #include "wxExtensions.hpp" +#include +#include + +class wxObject; +class wxStaticText; -class ScalableButton; class TabButton; // custom message the ButtonsListCtrl sends to its parent (Notebook) to notify a selection change: diff --git a/src/slic3r/GUI/TerminalDialog.cpp b/src/slic3r/GUI/TerminalDialog.cpp index ce4435aa07..0b20f20ce3 100644 --- a/src/slic3r/GUI/TerminalDialog.cpp +++ b/src/slic3r/GUI/TerminalDialog.cpp @@ -17,6 +17,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { namespace { diff --git a/src/slic3r/GUI/TerminalDialog.hpp b/src/slic3r/GUI/TerminalDialog.hpp index 6abd268c36..aa666e368f 100644 --- a/src/slic3r/GUI/TerminalDialog.hpp +++ b/src/slic3r/GUI/TerminalDialog.hpp @@ -12,6 +12,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { class ProcessRunner; diff --git a/src/slic3r/GUI/TextLines.cpp b/src/slic3r/GUI/TextLines.cpp index 1efd36a0ed..ba3ee28920 100644 --- a/src/slic3r/GUI/TextLines.cpp +++ b/src/slic3r/GUI/TextLines.cpp @@ -24,19 +24,19 @@ #include "libslic3r/Emboss.hpp" #include "libslic3r/TriangleMeshSlicer.hpp" -#include "libslic3r/Tesselate.hpp" #include "libslic3r/AABBTreeLines.hpp" #include "libslic3r/ExPolygonsIndex.hpp" #include "libslic3r/ClipperUtils.hpp" -#include "slic3r/GUI/Selection.hpp" -#include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GLModel.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/GUI_ObjectList.hpp" using namespace Slic3r; using namespace Slic3r::Emboss; diff --git a/src/slic3r/GUI/TextLines.hpp b/src/slic3r/GUI/TextLines.hpp index 4664de98c6..6d8cd1b368 100644 --- a/src/slic3r/GUI/TextLines.hpp +++ b/src/slic3r/GUI/TextLines.hpp @@ -3,11 +3,11 @@ #include "libslic3r/TextConfiguration.hpp" #include -#include #include #include #include "slic3r/GUI/GLModel.hpp" -#include "slic3r/Utils/EmbossStyleManager.hpp" + +namespace Slic3r::GUI::Emboss { class StyleManager; } namespace Slic3r { class ModelVolume; diff --git a/src/slic3r/GUI/TextureProjectorFrame.cpp b/src/slic3r/GUI/TextureProjectorFrame.cpp index 9469e0f397..9ee7f9ded9 100644 --- a/src/slic3r/GUI/TextureProjectorFrame.cpp +++ b/src/slic3r/GUI/TextureProjectorFrame.cpp @@ -13,9 +13,10 @@ #include #include -#include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" +class wxWindow; + namespace Slic3r { namespace GUI { TextureProjectorFrame::TextureProjectorFrame(wxWindow *parent) diff --git a/src/slic3r/GUI/TextureProjectorFrame.hpp b/src/slic3r/GUI/TextureProjectorFrame.hpp index 6c2048465b..6d9829e45e 100644 --- a/src/slic3r/GUI/TextureProjectorFrame.hpp +++ b/src/slic3r/GUI/TextureProjectorFrame.hpp @@ -25,6 +25,9 @@ #include #include +class wxPaintEvent; +class wxWindow; + namespace Slic3r { namespace GUI { class TextureProjectorFrame : public wxFrame diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp index 03a0c5f45f..d6a04ddbd6 100644 --- a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp +++ b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp @@ -1,8 +1,6 @@ #include "ThermalPreconditioningDialog.hpp" #include "I18N.hpp" -#include "GUI.hpp" #include "GUI_App.hpp" -#include "wxExtensions.hpp" #include "DeviceManager.hpp" #include "DeviceCore/DevManager.h" #include @@ -17,6 +15,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { BEGIN_EVENT_TABLE(ThermalPreconditioningDialog, wxDialog) diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.hpp b/src/slic3r/GUI/ThermalPreconditioningDialog.hpp index a7538a7e9a..9ccbcabdb4 100644 --- a/src/slic3r/GUI/ThermalPreconditioningDialog.hpp +++ b/src/slic3r/GUI/ThermalPreconditioningDialog.hpp @@ -11,6 +11,12 @@ #include #include +class wxButton; +class wxStaticText; +class wxTimer; +class wxTimerEvent; +class wxWindow; + namespace Slic3r { diff --git a/src/slic3r/GUI/TickCode.hpp b/src/slic3r/GUI/TickCode.hpp index 50025d4172..e8cb848d76 100644 --- a/src/slic3r/GUI/TickCode.hpp +++ b/src/slic3r/GUI/TickCode.hpp @@ -2,7 +2,6 @@ #define slic3r_GUI_TickCode_hpp_ #include "libslic3r/CustomGCode.hpp" -#include "libslic3r/Color.hpp" #include #include #include diff --git a/src/slic3r/GUI/UVEditorCanvas.cpp b/src/slic3r/GUI/UVEditorCanvas.cpp index 3a2b28a689..03a642fc07 100644 --- a/src/slic3r/GUI/UVEditorCanvas.cpp +++ b/src/slic3r/GUI/UVEditorCanvas.cpp @@ -45,7 +45,6 @@ #include "Widgets/CheckBox.hpp" #include "Widgets/SpinInput.hpp" #include "libslic3r/AppConfig.hpp" -#include "libslic3r/Utils.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/UserManager.cpp b/src/slic3r/GUI/UserManager.cpp index 3cbf30cfd9..cdc2bfcaf5 100644 --- a/src/slic3r/GUI/UserManager.cpp +++ b/src/slic3r/GUI/UserManager.cpp @@ -1,10 +1,6 @@ #include "json_diff.hpp" -#include "libslic3r/libslic3r.h" #include "UserManager.hpp" -#include "DeviceManager.hpp" #include "BindDialog.hpp" -#include "NetworkAgent.hpp" -#include "GUI.hpp" #include "GUI_App.hpp" #include "I18N.hpp" #include "MsgDialog.hpp" diff --git a/src/slic3r/GUI/WebDialog.hpp b/src/slic3r/GUI/WebDialog.hpp index 2fb017d68c..e1cfda0701 100644 --- a/src/slic3r/GUI/WebDialog.hpp +++ b/src/slic3r/GUI/WebDialog.hpp @@ -14,6 +14,11 @@ #include #include +class wxCloseEvent; +class wxSize; +class wxWebViewEvent; +class wxWindow; + namespace Slic3r { namespace GUI { // A host-owned webview window that renders plugin-supplied raw HTML and bridges diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index e4e0a9b4d5..8d5fe9bfc2 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -12,7 +12,6 @@ #include #include #include -#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_Utils.hpp" @@ -36,8 +35,8 @@ #include "libslic3r/Preset.hpp" #include "libslic3r/PresetBundle.hpp" #include "libslic3r/PresetCacheFormat.hpp" -#include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include "libslic3r_version.h" #include @@ -74,10 +73,14 @@ #include "Plater.hpp" #include #include -#include -#include #include #include "CreatePresetsDialog.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/Utils/NetworkAgent.hpp" +#include "slic3r/Utils/PresetUpdater.hpp" +#include "slic3r/Utils/json_diff.hpp" + +class wxWindow; namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/WebGuideDialog.hpp b/src/slic3r/GUI/WebGuideDialog.hpp index 73aa765c89..3f84f4248f 100644 --- a/src/slic3r/GUI/WebGuideDialog.hpp +++ b/src/slic3r/GUI/WebGuideDialog.hpp @@ -34,9 +34,6 @@ #include #include "wx/textctrl.h" -#include "GUI_App.hpp" -#include "libslic3r/PresetBundle.hpp" -#include "slic3r/Utils/PresetUpdater.hpp" #include #include @@ -46,6 +43,16 @@ #include #include +#include "libslic3r/AppConfig.hpp" + +class wxCommandEvent; +class wxIdleEvent; +class wxWebView; +class wxWebViewEvent; +namespace Slic3r { class PresetBundle; } +namespace Slic3r { class PresetUpdater; } +namespace Slic3r::GUI { class GUI_App; } +namespace boost { class thread; } namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebPanel.hpp b/src/slic3r/GUI/WebPanel.hpp index 4ef5fec34c..8fb8b8d1fc 100644 --- a/src/slic3r/GUI/WebPanel.hpp +++ b/src/slic3r/GUI/WebPanel.hpp @@ -9,6 +9,11 @@ #include #include +class wxCommandEvent; +class wxWebView; +class wxWebViewEvent; +class wxWindow; + namespace Slic3r { namespace GUI { // Host-supplied HTML in a web view panel, for any window that embeds or derives from it (today plugin diff --git a/src/slic3r/GUI/WebRtcMediaController.hpp b/src/slic3r/GUI/WebRtcMediaController.hpp index 0c291ef0e2..19adfd2a2f 100644 --- a/src/slic3r/GUI/WebRtcMediaController.hpp +++ b/src/slic3r/GUI/WebRtcMediaController.hpp @@ -1,7 +1,6 @@ #pragma once #include "IMediaController.hpp" -#include #include #include @@ -22,6 +21,11 @@ #include #include +class wxImage; +namespace Slic3r { class ICameraSignalingChannel; } +namespace Slic3r { enum class CameraUnavailableReason; } +namespace Slic3r { struct CameraIceServer; } + namespace rtc { class DataChannel; class PeerConnection; diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 3e36a6be09..7a119c440d 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -2,11 +2,9 @@ #include "CloudProvider.hpp" #include "I18N.hpp" -#include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/MainFrame.hpp" #include "libslic3r_version.h" -#include "../Utils/Http.hpp" #include #include diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 1abe045942..c5015c9ddc 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -1,6 +1,5 @@ #include "AMSControl.hpp" #include "Label.hpp" -#include "../BitmapCache.hpp" #include "../I18N.hpp" #include "../GUI_App.hpp" @@ -42,8 +41,12 @@ #include #include +#include "slic3r/GUI/DeviceCore/DevUtil.h" +#include "libslic3r/AppConfig.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/Widgets/StepCtrl.hpp" +#include "slic3r/GUI/wxExtensions.hpp" -#include "CalibUtils.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index 303b4221bb..e367930db1 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -1,6 +1,5 @@ #include "AMSItem.hpp" #include "Label.hpp" -#include "../BitmapCache.hpp" #include "../I18N.hpp" #include "../GUI_App.hpp" #include "../FilamentBitmapUtils.hpp" @@ -15,7 +14,6 @@ #include #include #include -#include "slic3r/GUI/Event.hpp" #include #include "slic3r/GUI/DeviceCore/DevDefs.h" #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" @@ -45,6 +43,9 @@ #include #include "CalibUtils.hpp" +#include "slic3r/GUI/wxExtensions.hpp" + +namespace Slic3r::GUI { struct SimpleEvent; } diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp index a771e28be2..54f9a306d2 100644 --- a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp +++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp @@ -16,6 +16,7 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateHandler.hpp" StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal))); static const wxColour BUTTON_BG_COL = wxColour("#EEEEEE"); diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp index 3a9b714c5c..d03cae5469 100644 --- a/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp +++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp @@ -11,6 +11,8 @@ #include "../wxExtensions.hpp" #include "StateHandler.hpp" +class wxDC; + class AxisCtrlButton : public wxWindow { diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp index 54e720feb4..1a5816d1da 100644 --- a/src/slic3r/GUI/Widgets/Button.cpp +++ b/src/slic3r/GUI/Widgets/Button.cpp @@ -16,6 +16,8 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/wxExtensions.hpp" #ifdef __APPLE__ #include "libslic3r/MacUtils.hpp" #endif diff --git a/src/slic3r/GUI/Widgets/CheckList.cpp b/src/slic3r/GUI/Widgets/CheckList.cpp index a9c5c15be4..447ef5a216 100644 --- a/src/slic3r/GUI/Widgets/CheckList.cpp +++ b/src/slic3r/GUI/Widgets/CheckList.cpp @@ -1,6 +1,5 @@ #include "CheckList.hpp" -#include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include #include @@ -16,6 +15,7 @@ #include "slic3r/GUI/Widgets/StateColor.hpp" #include #include +#include "slic3r/GUI/wxExtensions.hpp" CheckList::CheckList( wxWindow* parent, diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp index 20998eda0a..b02e1a8416 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.cpp +++ b/src/slic3r/GUI/Widgets/ComboBox.cpp @@ -14,6 +14,7 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" BEGIN_EVENT_TABLE(ComboBox, TextInput) diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp index c17e5d6e04..c5a8e280b1 100644 --- a/src/slic3r/GUI/Widgets/DropDown.cpp +++ b/src/slic3r/GUI/Widgets/DropDown.cpp @@ -25,6 +25,9 @@ #endif #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include "slic3r/GUI/wxExtensions.hpp" wxDEFINE_EVENT(EVT_DISMISS, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/DropDown.hpp b/src/slic3r/GUI/Widgets/DropDown.hpp index f9e759202a..8b6ae5d635 100644 --- a/src/slic3r/GUI/Widgets/DropDown.hpp +++ b/src/slic3r/GUI/Widgets/DropDown.hpp @@ -15,6 +15,9 @@ #include "StateHandler.hpp" #include "PopupWindow.hpp" +class wxDC; +class wxWindow; + #define DD_NO_CHECK_ICON 0x0001 #define DD_NO_TEXT 0x0002 #define DD_STYLE_MASK 0x0003 diff --git a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp index bb024073e0..9b99b6a933 100644 --- a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp +++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp @@ -4,6 +4,8 @@ #include #include +class wxWindow; + ErrorMsgStaticText::ErrorMsgStaticText() {} ErrorMsgStaticText::ErrorMsgStaticText(wxWindow * parent, diff --git a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp index 71adbcd7cf..1115f8b94a 100644 --- a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp +++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp @@ -9,6 +9,9 @@ #include #include "wx/stattext.h" +class wxPaintEvent; +class wxWindow; + class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel { public: diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp index e4f039307b..adb440d876 100644 --- a/src/slic3r/GUI/Widgets/FanControl.cpp +++ b/src/slic3r/GUI/Widgets/FanControl.cpp @@ -1,6 +1,5 @@ #include "FanControl.hpp" #include "Label.hpp" -#include "../BitmapCache.hpp" #include "../I18N.hpp" #include "../GUI_App.hpp" #include "../MsgDialog.hpp" diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.cpp b/src/slic3r/GUI/Widgets/FilamentLoad.cpp index 11541a95a3..b8e2157de0 100644 --- a/src/slic3r/GUI/Widgets/FilamentLoad.cpp +++ b/src/slic3r/GUI/Widgets/FilamentLoad.cpp @@ -1,8 +1,5 @@ #include "FilamentLoad.hpp" -#include "Label.hpp" -#include "../BitmapCache.hpp" #include "../I18N.hpp" -#include "../GUI_App.hpp" #include "../DeviceCore/DevFilaSystem.h" #include @@ -18,8 +15,10 @@ #include #include +#include "slic3r/GUI/DeviceManager.hpp" + +class wxWindow; -#include "CalibUtils.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/HyperLink.cpp b/src/slic3r/GUI/Widgets/HyperLink.cpp index cc065e1c9b..ff7b8d682c 100644 --- a/src/slic3r/GUI/Widgets/HyperLink.cpp +++ b/src/slic3r/GUI/Widgets/HyperLink.cpp @@ -7,6 +7,8 @@ #include #include +class wxWindow; + namespace Slic3r { namespace GUI { HyperLink::HyperLink(wxWindow* parent, const wxString& label, const wxString& url, long style) diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp index 80e7e85c66..5430dbd8c1 100644 --- a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp @@ -14,6 +14,10 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/StateHandler.hpp" + +class wxWindow; BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox) diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp index 69d643a3df..a4c8ac13dc 100644 --- a/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp +++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp @@ -3,8 +3,6 @@ #include "../wxExtensions.hpp" #include "StateColor.hpp" -#include "StateHandler.hpp" -#include "Button.hpp" #include "slic3r/GUI/Widgets/StaticBox.hpp" @@ -14,6 +12,9 @@ #include #include +class wxDC; +class wxWindow; + class ImageSwitchButton : public StaticBox { public: diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp index 734373ca7b..0bc7d198ed 100644 --- a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp +++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp @@ -12,6 +12,7 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" LabeledStaticBox::LabeledStaticBox() : state_handler(this) diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp index d47699aa73..45256129f6 100644 --- a/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp +++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp @@ -13,11 +13,12 @@ #include #include -#include "libslic3r/Utils.hpp" -#include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/Widgets/StateHandler.hpp" +class wxDC; +class wxWindow; + class LabeledStaticBox : public wxStaticBox { public: diff --git a/src/slic3r/GUI/Widgets/ProgressBar.cpp b/src/slic3r/GUI/Widgets/ProgressBar.cpp index 86963fa638..ac134a5364 100644 --- a/src/slic3r/GUI/Widgets/ProgressBar.cpp +++ b/src/slic3r/GUI/Widgets/ProgressBar.cpp @@ -1,5 +1,4 @@ #include "ProgressBar.hpp" -#include "../I18N.hpp" #include #include #include diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.hpp b/src/slic3r/GUI/Widgets/ProgressDialog.hpp index a8b2dee827..e151428b84 100644 --- a/src/slic3r/GUI/Widgets/ProgressDialog.hpp +++ b/src/slic3r/GUI/Widgets/ProgressDialog.hpp @@ -5,8 +5,6 @@ #include "wx/progdlg.h" #include "wx/weakref.h" #include "wx/simplebook.h" -#include "Button.hpp" -#include "../wxExtensions.hpp" #include #include #include @@ -14,6 +12,17 @@ #include #include +class Button; +class wxCloseEvent; +class wxCommandEvent; +class wxPaintEvent; +class wxPanel; +class wxScrolledWindow; +class wxSimplebook; +class wxSizer; +class wxWindow; +namespace Slic3r::GUI { class ProgressDialog; } + class WXDLLIMPEXP_FWD_CORE wxButton; class WXDLLIMPEXP_FWD_CORE wxEventLoop; class WXDLLIMPEXP_FWD_CORE wxGauge; diff --git a/src/slic3r/GUI/Widgets/RadioBox.hpp b/src/slic3r/GUI/Widgets/RadioBox.hpp index a34bd594dd..ffbb4abda8 100644 --- a/src/slic3r/GUI/Widgets/RadioBox.hpp +++ b/src/slic3r/GUI/Widgets/RadioBox.hpp @@ -5,6 +5,8 @@ #include +class wxWindow; + namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/RadioGroup.cpp b/src/slic3r/GUI/Widgets/RadioGroup.cpp index 5b4499a1b4..9066cd4b32 100644 --- a/src/slic3r/GUI/Widgets/RadioGroup.cpp +++ b/src/slic3r/GUI/Widgets/RadioGroup.cpp @@ -15,6 +15,8 @@ #include #include #include "slic3r/GUI/Widgets/StateHandler.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" RadioGroup::RadioGroup( wxWindow* parent, diff --git a/src/slic3r/GUI/Widgets/Scrollbar.hpp b/src/slic3r/GUI/Widgets/Scrollbar.hpp index 0a69601291..a1967486a9 100644 --- a/src/slic3r/GUI/Widgets/Scrollbar.hpp +++ b/src/slic3r/GUI/Widgets/Scrollbar.hpp @@ -4,6 +4,12 @@ #include #include #include + +class wxEraseEvent; +class wxMouseEvent; +class wxPaintEvent; +class wxSizeEvent; +class wxWindow; #ifndef WX_PRECOMP #include #endif diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp index cb497d1015..49c2796e40 100644 --- a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp +++ b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp @@ -11,7 +11,12 @@ #endif #include -#include "Scrollbar.hpp" + +class wxMouseEvent; +class wxPanel; +class wxScrollWinEvent; +class wxSizeEvent; +class wxSplitterWindow; class MyScrollbar; diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp index 54b75f1e14..7e0d2f2472 100644 --- a/src/slic3r/GUI/Widgets/SideButton.cpp +++ b/src/slic3r/GUI/Widgets/SideButton.cpp @@ -11,6 +11,8 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/wxExtensions.hpp" BEGIN_EVENT_TABLE(SideButton, wxWindow) EVT_LEFT_DOWN(SideButton::mouseDown) diff --git a/src/slic3r/GUI/Widgets/SideButton.hpp b/src/slic3r/GUI/Widgets/SideButton.hpp index 84a210c3e3..fb202df7fa 100644 --- a/src/slic3r/GUI/Widgets/SideButton.hpp +++ b/src/slic3r/GUI/Widgets/SideButton.hpp @@ -14,6 +14,8 @@ #include "../wxExtensions.hpp" #include "StateHandler.hpp" +class wxDC; + class SideButton : public wxWindow { diff --git a/src/slic3r/GUI/Widgets/SideMenuPopup.cpp b/src/slic3r/GUI/Widgets/SideMenuPopup.cpp index 3a55475e60..2d3945b050 100644 --- a/src/slic3r/GUI/Widgets/SideMenuPopup.cpp +++ b/src/slic3r/GUI/Widgets/SideMenuPopup.cpp @@ -1,5 +1,4 @@ #include "SideMenuPopup.hpp" -#include "Label.hpp" #include "slic3r/GUI/Widgets/PopupWindow.hpp" #include diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp index 80c000fe46..89c1132f7e 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.cpp +++ b/src/slic3r/GUI/Widgets/SpinInput.cpp @@ -17,6 +17,7 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/SpinInput.hpp b/src/slic3r/GUI/Widgets/SpinInput.hpp index 27bf6fcddf..0a26392bc4 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.hpp +++ b/src/slic3r/GUI/Widgets/SpinInput.hpp @@ -13,6 +13,10 @@ #include #include "StaticBox.hpp" +class wxDC; +class wxTextCtrl; +class wxWindow; + class Button; // Fired on every keystroke that leaves a parseable integer in the field, so callers can diff --git a/src/slic3r/GUI/Widgets/StateHandler.hpp b/src/slic3r/GUI/Widgets/StateHandler.hpp index c0bba3a36a..05ae036e51 100644 --- a/src/slic3r/GUI/Widgets/StateHandler.hpp +++ b/src/slic3r/GUI/Widgets/StateHandler.hpp @@ -7,6 +7,8 @@ #include "StateColor.hpp" +class wxWindow; + wxDECLARE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent); class StateHandler : public wxEvtHandler diff --git a/src/slic3r/GUI/Widgets/StaticBox.cpp b/src/slic3r/GUI/Widgets/StaticBox.cpp index 5b18f733c9..593ee6b525 100644 --- a/src/slic3r/GUI/Widgets/StaticBox.cpp +++ b/src/slic3r/GUI/Widgets/StaticBox.cpp @@ -11,6 +11,9 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include "slic3r/GUI/wxExtensions.hpp" BEGIN_EVENT_TABLE(StaticBox, wxWindow) diff --git a/src/slic3r/GUI/Widgets/StaticLine.cpp b/src/slic3r/GUI/Widgets/StaticLine.cpp index 61602d520d..b045335e22 100644 --- a/src/slic3r/GUI/Widgets/StaticLine.cpp +++ b/src/slic3r/GUI/Widgets/StaticLine.cpp @@ -11,6 +11,9 @@ #include #include #include +#include "slic3r/GUI/wxExtensions.hpp" + +class wxWindow; BEGIN_EVENT_TABLE(StaticLine, wxWindow) diff --git a/src/slic3r/GUI/Widgets/StepCtrl.cpp b/src/slic3r/GUI/Widgets/StepCtrl.cpp index e50db7c821..dd0d0cf14f 100644 --- a/src/slic3r/GUI/Widgets/StepCtrl.cpp +++ b/src/slic3r/GUI/Widgets/StepCtrl.cpp @@ -12,6 +12,11 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include "slic3r/GUI/wxExtensions.hpp" + +class wxWindow; wxDEFINE_EVENT( EVT_STEP_CHANGING, wxCommandEvent ); wxDEFINE_EVENT( EVT_STEP_CHANGED, wxCommandEvent ); diff --git a/src/slic3r/GUI/Widgets/StepCtrl.hpp b/src/slic3r/GUI/Widgets/StepCtrl.hpp index 3b5abdab57..48e6bb08a6 100644 --- a/src/slic3r/GUI/Widgets/StepCtrl.hpp +++ b/src/slic3r/GUI/Widgets/StepCtrl.hpp @@ -12,6 +12,9 @@ #include "slic3r/GUI/wxExtensions.hpp" #include +class wxDC; +class wxWindow; + wxDECLARE_EVENT( EVT_STEP_CHANGING, wxCommandEvent ); wxDECLARE_EVENT( EVT_STEP_CHANGED, wxCommandEvent ); diff --git a/src/slic3r/GUI/Widgets/TabCtrl.cpp b/src/slic3r/GUI/Widgets/TabCtrl.cpp index 7c39cdd3f4..6b970929e5 100644 --- a/src/slic3r/GUI/Widgets/TabCtrl.cpp +++ b/src/slic3r/GUI/Widgets/TabCtrl.cpp @@ -12,6 +12,9 @@ #include #include #include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/StateHandler.hpp" wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent); wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp index 5890c702ac..d75d8cecd7 100644 --- a/src/slic3r/GUI/Widgets/TempInput.cpp +++ b/src/slic3r/GUI/Widgets/TempInput.cpp @@ -18,7 +18,6 @@ #include #include #include -#include "../GUI.hpp" #include "../GUI_App.hpp" wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/TempInput.hpp b/src/slic3r/GUI/Widgets/TempInput.hpp index 3ca55e558c..d583e881b5 100644 --- a/src/slic3r/GUI/Widgets/TempInput.hpp +++ b/src/slic3r/GUI/Widgets/TempInput.hpp @@ -18,6 +18,11 @@ #include +class wxDC; +class wxPopupTransientWindow; +class wxStaticText; +class wxWindow; + wxDECLARE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent); enum TempInputType { diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp index e3670cbaed..356ce626a5 100644 --- a/src/slic3r/GUI/Widgets/TextInput.cpp +++ b/src/slic3r/GUI/Widgets/TextInput.cpp @@ -1,5 +1,4 @@ #include "TextInput.hpp" -#include "Label.hpp" #include "TextCtrl.h" #include "slic3r/GUI/Widgets/Label.hpp" @@ -16,6 +15,8 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/wxExtensions.hpp" #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/WebView.hpp b/src/slic3r/GUI/Widgets/WebView.hpp index 0172f3f8ac..cdd885f9bd 100644 --- a/src/slic3r/GUI/Widgets/WebView.hpp +++ b/src/slic3r/GUI/Widgets/WebView.hpp @@ -6,6 +6,9 @@ #include #include +class wxWebView; +class wxWindow; + wxDECLARE_EVENT(EVT_WEBVIEW_RECREATED, wxCommandEvent); class WebView diff --git a/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp b/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp index 1f617f6757..6c5f2a763b 100644 --- a/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp +++ b/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp @@ -14,6 +14,11 @@ #include #include +class wxCommandEvent; +class wxWebView; +class wxWebViewEvent; +class wxWindow; + namespace Slic3r { namespace GUI { // Shared shell for local HTML dialogs that communicate through window.wx.postMessage(). diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 791271689d..8e2b0fcb9c 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -11,7 +11,6 @@ #include "slic3r/GUI/Widgets/SpinInput.hpp" #include #include "libslic3r/PrintConfig.hpp" -#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include "slic3r/GUI/Plater.hpp" #include "libslic3r/FlushVolPredictor.hpp" #include "libslic3r/Utils.hpp" @@ -31,17 +30,21 @@ #include "GUI.hpp" #include "I18N.hpp" #include "GUI_App.hpp" -#include "WebViewDialog.hpp" #include "MsgDialog.hpp" #include "format.hpp" -#include "libslic3r/Color.hpp" #include "Widgets/StaticLine.hpp" #include "Widgets/DialogButtons.hpp" #include "libslic3r/Config.hpp" #include "Widgets/Label.hpp" #include "MainFrame.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/Utils/json_diff.hpp" #include +class wxWindow; + namespace fs = boost::filesystem; using namespace Slic3r; diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 26b03a028b..ef77b714f0 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -36,7 +36,6 @@ #include "I18N.hpp" #include "GUI_Utils.hpp" #include "Plater.hpp" -#include "../Utils/MacDarkMode.hpp" #include "BitmapComboBox.hpp" #include "Widgets/StaticBox.hpp" #include "Widgets/Label.hpp" diff --git a/src/slic3r/GUI/wxMediaCtrl3.cpp b/src/slic3r/GUI/wxMediaCtrl3.cpp index 67bf5cf9a3..31a8df55d7 100644 --- a/src/slic3r/GUI/wxMediaCtrl3.cpp +++ b/src/slic3r/GUI/wxMediaCtrl3.cpp @@ -1,7 +1,5 @@ #include "wxMediaCtrl3.h" #include "AVVideoDecoder.hpp" -#include "I18N.hpp" -#include "libslic3r/Utils.hpp" #include #include #include "slic3r/GUI/Printer/BambuTunnel.h" @@ -23,6 +21,8 @@ extern "C" { #include #include + +class wxWindow; } #ifdef __WIN32__ #include diff --git a/src/slic3r/Utils/3DPrinterOS.hpp b/src/slic3r/Utils/3DPrinterOS.hpp index 02cc81ee6f..255fe0d9e9 100644 --- a/src/slic3r/Utils/3DPrinterOS.hpp +++ b/src/slic3r/Utils/3DPrinterOS.hpp @@ -8,7 +8,9 @@ #include #include "PrintHost.hpp" -#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/enum_bitmask.hpp" + +namespace boost { template class optional; } diff --git a/src/slic3r/Utils/AstroBox.hpp b/src/slic3r/Utils/AstroBox.hpp index 04bbb00b67..8266b901dd 100644 --- a/src/slic3r/Utils/AstroBox.hpp +++ b/src/slic3r/Utils/AstroBox.hpp @@ -8,6 +8,8 @@ #include "PrintHost.hpp" +namespace boost { template class optional; } + namespace Slic3r { class DynamicPrintConfig; diff --git a/src/slic3r/Utils/BBLCloudServiceAgent.cpp b/src/slic3r/Utils/BBLCloudServiceAgent.cpp index 8943a01914..96525354e5 100644 --- a/src/slic3r/Utils/BBLCloudServiceAgent.cpp +++ b/src/slic3r/Utils/BBLCloudServiceAgent.cpp @@ -3,7 +3,6 @@ #include #include "CloudProvider.hpp" -#include "Http.hpp" #include "bambu_networking.hpp" #include "ICloudServiceAgent.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -17,6 +16,7 @@ #include #include #include +#include "libslic3r/AppConfig.hpp" using json = nlohmann::json; diff --git a/src/slic3r/Utils/BBLPrinterAgent.cpp b/src/slic3r/Utils/BBLPrinterAgent.cpp index 0e468b642b..7fde77a075 100644 --- a/src/slic3r/Utils/BBLPrinterAgent.cpp +++ b/src/slic3r/Utils/BBLPrinterAgent.cpp @@ -2,7 +2,6 @@ #include "BBLNetworkPlugin.hpp" #include "IPrinterAgent.hpp" #include "NetworkAgentFactory.hpp" -#include "NetworkAgent.hpp" #include "bambu_networking.hpp" #include "libslic3r/Utils.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -25,6 +24,8 @@ using json = nlohmann::json; #include #include +namespace Slic3r { class ICloudServiceAgent; } + namespace Slic3r { namespace { diff --git a/src/slic3r/Utils/BBLPrinterAgent.hpp b/src/slic3r/Utils/BBLPrinterAgent.hpp index 89315219c0..2a273afe47 100644 --- a/src/slic3r/Utils/BBLPrinterAgent.hpp +++ b/src/slic3r/Utils/BBLPrinterAgent.hpp @@ -2,7 +2,6 @@ #define __BBL_PRINTER_AGENT_HPP__ #include "IPrinterAgent.hpp" -#include "ICloudServiceAgent.hpp" #include "bambu_networking.hpp" #include #include @@ -10,6 +9,8 @@ #include #include +namespace Slic3r { class ICloudServiceAgent; } + namespace Slic3r { /** diff --git a/src/slic3r/Utils/Bonjour.hpp b/src/slic3r/Utils/Bonjour.hpp index e267575f74..be7d89a8f1 100644 --- a/src/slic3r/Utils/Bonjour.hpp +++ b/src/slic3r/Utils/Bonjour.hpp @@ -24,6 +24,9 @@ #include #include +namespace boost::asio::ip { class address_v4; } +namespace boost::asio::ip { class address_v6; } + namespace Slic3r { diff --git a/src/slic3r/Utils/CrealityPrint.cpp b/src/slic3r/Utils/CrealityPrint.cpp index 20e702ba54..8a187ff998 100644 --- a/src/slic3r/Utils/CrealityPrint.cpp +++ b/src/slic3r/Utils/CrealityPrint.cpp @@ -41,7 +41,6 @@ #include "slic3r/GUI/format.hpp" #include "Http.hpp" #include "libslic3r/AppConfig.hpp" -#include "Bonjour.hpp" #include "slic3r/GUI/BonjourDialog.hpp" #include diff --git a/src/slic3r/Utils/Duet.cpp b/src/slic3r/Utils/Duet.cpp index 592e198808..b5ad48fbae 100644 --- a/src/slic3r/Utils/Duet.cpp +++ b/src/slic3r/Utils/Duet.cpp @@ -23,7 +23,6 @@ #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/I18N.hpp" -#include "slic3r/GUI/MsgDialog.hpp" #include "Http.hpp" namespace fs = boost::filesystem; diff --git a/src/slic3r/Utils/Duet.hpp b/src/slic3r/Utils/Duet.hpp index 7808c51fde..cde0d979de 100644 --- a/src/slic3r/Utils/Duet.hpp +++ b/src/slic3r/Utils/Duet.hpp @@ -5,6 +5,7 @@ #include #include "PrintHost.hpp" +#include "libslic3r/enum_bitmask.hpp" namespace Slic3r { diff --git a/src/slic3r/Utils/ESP3D.cpp b/src/slic3r/Utils/ESP3D.cpp index 0fc28cfcaf..7f0cba2414 100644 --- a/src/slic3r/Utils/ESP3D.cpp +++ b/src/slic3r/Utils/ESP3D.cpp @@ -26,10 +26,7 @@ #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/I18N.hpp" -#include "slic3r/GUI/MsgDialog.hpp" #include "Http.hpp" -#include "SerialMessage.hpp" -#include "SerialMessageType.hpp" namespace fs = boost::filesystem; namespace pt = boost::property_tree; diff --git a/src/slic3r/Utils/ESP3D.hpp b/src/slic3r/Utils/ESP3D.hpp index 44d206d238..13bfd659db 100644 --- a/src/slic3r/Utils/ESP3D.hpp +++ b/src/slic3r/Utils/ESP3D.hpp @@ -5,7 +5,6 @@ #include #include "PrintHost.hpp" -#include "TCPConsole.hpp" namespace Slic3r { class DynamicPrintConfig; diff --git a/src/slic3r/Utils/ElegooLink.hpp b/src/slic3r/Utils/ElegooLink.hpp index 9072fd5c78..1cd471caf7 100644 --- a/src/slic3r/Utils/ElegooLink.hpp +++ b/src/slic3r/Utils/ElegooLink.hpp @@ -10,9 +10,10 @@ #include #include "PrintHost.hpp" -#include "libslic3r/PrintConfig.hpp" #include "OctoPrint.hpp" -#include "WebSocketClient.hpp" + +class WebSocketClient; +namespace boost { template class optional; } namespace Slic3r { class DynamicPrintConfig; diff --git a/src/slic3r/Utils/FileTransferUtils.cpp b/src/slic3r/Utils/FileTransferUtils.cpp index e56cdc1551..5276095394 100644 --- a/src/slic3r/Utils/FileTransferUtils.cpp +++ b/src/slic3r/Utils/FileTransferUtils.cpp @@ -7,8 +7,6 @@ #include #include #include "FileTransferUtils.hpp" -#include "slic3r/GUI/GUI_App.hpp" -#include "slic3r/GUI/DeviceCore/DevManager.h" namespace Slic3r { diff --git a/src/slic3r/Utils/FixModelByCgal.cpp b/src/slic3r/Utils/FixModelByCgal.cpp index 237a4b9dc6..09dad529fe 100644 --- a/src/slic3r/Utils/FixModelByCgal.cpp +++ b/src/slic3r/Utils/FixModelByCgal.cpp @@ -28,6 +28,7 @@ #include "libslic3r/format.hpp" #include "libslic3r/Thread.hpp" #include "../GUI/I18N.hpp" +#include "libslic3r/TriangleSelector.hpp" // Orca: This file provides utilities for repairing 3D model meshes using the CGAL library, handling mesh splitting, merging, and boolean operations. diff --git a/src/slic3r/Utils/FixModelByCgal.hpp b/src/slic3r/Utils/FixModelByCgal.hpp index 03bec43f47..b3f96169f6 100644 --- a/src/slic3r/Utils/FixModelByCgal.hpp +++ b/src/slic3r/Utils/FixModelByCgal.hpp @@ -3,7 +3,8 @@ #include #include -#include "../GUI/Widgets/ProgressDialog.hpp" + +namespace Slic3r::GUI { class ProgressDialog; } namespace Slic3r { diff --git a/src/slic3r/Utils/FlashAir.cpp b/src/slic3r/Utils/FlashAir.cpp index 557604cffc..16648c711d 100644 --- a/src/slic3r/Utils/FlashAir.cpp +++ b/src/slic3r/Utils/FlashAir.cpp @@ -21,7 +21,6 @@ #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/I18N.hpp" -#include "slic3r/GUI/MsgDialog.hpp" #include "Http.hpp" namespace fs = boost::filesystem; diff --git a/src/slic3r/Utils/Flashforge.cpp b/src/slic3r/Utils/Flashforge.cpp index 5f639c3e5f..b0697b80d4 100644 --- a/src/slic3r/Utils/Flashforge.cpp +++ b/src/slic3r/Utils/Flashforge.cpp @@ -49,7 +49,6 @@ #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/I18N.hpp" -#include "slic3r/GUI/MsgDialog.hpp" #include "Http.hpp" #include "TCPConsole.hpp" #include "SerialMessage.hpp" diff --git a/src/slic3r/Utils/Flashforge.hpp b/src/slic3r/Utils/Flashforge.hpp index 237cf4c009..6b4d74dcae 100644 --- a/src/slic3r/Utils/Flashforge.hpp +++ b/src/slic3r/Utils/Flashforge.hpp @@ -7,7 +7,8 @@ #include "PrintHost.hpp" #include "SerialMessage.hpp" #include "SerialMessageType.hpp" -#include "../../libslic3r/PrintConfig.hpp" + +namespace Slic3r { enum GCodeFlavor : unsigned char; } namespace Slic3r { class DynamicPrintConfig; diff --git a/src/slic3r/Utils/MKS.cpp b/src/slic3r/Utils/MKS.cpp index 6a27c7c7ce..52649a667f 100644 --- a/src/slic3r/Utils/MKS.cpp +++ b/src/slic3r/Utils/MKS.cpp @@ -27,7 +27,6 @@ #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/I18N.hpp" -#include "slic3r/GUI/MsgDialog.hpp" #include "Http.hpp" #include "SerialMessage.hpp" #include "SerialMessageType.hpp" diff --git a/src/slic3r/Utils/MKS.hpp b/src/slic3r/Utils/MKS.hpp index 01cdafc405..8d3816d4b1 100644 --- a/src/slic3r/Utils/MKS.hpp +++ b/src/slic3r/Utils/MKS.hpp @@ -5,7 +5,6 @@ #include #include "PrintHost.hpp" -#include "TCPConsole.hpp" namespace Slic3r { class DynamicPrintConfig; diff --git a/src/slic3r/Utils/Moonraker.cpp b/src/slic3r/Utils/Moonraker.cpp index f8692a8bb8..ee437595ef 100644 --- a/src/slic3r/Utils/Moonraker.cpp +++ b/src/slic3r/Utils/Moonraker.cpp @@ -14,7 +14,6 @@ #include "PrintHost.hpp" #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/I18N.hpp" -#include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/format.hpp" #include "Http.hpp" diff --git a/src/slic3r/Utils/Moonraker.hpp b/src/slic3r/Utils/Moonraker.hpp index 740d6f0f2e..e91e65b49d 100644 --- a/src/slic3r/Utils/Moonraker.hpp +++ b/src/slic3r/Utils/Moonraker.hpp @@ -6,7 +6,8 @@ #include #include "PrintHost.hpp" -#include "libslic3r/PrintConfig.hpp" + +class wxArrayString; namespace Slic3r { diff --git a/src/slic3r/Utils/MoonrakerPrinterAgent.hpp b/src/slic3r/Utils/MoonrakerPrinterAgent.hpp index a733d4dfb2..141574b84d 100644 --- a/src/slic3r/Utils/MoonrakerPrinterAgent.hpp +++ b/src/slic3r/Utils/MoonrakerPrinterAgent.hpp @@ -2,7 +2,6 @@ #define __MOONRAKER_PRINTER_AGENT_HPP__ #include "IPrinterAgent.hpp" -#include "ICloudServiceAgent.hpp" #include "bambu_networking.hpp" #include @@ -17,6 +16,8 @@ #include #include +namespace Slic3r { class ICloudServiceAgent; } + namespace Slic3r { class MoonrakerPrinterAgent : public IPrinterAgent diff --git a/src/slic3r/Utils/NetworkAgentFactory.cpp b/src/slic3r/Utils/NetworkAgentFactory.cpp index 3d87a3eec9..e962e80188 100644 --- a/src/slic3r/Utils/NetworkAgentFactory.cpp +++ b/src/slic3r/Utils/NetworkAgentFactory.cpp @@ -26,6 +26,7 @@ #include #include #include +#include "libslic3r/AppConfig.hpp" namespace Slic3r { namespace { diff --git a/src/slic3r/Utils/Obico.cpp b/src/slic3r/Utils/Obico.cpp index 9dabd91467..37a618445a 100644 --- a/src/slic3r/Utils/Obico.cpp +++ b/src/slic3r/Utils/Obico.cpp @@ -28,7 +28,6 @@ #include "slic3r/GUI/format.hpp" #include "Http.hpp" #include "libslic3r/AppConfig.hpp" -#include "Bonjour.hpp" #include "slic3r/GUI/BonjourDialog.hpp" namespace fs = boost::filesystem; diff --git a/src/slic3r/Utils/Obico.hpp b/src/slic3r/Utils/Obico.hpp index f262d204bd..d7d38b1da6 100644 --- a/src/slic3r/Utils/Obico.hpp +++ b/src/slic3r/Utils/Obico.hpp @@ -7,7 +7,8 @@ #include #include "PrintHost.hpp" -#include "libslic3r/PrintConfig.hpp" + +class wxArrayString; namespace Slic3r { diff --git a/src/slic3r/Utils/OctoPrint.hpp b/src/slic3r/Utils/OctoPrint.hpp index b2dbe11cff..06ecc197df 100644 --- a/src/slic3r/Utils/OctoPrint.hpp +++ b/src/slic3r/Utils/OctoPrint.hpp @@ -9,6 +9,7 @@ #include "PrintHost.hpp" #include "libslic3r/PrintConfig.hpp" +#include "libslic3r/enum_bitmask.hpp" namespace Slic3r { diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp index 2cebdb8ab9..2a8d3cdefb 100644 --- a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp +++ b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp @@ -61,6 +61,7 @@ #include #include "slic3r/plugin/PluginDescriptor.hpp" +#include "libslic3r/PresetBundle.hpp" #if defined(_WIN32) #include diff --git a/src/slic3r/Utils/OrcaPrinterAgent.cpp b/src/slic3r/Utils/OrcaPrinterAgent.cpp index cb8b38acc8..6324e41465 100644 --- a/src/slic3r/Utils/OrcaPrinterAgent.cpp +++ b/src/slic3r/Utils/OrcaPrinterAgent.cpp @@ -7,6 +7,8 @@ #include #include "bambu_networking.hpp" +namespace Slic3r { class ICloudServiceAgent; } + namespace Slic3r { const std::string OrcaPrinterAgent_VERSION = "0.0.1"; diff --git a/src/slic3r/Utils/OrcaPrinterAgent.hpp b/src/slic3r/Utils/OrcaPrinterAgent.hpp index a56b2c8dda..4b299f6064 100644 --- a/src/slic3r/Utils/OrcaPrinterAgent.hpp +++ b/src/slic3r/Utils/OrcaPrinterAgent.hpp @@ -2,12 +2,13 @@ #define __ORCA_PRINTER_AGENT_HPP__ #include "IPrinterAgent.hpp" -#include "ICloudServiceAgent.hpp" #include "bambu_networking.hpp" #include #include #include +namespace Slic3r { class ICloudServiceAgent; } + namespace Slic3r { /** diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp index 1df0edf8fa..90807eb723 100644 --- a/src/slic3r/Utils/PresetUpdater.cpp +++ b/src/slic3r/Utils/PresetUpdater.cpp @@ -39,7 +39,6 @@ #include #include "json_diff.hpp" -#include "libslic3r/libslic3r.h" #include "libslic3r/format.hpp" #include "libslic3r/Utils.hpp" #include "libslic3r/PresetBundle.hpp" @@ -49,7 +48,6 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/UpdateDialogs.hpp" -#include "slic3r/GUI/ConfigWizard.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/format.hpp" @@ -57,10 +55,11 @@ #include "slic3r/Utils/Http.hpp" #include "slic3r/Utils/bambu_networking.hpp" #include "slic3r/Config/Version.hpp" -#include "slic3r/Config/Snapshot.hpp" #include "slic3r/GUI/MarkdownTip.hpp" #include "libslic3r/miniz_extension.hpp" -#include "slic3r/GUI/GUI_Utils.hpp" + +namespace Slic3r::GUI::Config { class Snapshot; } +namespace Slic3r::GUI::Config { class SnapshotDB; } namespace fs = boost::filesystem; using Slic3r::GUI::Config::Index; diff --git a/src/slic3r/Utils/RaycastManager.cpp b/src/slic3r/Utils/RaycastManager.cpp index dba5ae1a54..899148d228 100644 --- a/src/slic3r/Utils/RaycastManager.cpp +++ b/src/slic3r/Utils/RaycastManager.cpp @@ -14,8 +14,9 @@ #include #include "slic3r/GUI/GLCanvas3D.hpp" -#include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/CameraUtils.hpp" +#include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/MeshUtils.hpp" using namespace Slic3r::GUI; diff --git a/src/slic3r/Utils/Repetier.hpp b/src/slic3r/Utils/Repetier.hpp index 00bc92975a..bb03bbc0a3 100644 --- a/src/slic3r/Utils/Repetier.hpp +++ b/src/slic3r/Utils/Repetier.hpp @@ -7,6 +7,8 @@ #include "PrintHost.hpp" +class wxArrayString; + namespace Slic3r { class DynamicPrintConfig; diff --git a/src/slic3r/Utils/UltiMaker.cpp b/src/slic3r/Utils/UltiMaker.cpp index fefd8ec786..432725f0e8 100644 --- a/src/slic3r/Utils/UltiMaker.cpp +++ b/src/slic3r/Utils/UltiMaker.cpp @@ -29,7 +29,6 @@ #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/I18N.hpp" -#include "slic3r/GUI/MsgDialog.hpp" #include "Http.hpp" #include diff --git a/src/slic3r/Utils/UndoRedo.cpp b/src/slic3r/Utils/UndoRedo.cpp index 2cdefefbb4..a326051d55 100644 --- a/src/slic3r/Utils/UndoRedo.cpp +++ b/src/slic3r/Utils/UndoRedo.cpp @@ -28,7 +28,6 @@ #define CEREAL_FUTURE_EXPERIMENTAL #include -#include #include #include @@ -816,11 +815,11 @@ namespace cereal } #include -#include #include #include #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/Plater.hpp" namespace Slic3r { namespace UndoRedo { diff --git a/src/slic3r/Utils/WxFontUtils.hpp b/src/slic3r/Utils/WxFontUtils.hpp index 7a9448fbe9..158d5f1f24 100644 --- a/src/slic3r/Utils/WxFontUtils.hpp +++ b/src/slic3r/Utils/WxFontUtils.hpp @@ -11,6 +11,8 @@ #include #include "libslic3r/Emboss.hpp" +class wxDC; + namespace Slic3r::GUI { // Help class to work with wx widget font object( wxFont ) diff --git a/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.cpp b/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.cpp index a35aceafeb..00ba4d109d 100644 --- a/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.cpp +++ b/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.cpp @@ -18,6 +18,7 @@ #include #include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" wxString CustomWidgetsPlugin::GetName() const { diff --git a/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.hpp b/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.hpp index 1430677a7d..90d815beba 100644 --- a/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.hpp +++ b/src/slic3r/Utils/wxInspectorPlugins/CustomWidgetsPlugin.hpp @@ -6,6 +6,9 @@ #include #include +class wxClassInfo; +namespace wxInspector { class InspectableObject; } + class CustomWidgetsPlugin : public wxInspector::wxInspectorPlugin { public: diff --git a/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.hpp b/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.hpp index d1df7fe4aa..0a6bb3df08 100644 --- a/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.hpp +++ b/src/slic3r/Utils/wxInspectorPlugins/DPIAwarePlugin.hpp @@ -6,6 +6,9 @@ #include #include +class wxClassInfo; +namespace wxInspector { class InspectableObject; } + class DPIAwarePlugin : public wxInspector::wxInspectorPlugin { public: diff --git a/src/slic3r/plugin/CloudPluginService.hpp b/src/slic3r/plugin/CloudPluginService.hpp index bf244086d0..3ea97fdcae 100644 --- a/src/slic3r/plugin/CloudPluginService.hpp +++ b/src/slic3r/plugin/CloudPluginService.hpp @@ -1,6 +1,5 @@ #pragma once -#include "PluginDescriptor.hpp" #include @@ -9,6 +8,9 @@ #include #include +namespace Slic3r { struct PluginChangelog; } +namespace Slic3r { struct PluginDescriptor; } + namespace Slic3r { class OrcaCloudServiceAgent; diff --git a/src/slic3r/plugin/PluginAuditManager.cpp b/src/slic3r/plugin/PluginAuditManager.cpp index bd75ad2459..1fe8837c5c 100644 --- a/src/slic3r/plugin/PluginAuditManager.cpp +++ b/src/slic3r/plugin/PluginAuditManager.cpp @@ -30,6 +30,9 @@ #include #include #include +#include "slic3r/GUI/I18N.hpp" +#include "slic3r/plugin/PluginDescriptor.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/plugin/PluginConfig.hpp b/src/slic3r/plugin/PluginConfig.hpp index 8f39b4a40e..0e023af35f 100644 --- a/src/slic3r/plugin/PluginConfig.hpp +++ b/src/slic3r/plugin/PluginConfig.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include #include #include #include diff --git a/src/slic3r/plugin/PluginFsUtils.hpp b/src/slic3r/plugin/PluginFsUtils.hpp index 80174a68bd..7e552b7896 100644 --- a/src/slic3r/plugin/PluginFsUtils.hpp +++ b/src/slic3r/plugin/PluginFsUtils.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #define PLUGIN_SUBSCRIBED_DIR "_subscribed" #define PLUGIN_DATA_DIR "plugin_data" diff --git a/src/slic3r/plugin/PluginHooks.cpp b/src/slic3r/plugin/PluginHooks.cpp index 36c7f9292d..79504bfd84 100644 --- a/src/slic3r/plugin/PluginHooks.cpp +++ b/src/slic3r/plugin/PluginHooks.cpp @@ -19,6 +19,8 @@ #include "slic3r/plugin/PluginDescriptor.hpp" #include #include +#include "libslic3r/PrintBase.hpp" +#include "libslic3r/PrintConfig.hpp" namespace Slic3r::plugin_hooks { namespace { diff --git a/src/slic3r/plugin/PluginLoader.hpp b/src/slic3r/plugin/PluginLoader.hpp index f571bb89b7..59377676ea 100644 --- a/src/slic3r/plugin/PluginLoader.hpp +++ b/src/slic3r/plugin/PluginLoader.hpp @@ -1,6 +1,5 @@ #pragma once -#include "PluginDescriptor.hpp" #include @@ -8,6 +7,8 @@ #include #include +namespace Slic3r { struct PluginDescriptor; } + namespace Slic3r { struct Plugin; } // namespace Slic3r diff --git a/src/slic3r/plugin/PluginManager.cpp b/src/slic3r/plugin/PluginManager.cpp index c064622b17..911c4ba2e6 100644 --- a/src/slic3r/plugin/PluginManager.cpp +++ b/src/slic3r/plugin/PluginManager.cpp @@ -6,7 +6,6 @@ #include #include #include "libslic3r/LifecycleEvents.hpp" -#include #include #include #include @@ -40,6 +39,8 @@ #include #include #include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/Plater.hpp" namespace Slic3r { namespace { diff --git a/src/slic3r/plugin/PluginResolver.cpp b/src/slic3r/plugin/PluginResolver.cpp index 6b8ca9a417..d4be72c6ae 100644 --- a/src/slic3r/plugin/PluginResolver.cpp +++ b/src/slic3r/plugin/PluginResolver.cpp @@ -16,7 +16,6 @@ #include "libslic3r/Preset.hpp" #include #include -#include #include #include "slic3r/plugin/PythonPluginInterface.hpp" #include @@ -30,6 +29,8 @@ #include #include #include +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/plugin/PluginDescriptor.hpp" namespace Slic3r { diff --git a/src/slic3r/plugin/PythonInterpreter.cpp b/src/slic3r/plugin/PythonInterpreter.cpp index 6d1afc1ba1..4a08431117 100644 --- a/src/slic3r/plugin/PythonInterpreter.cpp +++ b/src/slic3r/plugin/PythonInterpreter.cpp @@ -27,6 +27,9 @@ #include #include #include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/plugin/PythonInterpreter.hpp b/src/slic3r/plugin/PythonInterpreter.hpp index 2c499283cc..8c5c5b3e40 100644 --- a/src/slic3r/plugin/PythonInterpreter.hpp +++ b/src/slic3r/plugin/PythonInterpreter.hpp @@ -12,7 +12,6 @@ #include #include #include -#include "libslic3r/libslic3r.h" namespace pybind11 { class scoped_interpreter; diff --git a/src/slic3r/plugin/PythonPluginBridge.hpp b/src/slic3r/plugin/PythonPluginBridge.hpp index 036c8f1941..5178c6f5db 100644 --- a/src/slic3r/plugin/PythonPluginBridge.hpp +++ b/src/slic3r/plugin/PythonPluginBridge.hpp @@ -5,7 +5,11 @@ #include #include -#include "PythonPluginInterface.hpp" +namespace Slic3r { class PluginCapabilityInterface; } +namespace Slic3r { class PluginCapabilityInterface; } +namespace Slic3r { class PluginCapabilityInterface; } +namespace Slic3r { class PluginCapabilityInterface; } + namespace Slic3r { diff --git a/src/slic3r/plugin/host/PluginHost.cpp b/src/slic3r/plugin/host/PluginHost.cpp index ae56bc575c..7051b94f86 100644 --- a/src/slic3r/plugin/host/PluginHost.cpp +++ b/src/slic3r/plugin/host/PluginHost.cpp @@ -7,6 +7,7 @@ #include #include +#include namespace Slic3r { diff --git a/src/slic3r/plugin/host/PluginHostGeometry.cpp b/src/slic3r/plugin/host/PluginHostGeometry.cpp index 14db01cc4c..c45105d480 100644 --- a/src/slic3r/plugin/host/PluginHostGeometry.cpp +++ b/src/slic3r/plugin/host/PluginHostGeometry.cpp @@ -18,6 +18,9 @@ #include #include #include +#include +#include +#include namespace py = pybind11; diff --git a/src/slic3r/plugin/host/PluginHostMesh.cpp b/src/slic3r/plugin/host/PluginHostMesh.cpp index 8799278bd5..f03a329a4a 100644 --- a/src/slic3r/plugin/host/PluginHostMesh.cpp +++ b/src/slic3r/plugin/host/PluginHostMesh.cpp @@ -14,6 +14,8 @@ #include #include #include +#include +#include namespace py = pybind11; diff --git a/src/slic3r/plugin/host/PluginHostModel.cpp b/src/slic3r/plugin/host/PluginHostModel.cpp index 357e37808d..8d9be8dd3d 100644 --- a/src/slic3r/plugin/host/PluginHostModel.cpp +++ b/src/slic3r/plugin/host/PluginHostModel.cpp @@ -12,6 +12,14 @@ #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include namespace py = pybind11; diff --git a/src/slic3r/plugin/host/PluginHostSlicing.cpp b/src/slic3r/plugin/host/PluginHostSlicing.cpp index fb2c02eaac..85bc227281 100644 --- a/src/slic3r/plugin/host/PluginHostSlicing.cpp +++ b/src/slic3r/plugin/host/PluginHostSlicing.cpp @@ -15,11 +15,19 @@ #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" -#include "libslic3r/Model.hpp" #include #include #include #include +#include "libslic3r/Config.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Polyline.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include + +namespace Slic3r { class Model; } namespace py = pybind11; diff --git a/src/slic3r/plugin/host/PluginPages.hpp b/src/slic3r/plugin/host/PluginPages.hpp index 90d8c28a03..962e02ecd0 100644 --- a/src/slic3r/plugin/host/PluginPages.hpp +++ b/src/slic3r/plugin/host/PluginPages.hpp @@ -16,6 +16,9 @@ #include #include +class wxWebViewEvent; +class wxWindow; + class Notebook; namespace Slic3r { diff --git a/tests/fff_print/fff_print_tests.cpp b/tests/fff_print/fff_print_tests.cpp index 0f53c70bb8..03018c7af8 100644 --- a/tests/fff_print/fff_print_tests.cpp +++ b/tests/fff_print/fff_print_tests.cpp @@ -1,4 +1,3 @@ -#include "libslic3r/libslic3r.h" #define NANOSVG_IMPLEMENTATION #include "nanosvg/nanosvg.h" #define NANOSVGRAST_IMPLEMENTATION diff --git a/tests/fff_print/test_extrusion_entity.cpp b/tests/fff_print/test_extrusion_entity.cpp index 5b18b3ece5..b3a071bdc4 100644 --- a/tests/fff_print/test_extrusion_entity.cpp +++ b/tests/fff_print/test_extrusion_entity.cpp @@ -11,8 +11,9 @@ #include "libslic3r/ExtrusionEntity.hpp" #include "libslic3r/Point.hpp" #include "libslic3r/libslic3r.h" +#include "libslic3r/Line.hpp" +#include "libslic3r/Polyline.hpp" -#include "test_helpers.hpp" using namespace Slic3r; diff --git a/tests/fff_print/test_extrusion_processor.cpp b/tests/fff_print/test_extrusion_processor.cpp index 95a9d03f8a..b1e192cde8 100644 --- a/tests/fff_print/test_extrusion_processor.cpp +++ b/tests/fff_print/test_extrusion_processor.cpp @@ -32,6 +32,7 @@ #include #include #include +#include using namespace Slic3r; using namespace Slic3r::Test; diff --git a/tests/fff_print/test_flow.cpp b/tests/fff_print/test_flow.cpp index f0579c675f..328c610e02 100644 --- a/tests/fff_print/test_flow.cpp +++ b/tests/fff_print/test_flow.cpp @@ -9,9 +9,6 @@ #include "test_helpers.hpp" // get access to init_print, etc #include "libslic3r/Config.hpp" -#include "libslic3r/Model.hpp" -#include "libslic3r/Config.hpp" -#include "libslic3r/GCodeReader.hpp" #include "libslic3r/Flow.hpp" #include "libslic3r/libslic3r.h" diff --git a/tests/fff_print/test_gcode_timing.cpp b/tests/fff_print/test_gcode_timing.cpp index 45a71cdd92..49c254e810 100644 --- a/tests/fff_print/test_gcode_timing.cpp +++ b/tests/fff_print/test_gcode_timing.cpp @@ -4,7 +4,6 @@ #include #include #include -#include "libslic3r/libslic3r.h" #include "libslic3r/GCode/GCodeProcessor.hpp" #include "libslic3r/MultiNozzleUtils.hpp" #include "libslic3r/PrintConfig.hpp" @@ -13,9 +12,9 @@ #include #include +#include #include #include -#include "libslic3r/ExtrusionEntity.hpp" #include #include #include @@ -23,6 +22,9 @@ #include #include #include +#include "libslic3r/Config.hpp" + +namespace Slic3r { enum ExtrusionRole : uint8_t; } using namespace Slic3r; using Catch::Matchers::WithinAbs; diff --git a/tests/fff_print/test_gcodewriter.cpp b/tests/fff_print/test_gcodewriter.cpp index f8bb2fbe39..d3d73c222b 100644 --- a/tests/fff_print/test_gcodewriter.cpp +++ b/tests/fff_print/test_gcodewriter.cpp @@ -36,6 +36,7 @@ #include #include "test_helpers.hpp" +#include "libslic3r/Arrange.hpp" using namespace Slic3r; using namespace Slic3r::Test; diff --git a/tests/fff_print/test_helpers.cpp b/tests/fff_print/test_helpers.cpp index c131b10f83..38935f33a7 100644 --- a/tests/fff_print/test_helpers.cpp +++ b/tests/fff_print/test_helpers.cpp @@ -5,8 +5,6 @@ #include "libslic3r/GCodeReader.hpp" #include "libslic3r/Config.hpp" #include "libslic3r/Print.hpp" -#include "libslic3r/Format/OBJ.hpp" -#include "libslic3r/Format/STL.hpp" #include #include @@ -488,6 +486,8 @@ std::vector role_sequence(const std::string &gcode, const std::vect } } // namespace Slic3r::Test #include +#include "libslic3r/Arrange.hpp" +#include "libslic3r/Model.hpp" SCENARIO("init_print functionality", "[test_helpers]") { GIVEN("A default config") { diff --git a/tests/fff_print/test_model.cpp b/tests/fff_print/test_model.cpp index 9e2c0790b3..43041c0bdf 100644 --- a/tests/fff_print/test_model.cpp +++ b/tests/fff_print/test_model.cpp @@ -15,6 +15,8 @@ #include "test_helpers.hpp" #include "test_utils.hpp" +#include "libslic3r/Arrange.hpp" +#include "libslic3r/Print.hpp" using namespace Slic3r; using namespace Slic3r::Test; diff --git a/tests/fff_print/test_print.cpp b/tests/fff_print/test_print.cpp index 9417934276..40f6343d95 100644 --- a/tests/fff_print/test_print.cpp +++ b/tests/fff_print/test_print.cpp @@ -24,7 +24,6 @@ #include -#include "libslic3r/libslic3r.h" #include "libslic3r/Print.hpp" #include "libslic3r/Layer.hpp" #include "libslic3r/Model.hpp" @@ -43,6 +42,9 @@ #include #include #include +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/SurfaceCollection.hpp" using namespace Slic3r; using namespace Slic3r::Test; diff --git a/tests/fff_print/test_printobject.cpp b/tests/fff_print/test_printobject.cpp index 6671dabc4b..fb79abd419 100644 --- a/tests/fff_print/test_printobject.cpp +++ b/tests/fff_print/test_printobject.cpp @@ -35,6 +35,9 @@ #include #include #include +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/ExtrusionEntityCollection.hpp" +#include "libslic3r/SurfaceCollection.hpp" using namespace Slic3r; using namespace Slic3r::Test; diff --git a/tests/fff_print/test_seam_placer.cpp b/tests/fff_print/test_seam_placer.cpp index 73b3e986d2..3aea296fc7 100644 --- a/tests/fff_print/test_seam_placer.cpp +++ b/tests/fff_print/test_seam_placer.cpp @@ -22,6 +22,10 @@ #include "libslic3r/ExtrusionEntity.hpp" #include "libslic3r/Polyline.hpp" #include "libslic3r/libslic3r.h" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/ExtrusionEntityCollection.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Print.hpp" using namespace Slic3r; diff --git a/tests/fff_print/test_skirt_brim.cpp b/tests/fff_print/test_skirt_brim.cpp index d04b32361e..34a1260b7c 100644 --- a/tests/fff_print/test_skirt_brim.cpp +++ b/tests/fff_print/test_skirt_brim.cpp @@ -7,7 +7,6 @@ #include #include #include "libslic3r/GCodeReader.hpp" -#include "libslic3r/Config.hpp" #include "libslic3r/Geometry.hpp" #include "libslic3r/Geometry/ConvexHull.hpp" #include "libslic3r/Layer.hpp" @@ -27,6 +26,12 @@ #include #include "test_helpers.hpp" // get access to init_print, etc +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/BrimEarsPoint.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/ExtrusionEntityCollection.hpp" +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Print.hpp" using namespace Slic3r::Test; using namespace Slic3r; diff --git a/tests/fff_print/test_slicing_pipeline_hook.cpp b/tests/fff_print/test_slicing_pipeline_hook.cpp index 8b328e5dde..128f05d81e 100644 --- a/tests/fff_print/test_slicing_pipeline_hook.cpp +++ b/tests/fff_print/test_slicing_pipeline_hook.cpp @@ -496,6 +496,9 @@ TEST_CASE("refreshing lslices after a slice mutation makes islands track the geo } #include // deterministic RNG for the fuzzy-skin analogue below +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/SurfaceCollection.hpp" // Fuzzy skin applied to the slice contours at the Slice boundary, matching what the Fuzzy // Slices sample (sandboxes/orca_fuzzy_slices_plugin_any.py) does: resample every ring at diff --git a/tests/fff_print/test_support_material.cpp b/tests/fff_print/test_support_material.cpp index d311130094..e665edd833 100644 --- a/tests/fff_print/test_support_material.cpp +++ b/tests/fff_print/test_support_material.cpp @@ -30,6 +30,8 @@ // Not self-contained: its inline constructor uses PrintObject, PrintRegion, SlicingParameters and // Geometry, so it must follow the headers (pulled in via test_helpers.hpp) that define them. #include "libslic3r/Support/SupportParameters.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Print.hpp" using namespace Slic3r::Test; using namespace Slic3r; diff --git a/tests/fff_print/test_texture_displacement.cpp b/tests/fff_print/test_texture_displacement.cpp index 87047af618..ba4649b353 100644 --- a/tests/fff_print/test_texture_displacement.cpp +++ b/tests/fff_print/test_texture_displacement.cpp @@ -24,6 +24,7 @@ #include "libslic3r/TriangleSelector.hpp" #include "test_helpers.hpp" +#include "libslic3r/TriangleMesh.hpp" using namespace Slic3r; using namespace Slic3r::Test; diff --git a/tests/fff_print/test_tree_support.cpp b/tests/fff_print/test_tree_support.cpp index 677cf4359f..f9f97de6d2 100644 --- a/tests/fff_print/test_tree_support.cpp +++ b/tests/fff_print/test_tree_support.cpp @@ -14,6 +14,8 @@ #include "libslic3r/TriangleMesh.hpp" #include "test_helpers.hpp" +#include "libslic3r/ExtrusionEntityCollection.hpp" +#include "libslic3r/Print.hpp" using namespace Slic3r::Test; using namespace Slic3r; diff --git a/tests/fff_print/test_trianglemesh.cpp b/tests/fff_print/test_trianglemesh.cpp index 722732e207..b7e3b96beb 100644 --- a/tests/fff_print/test_trianglemesh.cpp +++ b/tests/fff_print/test_trianglemesh.cpp @@ -4,8 +4,6 @@ #include "libslic3r/TriangleMesh.hpp" #include "libslic3r/TriangleMeshSlicer.hpp" #include "libslic3r/Point.hpp" -#include "libslic3r/Config.hpp" -#include "libslic3r/Model.hpp" #include "libslic3r/libslic3r.h" #include @@ -17,9 +15,10 @@ #include #include #include "libslic3r/ExPolygon.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" //#include "test_options.hpp" -#include "test_helpers.hpp" using namespace Slic3r; using namespace std; diff --git a/tests/fff_print/test_wipe.cpp b/tests/fff_print/test_wipe.cpp index 63cd847ccb..83a31e8137 100644 --- a/tests/fff_print/test_wipe.cpp +++ b/tests/fff_print/test_wipe.cpp @@ -29,6 +29,7 @@ #include "libslic3r/Layer.hpp" #include "test_helpers.hpp" +#include "libslic3r/Polyline.hpp" using namespace Slic3r; using namespace Slic3r::Test; diff --git a/tests/fff_print/test_wipe_tower.cpp b/tests/fff_print/test_wipe_tower.cpp index da3cbe2502..c094a656f7 100644 --- a/tests/fff_print/test_wipe_tower.cpp +++ b/tests/fff_print/test_wipe_tower.cpp @@ -25,6 +25,8 @@ #include "libslic3r/PrintConfig.hpp" #include "test_helpers.hpp" +#include "libslic3r/PrintBase.hpp" +#include "libslic3r/TriangleMesh.hpp" using namespace Slic3r; using namespace Slic3r::Test; diff --git a/tests/filament_group/filament_group_regression_main.cpp b/tests/filament_group/filament_group_regression_main.cpp index c8933e6b6e..ec3264ba2c 100644 --- a/tests/filament_group/filament_group_regression_main.cpp +++ b/tests/filament_group/filament_group_regression_main.cpp @@ -28,6 +28,7 @@ #include #include #include +#include "libslic3r/MultiNozzleUtils.hpp" namespace fs = std::filesystem; using namespace Slic3r; diff --git a/tests/libnest2d/libnest2d_tests.cpp b/tests/libnest2d/libnest2d_tests.cpp index f5e3263b89..231cfbc991 100644 --- a/tests/libnest2d/libnest2d_tests.cpp +++ b/tests/libnest2d/libnest2d_tests.cpp @@ -6,6 +6,9 @@ #include #include "libnest2d_test_utils.hpp" +#include "libnest2d/backends/libslic3r/geometries.hpp" +#include "libnest2d/placers/nfpplacer.hpp" +#include "libslic3r/Point.hpp" using namespace libnest2d; diff --git a/tests/libnest2d/test_geometry.cpp b/tests/libnest2d/test_geometry.cpp index e32c47042a..17778022d8 100644 --- a/tests/libnest2d/test_geometry.cpp +++ b/tests/libnest2d/test_geometry.cpp @@ -21,6 +21,9 @@ #include #include "libnest2d_test_utils.hpp" #include "printer_parts.hpp" +#include "libnest2d/nester.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Polygon.hpp" using namespace libnest2d; diff --git a/tests/libnest2d/test_nfp.cpp b/tests/libnest2d/test_nfp.cpp index fdb43f7bfa..46d5d42f3f 100644 --- a/tests/libnest2d/test_nfp.cpp +++ b/tests/libnest2d/test_nfp.cpp @@ -13,6 +13,8 @@ #include #include #include "libnest2d_test_utils.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Point.hpp" using namespace libnest2d; diff --git a/tests/libnest2d/test_nfp_placer.cpp b/tests/libnest2d/test_nfp_placer.cpp index 02b711ec9d..a38df54191 100644 --- a/tests/libnest2d/test_nfp_placer.cpp +++ b/tests/libnest2d/test_nfp_placer.cpp @@ -9,6 +9,11 @@ #include #include #include "libnest2d_test_utils.hpp" +#include "libnest2d/backends/libslic3r/geometries.hpp" +#include "libnest2d/nester.hpp" +#include "libnest2d/placers/nfpplacer.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Point.hpp" using namespace libnest2d; diff --git a/tests/libslic3r/test_aabbindirect.cpp b/tests/libslic3r/test_aabbindirect.cpp index e97b8d193b..852583fa47 100644 --- a/tests/libslic3r/test_aabbindirect.cpp +++ b/tests/libslic3r/test_aabbindirect.cpp @@ -1,13 +1,13 @@ #include #include #include -#include "test_utils.hpp" #include #include #include #include #include +#include "libslic3r/Point.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_arachne_walls.cpp b/tests/libslic3r/test_arachne_walls.cpp index be4df5d3b1..f568a0d014 100644 --- a/tests/libslic3r/test_arachne_walls.cpp +++ b/tests/libslic3r/test_arachne_walls.cpp @@ -42,6 +42,7 @@ #include "libslic3r/Arachne/utils/ExtrusionJunction.hpp" #include "libslic3r/PerimeterGenerator.hpp" #include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Layer.hpp" using namespace Slic3r; using namespace Slic3r::Arachne; diff --git a/tests/libslic3r/test_arrange.cpp b/tests/libslic3r/test_arrange.cpp index 2f8df3166a..7d3c2fb324 100644 --- a/tests/libslic3r/test_arrange.cpp +++ b/tests/libslic3r/test_arrange.cpp @@ -20,6 +20,7 @@ #include "libslic3r/ExPolygon.hpp" #include "libslic3r/Print.hpp" #include "libslic3r/PrintConfig.hpp" +#include "libslic3r/MultiMaterialSegmentation.hpp" using namespace Slic3r; using namespace Slic3r::arrangement; diff --git a/tests/libslic3r/test_buildvolume.cpp b/tests/libslic3r/test_buildvolume.cpp index 3438f7517f..ac1d7e4510 100644 --- a/tests/libslic3r/test_buildvolume.cpp +++ b/tests/libslic3r/test_buildvolume.cpp @@ -6,6 +6,7 @@ #include #include #include "libslic3r/BuildVolume.hpp" +#include "libslic3r/BoundingBox.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_caddocument.cpp b/tests/libslic3r/test_caddocument.cpp index 744c2e9f23..92ab3679d7 100644 --- a/tests/libslic3r/test_caddocument.cpp +++ b/tests/libslic3r/test_caddocument.cpp @@ -55,6 +55,8 @@ #include #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Point.hpp" using namespace Slic3r; using Catch::Approx; // Catch2 v3 scopes Approx under Catch:: (v2 had it unqualified) diff --git a/tests/libslic3r/test_calib.cpp b/tests/libslic3r/test_calib.cpp index 81fa59ff93..3930a73e68 100644 --- a/tests/libslic3r/test_calib.cpp +++ b/tests/libslic3r/test_calib.cpp @@ -12,6 +12,7 @@ #include "libslic3r/Model.hpp" #include "libslic3r/TriangleMesh.hpp" #include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Point.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_clipper_utils.cpp b/tests/libslic3r/test_clipper_utils.cpp index 2c037d3063..c9026a9ba2 100644 --- a/tests/libslic3r/test_clipper_utils.cpp +++ b/tests/libslic3r/test_clipper_utils.cpp @@ -15,7 +15,7 @@ #include #include "libslic3r/ClipperUtils.hpp" #include "libslic3r/ExPolygon.hpp" -#include "libslic3r/SVG.hpp" +#include "libslic3r/Point.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp index 382303cb36..e13070062f 100644 --- a/tests/libslic3r/test_config.cpp +++ b/tests/libslic3r/test_config.cpp @@ -30,6 +30,7 @@ #include #include #include +#include namespace fs = boost::filesystem; diff --git a/tests/libslic3r/test_fill_corner_smoothing.cpp b/tests/libslic3r/test_fill_corner_smoothing.cpp index ebad09e9e5..6991917655 100644 --- a/tests/libslic3r/test_fill_corner_smoothing.cpp +++ b/tests/libslic3r/test_fill_corner_smoothing.cpp @@ -10,7 +10,6 @@ #include #include "libslic3r/Fill/FillCornerSmoothing.hpp" #include "libslic3r/Polyline.hpp" -#include "libslic3r/libslic3r.h" using namespace Slic3r; diff --git a/tests/libslic3r/test_geometry.cpp b/tests/libslic3r/test_geometry.cpp index 6f12b1113a..caf9bd23fc 100644 --- a/tests/libslic3r/test_geometry.cpp +++ b/tests/libslic3r/test_geometry.cpp @@ -28,6 +28,7 @@ #include #include #include +#include "libnest2d/backends/libslic3r/geometries.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_lay_on_face.cpp b/tests/libslic3r/test_lay_on_face.cpp index 76a197efe7..f1bb92a1e8 100644 --- a/tests/libslic3r/test_lay_on_face.cpp +++ b/tests/libslic3r/test_lay_on_face.cpp @@ -12,6 +12,7 @@ #include #include "libslic3r/LayOnFace.hpp" #include "libslic3r/Model.hpp" +#include "libslic3r/BoundingBox.hpp" using namespace Slic3r; using Catch::Matchers::WithinAbs; diff --git a/tests/libslic3r/test_marchingsquares.cpp b/tests/libslic3r/test_marchingsquares.cpp index e9d0f8ebc2..dd6f5dbd97 100644 --- a/tests/libslic3r/test_marchingsquares.cpp +++ b/tests/libslic3r/test_marchingsquares.cpp @@ -38,10 +38,9 @@ #include #include -#include -#include #include #include +#include using namespace Slic3r; using namespace Catch::Matchers; diff --git a/tests/libslic3r/test_meshboolean.cpp b/tests/libslic3r/test_meshboolean.cpp index 4c0faa1bb0..6aebd56481 100644 --- a/tests/libslic3r/test_meshboolean.cpp +++ b/tests/libslic3r/test_meshboolean.cpp @@ -1,7 +1,6 @@ #include #include #include -#include "test_utils.hpp" #include #include diff --git a/tests/libslic3r/test_model.cpp b/tests/libslic3r/test_model.cpp index 24d690ac9e..626c0c0925 100644 --- a/tests/libslic3r/test_model.cpp +++ b/tests/libslic3r/test_model.cpp @@ -6,6 +6,7 @@ #include #include "libslic3r/Model.hpp" +#include "libslic3r/Geometry.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_multimaterial_segmentation.cpp b/tests/libslic3r/test_multimaterial_segmentation.cpp index 065a143ce1..14148f1fe2 100644 --- a/tests/libslic3r/test_multimaterial_segmentation.cpp +++ b/tests/libslic3r/test_multimaterial_segmentation.cpp @@ -9,10 +9,10 @@ #include #include #include -#include "libslic3r/Line.hpp" #include "libslic3r/Flow.hpp" #include "libslic3r/MultiMaterialSegmentation.hpp" #include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_optimizers.cpp b/tests/libslic3r/test_optimizers.cpp index 232481f23c..4cde2b85aa 100644 --- a/tests/libslic3r/test_optimizers.cpp +++ b/tests/libslic3r/test_optimizers.cpp @@ -1,11 +1,9 @@ #include #include -#include "test_utils.hpp" #include #include -#include #include "libslic3r/Optimize/Optimizer.hpp" #include "libslic3r/libslic3r.h" diff --git a/tests/libslic3r/test_ordering_strategies.cpp b/tests/libslic3r/test_ordering_strategies.cpp index f6e0cd94f2..97e5a83f60 100644 --- a/tests/libslic3r/test_ordering_strategies.cpp +++ b/tests/libslic3r/test_ordering_strategies.cpp @@ -16,6 +16,7 @@ #include #include +#include using namespace Slic3r; diff --git a/tests/libslic3r/test_polygon.cpp b/tests/libslic3r/test_polygon.cpp index 08fd21d3c0..3ebbbf8690 100644 --- a/tests/libslic3r/test_polygon.cpp +++ b/tests/libslic3r/test_polygon.cpp @@ -6,6 +6,8 @@ #include #include "libslic3r/Point.hpp" #include "libslic3r/Polygon.hpp" +#include "libslic3r/Line.hpp" +#include "libslic3r/Polyline.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_precise_seam_3mf.cpp b/tests/libslic3r/test_precise_seam_3mf.cpp index cda140ebce..f7bb6859f3 100644 --- a/tests/libslic3r/test_precise_seam_3mf.cpp +++ b/tests/libslic3r/test_precise_seam_3mf.cpp @@ -25,6 +25,7 @@ #include #include #include +#include "libslic3r/Point.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_sketchconstraints.cpp b/tests/libslic3r/test_sketchconstraints.cpp index 2142398e68..36dabce84f 100644 --- a/tests/libslic3r/test_sketchconstraints.cpp +++ b/tests/libslic3r/test_sketchconstraints.cpp @@ -8,6 +8,7 @@ #include #include "libslic3r/CAD/SketchConstraints.hpp" #include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/Point.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_sketchedit.cpp b/tests/libslic3r/test_sketchedit.cpp index b289b71e69..d98f78d54b 100644 --- a/tests/libslic3r/test_sketchedit.cpp +++ b/tests/libslic3r/test_sketchedit.cpp @@ -11,6 +11,7 @@ #include #include #include +#include "libslic3r/Point.hpp" using namespace Slic3r; diff --git a/tests/libslic3r/test_toolordering_nozzle_group.cpp b/tests/libslic3r/test_toolordering_nozzle_group.cpp index ce55086257..33f8083125 100644 --- a/tests/libslic3r/test_toolordering_nozzle_group.cpp +++ b/tests/libslic3r/test_toolordering_nozzle_group.cpp @@ -26,6 +26,7 @@ #include #include +#include "libslic3r/Point.hpp" // H2C/A2L multi-nozzle filament grouping core. // diff --git a/tests/libslic3r/test_wipe_path.cpp b/tests/libslic3r/test_wipe_path.cpp index 731a8626d4..4a513a83a8 100644 --- a/tests/libslic3r/test_wipe_path.cpp +++ b/tests/libslic3r/test_wipe_path.cpp @@ -20,6 +20,7 @@ #include #include #include +#include "libslic3r/ArcFitter.hpp" using namespace Slic3r; using Slic3r::AABBTreeLines::LinesDistancer; diff --git a/tests/libslic3r/test_wipe_tower.cpp b/tests/libslic3r/test_wipe_tower.cpp index 9c64ae1b53..ba67c5db51 100644 --- a/tests/libslic3r/test_wipe_tower.cpp +++ b/tests/libslic3r/test_wipe_tower.cpp @@ -18,6 +18,7 @@ #include "libslic3r/GCode/WipeTower2.hpp" #include "libslic3r/Print.hpp" #include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" using namespace Slic3r; using Catch::Matchers::WithinAbs; diff --git a/tests/libslic3r/test_wipe_tower_estimate.cpp b/tests/libslic3r/test_wipe_tower_estimate.cpp index 6f0b268801..5916b5bb72 100644 --- a/tests/libslic3r/test_wipe_tower_estimate.cpp +++ b/tests/libslic3r/test_wipe_tower_estimate.cpp @@ -21,6 +21,7 @@ #include #include #include +#include "libslic3r/clonable_ptr.hpp" using namespace Slic3r; using Catch::Matchers::WithinAbs; diff --git a/tests/sla_print/sla_print_tests.cpp b/tests/sla_print/sla_print_tests.cpp index e095c0543a..ceea847c15 100644 --- a/tests/sla_print/sla_print_tests.cpp +++ b/tests/sla_print/sla_print_tests.cpp @@ -27,8 +27,9 @@ #include #include -#include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/ExtrusionEntity.hpp" namespace { diff --git a/tests/sla_print/sla_print_tests_main.cpp b/tests/sla_print/sla_print_tests_main.cpp index a0e7a3053c..d6997835b6 100644 --- a/tests/sla_print/sla_print_tests_main.cpp +++ b/tests/sla_print/sla_print_tests_main.cpp @@ -1,4 +1,3 @@ -#include "libslic3r/libslic3r.h" #define NANOSVG_IMPLEMENTATION #include "nanosvg/nanosvg.h" #define NANOSVGRAST_IMPLEMENTATION diff --git a/tests/sla_print/sla_raycast_tests.cpp b/tests/sla_print/sla_raycast_tests.cpp index e050e35845..0835aa58a0 100644 --- a/tests/sla_print/sla_raycast_tests.cpp +++ b/tests/sla_print/sla_raycast_tests.cpp @@ -2,16 +2,13 @@ #include #include #include -#include "test_utils.hpp" #include "libslic3r/Point.hpp" #include #include -#include #include #include -#include "sla_test_utils.hpp" using namespace Slic3r; diff --git a/tests/sla_print/sla_supptgen_tests.cpp b/tests/sla_print/sla_supptgen_tests.cpp index 091bfa2d66..a3b5db4ae2 100644 --- a/tests/sla_print/sla_supptgen_tests.cpp +++ b/tests/sla_print/sla_supptgen_tests.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include "libslic3r/TriangleMesh.hpp" #include "libslic3r/libslic3r.h" diff --git a/tests/sla_print/sla_test_utils.cpp b/tests/sla_print/sla_test_utils.cpp index 2a769692c8..fb9707b70d 100644 --- a/tests/sla_print/sla_test_utils.cpp +++ b/tests/sla_print/sla_test_utils.cpp @@ -34,6 +34,7 @@ #include "libslic3r/SLA/ConcaveHull.hpp" #include "libslic3r/SLA/RasterBase.hpp" #include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Line.hpp" void test_support_model_collision(const std::string &obj_filename, const sla::SupportTreeConfig &input_supportcfg, diff --git a/tests/sla_print/sla_test_utils.hpp b/tests/sla_print/sla_test_utils.hpp index 03d4bfd3c9..1f6490c3e7 100644 --- a/tests/sla_print/sla_test_utils.hpp +++ b/tests/sla_print/sla_test_utils.hpp @@ -3,7 +3,6 @@ #include #include -#include "test_utils.hpp" // Debug #include @@ -12,7 +11,6 @@ #include #include #include -#include "libslic3r/SLA/SupportTree.hpp" #include "libslic3r/SLA/Hollowing.hpp" #include #include @@ -23,20 +21,17 @@ #include #include -#include "libslic3r/libslic3r.h" -#include "libslic3r/Format/OBJ.hpp" -#include "libslic3r/SLAPrint.hpp" #include "libslic3r/TriangleMesh.hpp" -#include "libslic3r/SLA/Pad.hpp" #include "libslic3r/SLA/SupportTreeBuilder.hpp" #include "libslic3r/SLA/SupportTreeBuildsteps.hpp" #include "libslic3r/SLA/SupportPointGenerator.hpp" -#include "libslic3r/SLA/AGGRaster.hpp" -#include "libslic3r/SLA/ConcaveHull.hpp" -#include "libslic3r/MTUtils.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/ExtrusionEntity.hpp" + +namespace Slic3r::sla { class RasterGrayscaleAA; } +namespace Slic3r::sla { struct PadConfig; } +namespace Slic3r::sla { struct SupportTreeConfig; } -#include "libslic3r/SVG.hpp" -#include "libslic3r/Format/OBJ.hpp" using namespace Slic3r; diff --git a/tests/slic3rutils/test_dev_mapping.cpp b/tests/slic3rutils/test_dev_mapping.cpp index 4e32bcc20d..9d9d1a7e2a 100644 --- a/tests/slic3rutils/test_dev_mapping.cpp +++ b/tests/slic3rutils/test_dev_mapping.cpp @@ -28,6 +28,8 @@ #include "slic3r/GUI/DeviceCore/DevFilaSystem.h" #include +#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" +#include "slic3r/GUI/DeviceCore/DevUtil.h" using json = nlohmann::json; using namespace Slic3r; diff --git a/tests/slic3rutils/test_network_versions.cpp b/tests/slic3rutils/test_network_versions.cpp index bfddcb5423..ad352e0bfa 100644 --- a/tests/slic3rutils/test_network_versions.cpp +++ b/tests/slic3rutils/test_network_versions.cpp @@ -8,7 +8,6 @@ #include #include -#include "libslic3r/Utils.hpp" #include "slic3r/Utils/bambu_networking.hpp" #include "plugin_test_utils.hpp" diff --git a/tests/slic3rutils/test_plugin_capability_config.cpp b/tests/slic3rutils/test_plugin_capability_config.cpp index 34c380bba9..bbd0368d26 100644 --- a/tests/slic3rutils/test_plugin_capability_config.cpp +++ b/tests/slic3rutils/test_plugin_capability_config.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #include #include @@ -20,6 +19,7 @@ #include #include +#include namespace py = pybind11; using namespace Slic3r; diff --git a/tests/slic3rutils/test_plugin_cloud_metadata.cpp b/tests/slic3rutils/test_plugin_cloud_metadata.cpp index 09ac877eca..95ae6fcd43 100644 --- a/tests/slic3rutils/test_plugin_cloud_metadata.cpp +++ b/tests/slic3rutils/test_plugin_cloud_metadata.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff --git a/tests/slic3rutils/test_plugin_config.cpp b/tests/slic3rutils/test_plugin_config.cpp index ac7bae36be..7db8ccaba4 100644 --- a/tests/slic3rutils/test_plugin_config.cpp +++ b/tests/slic3rutils/test_plugin_config.cpp @@ -3,9 +3,7 @@ #include #include -#include #include -#include #include #include "plugin_test_utils.hpp" diff --git a/tests/slic3rutils/test_plugin_host_api.cpp b/tests/slic3rutils/test_plugin_host_api.cpp index 7919b273db..8255840ac6 100644 --- a/tests/slic3rutils/test_plugin_host_api.cpp +++ b/tests/slic3rutils/test_plugin_host_api.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include @@ -25,6 +24,11 @@ #include #include +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/PrintConfig.hpp" +#include namespace py = pybind11; diff --git a/tests/slic3rutils/test_plugin_install.cpp b/tests/slic3rutils/test_plugin_install.cpp index 539bd917e0..d79519c236 100644 --- a/tests/slic3rutils/test_plugin_install.cpp +++ b/tests/slic3rutils/test_plugin_install.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff --git a/tests/slic3rutils/test_plugin_lifecycle.cpp b/tests/slic3rutils/test_plugin_lifecycle.cpp index 0c0399e2d3..58a4f1a079 100644 --- a/tests/slic3rutils/test_plugin_lifecycle.cpp +++ b/tests/slic3rutils/test_plugin_lifecycle.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include #include diff --git a/tests/slic3rutils/test_plugin_printer_agent.cpp b/tests/slic3rutils/test_plugin_printer_agent.cpp index 50570f8712..fc504c806a 100644 --- a/tests/slic3rutils/test_plugin_printer_agent.cpp +++ b/tests/slic3rutils/test_plugin_printer_agent.cpp @@ -18,6 +18,7 @@ #include #include #include +#include namespace py = pybind11; using namespace Slic3r; diff --git a/tests/slic3rutils/test_precise_seam_plugin.cpp b/tests/slic3rutils/test_precise_seam_plugin.cpp index 0375b96b9e..b471c95f7b 100644 --- a/tests/slic3rutils/test_precise_seam_plugin.cpp +++ b/tests/slic3rutils/test_precise_seam_plugin.cpp @@ -10,6 +10,8 @@ #include #include +#include +#include namespace py = pybind11; using namespace Slic3r; diff --git a/tests/slic3rutils/test_printer_agent.cpp b/tests/slic3rutils/test_printer_agent.cpp index 8113326cc2..ac4140284c 100644 --- a/tests/slic3rutils/test_printer_agent.cpp +++ b/tests/slic3rutils/test_printer_agent.cpp @@ -1,10 +1,7 @@ #include #include -#include "slic3r/Utils/ICloudServiceAgent.hpp" -#include "slic3r/Utils/IPrinterAgent.hpp" #include -#include #include #include @@ -15,6 +12,10 @@ #include #include +#include + +namespace Slic3r { class ICloudServiceAgent; } +namespace Slic3r { class IPrinterAgent; } using namespace Slic3r; namespace py = pybind11; diff --git a/tests/slic3rutils/test_printhost.cpp b/tests/slic3rutils/test_printhost.cpp index c7ce9dccaa..10930d61ef 100644 --- a/tests/slic3rutils/test_printhost.cpp +++ b/tests/slic3rutils/test_printhost.cpp @@ -18,6 +18,7 @@ #include "libslic3r/LifecycleEvents.hpp" #include "slic3r/Utils/PrintHost.hpp" #include "slic3r/Utils/Flashforge.hpp" +#include "slic3r/Utils/Http.hpp" using namespace Slic3r; diff --git a/tests/slic3rutils/test_slicing_pipeline_bindings.cpp b/tests/slic3rutils/test_slicing_pipeline_bindings.cpp index 7552fe15af..bb29f6d607 100644 --- a/tests/slic3rutils/test_slicing_pipeline_bindings.cpp +++ b/tests/slic3rutils/test_slicing_pipeline_bindings.cpp @@ -147,6 +147,10 @@ TEST_CASE("orca.slicing is workflow-only: context exposes raw print/object; view #include #include #include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Polyline.hpp" +#include +#include // psGCodePostProcess is the merged post-processing seam: no live Print (print/object are None), the // plugin edits the file at ctx.gcode_path in place, and ctx.config_value() falls back to the config diff --git a/tests/slic3rutils/test_slicing_pipeline_config.cpp b/tests/slic3rutils/test_slicing_pipeline_config.cpp index 1e8e728f4d..0dc12639a0 100644 --- a/tests/slic3rutils/test_slicing_pipeline_config.cpp +++ b/tests/slic3rutils/test_slicing_pipeline_config.cpp @@ -8,7 +8,6 @@ #include "libslic3r/Model.hpp" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Config.hpp" -#include #include #include "slic3r/plugin/PluginFsUtils.hpp" #include diff --git a/tests/slic3rutils/test_web_media_controller.cpp b/tests/slic3rutils/test_web_media_controller.cpp index fdf271fe10..b6d8ced093 100644 --- a/tests/slic3rutils/test_web_media_controller.cpp +++ b/tests/slic3rutils/test_web_media_controller.cpp @@ -15,6 +15,11 @@ #include #include +class wxColour; +class wxPoint; +class wxSize; +class wxWindow; + using namespace Slic3r; using namespace Slic3r::GUI;