From 48c186331a0cca3226c92a7c2eafd612e54da605 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Tue, 26 May 2020 17:42:57 +0200 Subject: [PATCH] Includes cleanup: GUI_App.hpp (should not include) MainFrame.hpp MainFrame.hpp Plater.hpp ModelArrange.hpp Model.hpp Slicing.hpp PrintConfig.hpp FillBase.hpp PrintConfig.hpp GUI_App.hpp PrintConfig.hpp OptionsGroup.hpp GUI_App.hpp --- src/PrusaSlicer.cpp | 2 ++ src/libslic3r/Fill/FillBase.hpp | 2 +- src/libslic3r/ModelArrange.cpp | 2 ++ src/libslic3r/ModelArrange.hpp | 5 ++- src/libslic3r/PrintConfig.hpp | 2 +- src/libslic3r/Slicing.hpp | 2 +- src/slic3r/GUI/BackgroundSlicingProcess.cpp | 2 ++ src/slic3r/GUI/BedShapeDialog.cpp | 1 + src/slic3r/GUI/BedShapeDialog.hpp | 1 + src/slic3r/GUI/ConfigWizard.cpp | 1 + src/slic3r/GUI/DoubleSlider.cpp | 1 + src/slic3r/GUI/Field.cpp | 2 ++ src/slic3r/GUI/GLCanvas3D.cpp | 2 ++ src/slic3r/GUI/GLCanvas3D.hpp | 1 - src/slic3r/GUI/GLSelectionRectangle.cpp | 1 + src/slic3r/GUI/GLToolbar.cpp | 1 + src/slic3r/GUI/GUI_App.cpp | 2 ++ src/slic3r/GUI/GUI_App.hpp | 15 +++++++-- src/slic3r/GUI/GUI_ObjectLayers.cpp | 2 ++ src/slic3r/GUI/GUI_ObjectList.cpp | 1 + src/slic3r/GUI/GUI_ObjectManipulation.cpp | 3 ++ src/slic3r/GUI/GUI_ObjectSettings.cpp | 2 ++ src/slic3r/GUI/GUI_Preview.cpp | 1 + src/slic3r/GUI/Gizmos/GLGizmoCut.cpp | 1 + src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp | 1 + src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp | 1 + src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp | 1 + src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 1 + src/slic3r/GUI/InstanceCheck.cpp | 5 +++ src/slic3r/GUI/LambdaObjectDialog.cpp | 1 + src/slic3r/GUI/MainFrame.cpp | 1 + src/slic3r/GUI/MainFrame.hpp | 3 +- src/slic3r/GUI/Mouse3DController.cpp | 1 + src/slic3r/GUI/OptionsGroup.cpp | 32 ++++++++++++++++++++ src/slic3r/GUI/OptionsGroup.hpp | 28 +---------------- src/slic3r/GUI/Preferences.cpp | 3 +- src/slic3r/GUI/Search.cpp | 1 + src/slic3r/GUI/Selection.cpp | 1 + src/slic3r/GUI/SysInfoDialog.cpp | 1 + src/slic3r/GUI/Tab.cpp | 2 ++ src/slic3r/GUI/Tab.hpp | 2 ++ src/slic3r/GUI/wxExtensions.cpp | 1 + src/slic3r/Utils/PresetUpdater.cpp | 1 + 43 files changed, 105 insertions(+), 37 deletions(-) diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp index 91ce858354..a0422f5fa0 100644 --- a/src/PrusaSlicer.cpp +++ b/src/PrusaSlicer.cpp @@ -53,6 +53,8 @@ #include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/InstanceCheck.hpp" #include "slic3r/GUI/AppConfig.hpp" + #include "slic3r/GUI/MainFrame.hpp" + #include "slic3r/GUI/Plater.hpp" #endif /* SLIC3R_GUI */ using namespace Slic3r; diff --git a/src/libslic3r/Fill/FillBase.hpp b/src/libslic3r/Fill/FillBase.hpp index 083cb86cef..2e9b647354 100644 --- a/src/libslic3r/Fill/FillBase.hpp +++ b/src/libslic3r/Fill/FillBase.hpp @@ -11,13 +11,13 @@ #include "../libslic3r.h" #include "../BoundingBox.hpp" -#include "../PrintConfig.hpp" #include "../Utils.hpp" namespace Slic3r { class ExPolygon; class Surface; +enum InfillPattern : int; class InfillFailedException : public std::runtime_error { public: diff --git a/src/libslic3r/ModelArrange.cpp b/src/libslic3r/ModelArrange.cpp index 85aa25a5fb..230b04de5d 100644 --- a/src/libslic3r/ModelArrange.cpp +++ b/src/libslic3r/ModelArrange.cpp @@ -1,4 +1,6 @@ #include "ModelArrange.hpp" + +#include #include "MTUtils.hpp" namespace Slic3r { diff --git a/src/libslic3r/ModelArrange.hpp b/src/libslic3r/ModelArrange.hpp index d65b0fd6de..afe146d438 100644 --- a/src/libslic3r/ModelArrange.hpp +++ b/src/libslic3r/ModelArrange.hpp @@ -1,11 +1,14 @@ #ifndef MODELARRANGE_HPP #define MODELARRANGE_HPP -#include #include namespace Slic3r { +class Model; +class ModelInstance; +using ModelInstancePtrs = std::vector; + using arrangement::ArrangePolygon; using arrangement::ArrangePolygons; using arrangement::ArrangeParams; diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 10ff8086cc..4fc3d2d27b 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -33,7 +33,7 @@ enum PrintHostType { htOctoPrint, htDuet, htFlashAir, htAstroBox }; -enum InfillPattern { +enum InfillPattern : int { ipRectilinear, ipMonotonous, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb, ipGyroid, ipHilbertCurve, ipArchimedeanChords, ipOctagramSpiral, ipCount, }; diff --git a/src/libslic3r/Slicing.hpp b/src/libslic3r/Slicing.hpp index 95cf6891b2..2fd609b2c5 100644 --- a/src/libslic3r/Slicing.hpp +++ b/src/libslic3r/Slicing.hpp @@ -11,7 +11,6 @@ #include "libslic3r.h" #include "Utils.hpp" -#include "PrintConfig.hpp" namespace Slic3r { @@ -19,6 +18,7 @@ namespace Slic3r class PrintConfig; class PrintObjectConfig; class ModelObject; +class DynamicPrintConfig; // Parameters to guide object slicing and support generation. // The slicing parameters account for a raft and whether the 1st object layer is printed with a normal or a bridging flow diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp index cfd38354b6..8d50998c48 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp @@ -1,6 +1,7 @@ #include "BackgroundSlicingProcess.hpp" #include "GUI_App.hpp" #include "GUI.hpp" +#include "MainFrame.hpp" #include #include @@ -34,6 +35,7 @@ #include "RemovableDriveManager.hpp" #include "slic3r/Utils/Thread.hpp" +#include "slic3r/GUI/Plater.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp index 4357a371a4..343610eaa8 100644 --- a/src/slic3r/GUI/BedShapeDialog.cpp +++ b/src/slic3r/GUI/BedShapeDialog.cpp @@ -1,4 +1,5 @@ #include "BedShapeDialog.hpp" +#include "GUI_App.hpp" #include #include diff --git a/src/slic3r/GUI/BedShapeDialog.hpp b/src/slic3r/GUI/BedShapeDialog.hpp index bf12cc8934..1603df4af5 100644 --- a/src/slic3r/GUI/BedShapeDialog.hpp +++ b/src/slic3r/GUI/BedShapeDialog.hpp @@ -4,6 +4,7 @@ // The dialog opens from Print Settins tab->Bed Shape : Set... #include "OptionsGroup.hpp" +#include "GUI_Utils.hpp" #include "2DBed.hpp" #include "I18N.hpp" diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index e242033d95..18d8bb3128 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -27,6 +27,7 @@ #include "libslic3r/Utils.hpp" #include "GUI.hpp" +#include "GUI_App.hpp" #include "GUI_Utils.hpp" #include "slic3r/Config/Snapshot.hpp" #include "slic3r/Utils/PresetUpdater.hpp" diff --git a/src/slic3r/GUI/DoubleSlider.cpp b/src/slic3r/GUI/DoubleSlider.cpp index 4c4c1aa8dd..96fa94dda2 100644 --- a/src/slic3r/GUI/DoubleSlider.cpp +++ b/src/slic3r/GUI/DoubleSlider.cpp @@ -2,6 +2,7 @@ #include "libslic3r/GCode/PreviewData.hpp" #include "GUI.hpp" #include "GUI_App.hpp" +#include "Plater.hpp" #include "I18N.hpp" #include "ExtruderSequenceDialog.hpp" #include "libslic3r/Print.hpp" diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 4c7419cea0..3a06c3056e 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -3,6 +3,8 @@ #include "I18N.hpp" #include "Field.hpp" #include "wxExtensions.hpp" +#include "Plater.hpp" +#include "MainFrame.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 1266fef4cc..2f75f6a377 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -23,6 +23,8 @@ #include "slic3r/GUI/OpenGLManager.hpp" #include "slic3r/GUI/3DBed.hpp" #include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/MainFrame.hpp" #include "GUI_App.hpp" #include "GUI_ObjectList.hpp" diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index e43a761b57..2dc8dbecd3 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -5,7 +5,6 @@ #include #include -#include "3DScene.hpp" #include "GLToolbar.hpp" #include "GLShader.hpp" #include "Event.hpp" diff --git a/src/slic3r/GUI/GLSelectionRectangle.cpp b/src/slic3r/GUI/GLSelectionRectangle.cpp index d1d2b89f1d..d7f3f7a3a8 100644 --- a/src/slic3r/GUI/GLSelectionRectangle.cpp +++ b/src/slic3r/GUI/GLSelectionRectangle.cpp @@ -3,6 +3,7 @@ #include "3DScene.hpp" #include "GLCanvas3D.hpp" #include "GUI_App.hpp" +#include "Plater.hpp" #include diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index 603cfc3adb..59401b11a1 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -6,6 +6,7 @@ #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/Plater.hpp" #include #include diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 4c53a5b940..3c000f62e5 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -37,6 +37,8 @@ #include "AppConfig.hpp" #include "PresetBundle.hpp" #include "3DScene.hpp" +#include "MainFrame.hpp" +#include "Plater.hpp" #include "../Utils/PresetUpdater.hpp" #include "../Utils/PrintHost.hpp" diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index c9664e8d5e..c2b257f458 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -3,8 +3,7 @@ #include #include -#include "libslic3r/PrintConfig.hpp" -#include "MainFrame.hpp" +#include "Preset.hpp" #include "ImGuiWrapper.hpp" #include "ConfigWizard.hpp" #include "OpenGLManager.hpp" @@ -30,11 +29,21 @@ class PresetBundle; class PresetUpdater; class ModelObject; class PrintHostJobQueue; - +class Model; namespace GUI{ class RemovableDriveManager; class OtherInstanceMessageHandler; +class MainFrame; +class Sidebar; +class ObjectManipulation; +class ObjectSettings; +class ObjectList; +class ObjectLayers; +class Plater; + + + enum FileType { FT_STL, diff --git a/src/slic3r/GUI/GUI_ObjectLayers.cpp b/src/slic3r/GUI/GUI_ObjectLayers.cpp index cd65f69fcf..b1a5512d4b 100644 --- a/src/slic3r/GUI/GUI_ObjectLayers.cpp +++ b/src/slic3r/GUI/GUI_ObjectLayers.cpp @@ -2,9 +2,11 @@ #include "GUI_ObjectList.hpp" #include "OptionsGroup.hpp" +#include "GUI_App.hpp" #include "PresetBundle.hpp" #include "libslic3r/Model.hpp" #include "GLCanvas3D.hpp" +#include "Plater.hpp" #include diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index b944f5ec62..57418d93c4 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -4,6 +4,7 @@ #include "GUI_ObjectLayers.hpp" #include "GUI_App.hpp" #include "I18N.hpp" +#include "Plater.hpp" #include "OptionsGroup.hpp" #include "PresetBundle.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index 6a9e2ddc1d..2c35fc316d 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -4,11 +4,14 @@ #include "GLCanvas3D.hpp" #include "OptionsGroup.hpp" +#include "GUI_App.hpp" #include "wxExtensions.hpp" #include "PresetBundle.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/Geometry.hpp" #include "Selection.hpp" +#include "Plater.hpp" +#include "MainFrame.hpp" #include #include "slic3r/Utils/FixModelByWin10.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp index 1447e07688..ef78123a4c 100644 --- a/src/slic3r/GUI/GUI_ObjectSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp @@ -2,8 +2,10 @@ #include "GUI_ObjectList.hpp" #include "OptionsGroup.hpp" +#include "GUI_App.hpp" #include "wxExtensions.hpp" #include "PresetBundle.hpp" +#include "Plater.hpp" #include "libslic3r/Model.hpp" #include diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index ba5aab2e5a..5084a7052c 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -10,6 +10,7 @@ #include "GLCanvas3D.hpp" #include "PresetBundle.hpp" #include "DoubleSlider.hpp" +#include "Plater.hpp" #include #include diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 9382579ea3..17c10f4858 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -12,6 +12,7 @@ #include #include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Plater.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index e90f76fc46..97e2ffed24 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -8,6 +8,7 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/PresetBundle.hpp" #include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/Plater.hpp" #include "libslic3r/Model.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp index 712311e810..268a15df35 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp @@ -3,6 +3,7 @@ #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "slic3r/GUI/MainFrame.hpp" #include diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp index e35750fa0a..9dd9c6565e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp @@ -6,6 +6,7 @@ #include "libslic3r/SLAPrint.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/Plater.hpp" #include diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 324c50011e..355927fb13 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -6,6 +6,7 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/GUI_ObjectManipulation.hpp" #include "slic3r/GUI/PresetBundle.hpp" +#include "slic3r/GUI/Plater.hpp" #include "slic3r/Utils/UndoRedo.hpp" #include "slic3r/GUI/Gizmos/GLGizmoMove.hpp" diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp index 4470876c71..d5ecbcd0fc 100644 --- a/src/slic3r/GUI/InstanceCheck.cpp +++ b/src/slic3r/GUI/InstanceCheck.cpp @@ -1,5 +1,10 @@ #include "GUI_App.hpp" #include "InstanceCheck.hpp" +#include "Plater.hpp" + +#ifdef _WIN32 + #include "MainFrame.hpp" +#endif #include "libslic3r/Utils.hpp" #include "libslic3r/Config.hpp" diff --git a/src/slic3r/GUI/LambdaObjectDialog.cpp b/src/slic3r/GUI/LambdaObjectDialog.cpp index 63c8d329c5..3121e0f70e 100644 --- a/src/slic3r/GUI/LambdaObjectDialog.cpp +++ b/src/slic3r/GUI/LambdaObjectDialog.cpp @@ -3,6 +3,7 @@ #include #include #include "OptionsGroup.hpp" +#include "GUI_App.hpp" #include "I18N.hpp" namespace Slic3r diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 20b713bcad..d8a799eb28 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -29,6 +29,7 @@ #include "InstanceCheck.hpp" #include "I18N.hpp" #include "GLCanvas3D.hpp" +#include "Plater.hpp" #include #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 43375d3441..3b64be9bcc 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -12,7 +12,6 @@ #include #include "GUI_Utils.hpp" -#include "Plater.hpp" #include "Event.hpp" class wxNotebook; @@ -27,6 +26,8 @@ namespace GUI class Tab; class PrintHostQueueDialog; +class Plater; +class MainFrame; enum QuickSlice { diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp index 8f80f6847c..baa9356b69 100644 --- a/src/slic3r/GUI/Mouse3DController.cpp +++ b/src/slic3r/GUI/Mouse3DController.cpp @@ -6,6 +6,7 @@ #include "PresetBundle.hpp" #include "AppConfig.hpp" #include "GLCanvas3D.hpp" +#include "Plater.hpp" #include diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index fa94e63218..819c214a85 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -1,5 +1,7 @@ #include "OptionsGroup.hpp" #include "ConfigExceptions.hpp" +#include "Plater.hpp" +#include "GUI_App.hpp" #include #include @@ -100,6 +102,36 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co return field; } +OptionsGroup::OptionsGroup( wxWindow* _parent, const wxString& title, + bool is_tab_opt /* = false */, + column_t extra_clmn /* = nullptr */) : + m_parent(_parent), title(title), + m_show_modified_btns(is_tab_opt), + staticbox(title!=""), extra_column(extra_clmn) +{ + if (staticbox) { + stb = new wxStaticBox(_parent, wxID_ANY, _(title)); + if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT); + stb->SetFont(wxOSX ? wxGetApp().normal_font() : wxGetApp().bold_font()); + } else + stb = nullptr; + sizer = (staticbox ? new wxStaticBoxSizer(stb, wxVERTICAL) : new wxBoxSizer(wxVERTICAL)); + auto num_columns = 1U; + if (label_width != 0) num_columns++; + if (extra_column != nullptr) num_columns++; + m_grid_sizer = new wxFlexGridSizer(0, num_columns, 1,0); + static_cast(m_grid_sizer)->SetFlexibleDirection(wxBOTH/*wxHORIZONTAL*/); + static_cast(m_grid_sizer)->AddGrowableCol(label_width == 0 ? 0 : !extra_column ? 1 : 2 ); +#if 0//#ifdef __WXGTK__ + m_panel = new wxPanel( _parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + sizer->Fit(m_panel); + sizer->Add(m_panel, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5); +#else + sizer->Add(m_grid_sizer, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5); +#endif /* __WXGTK__ */ + +} + void OptionsGroup::add_undo_buttuns_to_sizer(wxSizer* sizer, const t_field& field) { if (!m_show_modified_btns) { diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp index 9fbb28339a..2e6f9aa0f4 100644 --- a/src/slic3r/GUI/OptionsGroup.hpp +++ b/src/slic3r/GUI/OptionsGroup.hpp @@ -11,7 +11,6 @@ #include "libslic3r/PrintConfig.hpp" #include "Field.hpp" -#include "GUI_App.hpp" #include "I18N.hpp" // Translate the ifdef @@ -171,32 +170,7 @@ public: } OptionsGroup( wxWindow* _parent, const wxString& title, bool is_tab_opt = false, - column_t extra_clmn = nullptr) : - m_parent(_parent), title(title), - m_show_modified_btns(is_tab_opt), - staticbox(title!=""), extra_column(extra_clmn) { - if (staticbox) { - stb = new wxStaticBox(_parent, wxID_ANY, _(title)); - if (!wxOSX) stb->SetBackgroundStyle(wxBG_STYLE_PAINT); - stb->SetFont(wxOSX ? wxGetApp().normal_font() : wxGetApp().bold_font()); - } else - stb = nullptr; - sizer = (staticbox ? new wxStaticBoxSizer(stb, wxVERTICAL) : new wxBoxSizer(wxVERTICAL)); - auto num_columns = 1U; - if (label_width != 0) num_columns++; - if (extra_column != nullptr) num_columns++; - m_grid_sizer = new wxFlexGridSizer(0, num_columns, 1,0); - static_cast(m_grid_sizer)->SetFlexibleDirection(wxBOTH/*wxHORIZONTAL*/); - static_cast(m_grid_sizer)->AddGrowableCol(label_width == 0 ? 0 : !extra_column ? 1 : 2 ); -#if 0//#ifdef __WXGTK__ - m_panel = new wxPanel( _parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - sizer->Fit(m_panel); - sizer->Add(m_panel, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5); -#else - sizer->Add(m_grid_sizer, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5); -#endif /* __WXGTK__ */ - - } + column_t extra_clmn = nullptr); wxGridSizer* get_grid_sizer() { return m_grid_sizer; } diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index bb189cf263..35f2ee4293 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -1,6 +1,7 @@ #include "Preferences.hpp" #include "AppConfig.hpp" #include "OptionsGroup.hpp" +#include "GUI_App.hpp" #include "I18N.hpp" namespace Slic3r { @@ -364,4 +365,4 @@ void PreferencesDialog::create_settings_mode_widget() } // GUI -} // Slic3r \ No newline at end of file +} // Slic3r diff --git a/src/slic3r/GUI/Search.cpp b/src/slic3r/GUI/Search.cpp index a94b776a18..9685899855 100644 --- a/src/slic3r/GUI/Search.cpp +++ b/src/slic3r/GUI/Search.cpp @@ -10,6 +10,7 @@ #include "libslic3r/PrintConfig.hpp" #include "GUI_App.hpp" +#include "Plater.hpp" #include "Tab.hpp" #include "PresetBundle.hpp" diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 106583400e..69550748d8 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -9,6 +9,7 @@ #include "GUI_ObjectList.hpp" #include "Gizmos/GLGizmoBase.hpp" #include "Camera.hpp" +#include "Plater.hpp" #include "libslic3r/Model.hpp" diff --git a/src/slic3r/GUI/SysInfoDialog.cpp b/src/slic3r/GUI/SysInfoDialog.cpp index 74b94e1ebe..3bd0fcf9f7 100644 --- a/src/slic3r/GUI/SysInfoDialog.cpp +++ b/src/slic3r/GUI/SysInfoDialog.cpp @@ -3,6 +3,7 @@ #include "3DScene.hpp" #include "GUI.hpp" #include "../Utils/UndoRedo.hpp" +#include "Plater.hpp" #include diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 3b78b2c9af..158553562a 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -32,6 +32,8 @@ #include "GUI_App.hpp" #include "GUI_ObjectList.hpp" #include "ConfigWizard.hpp" +#include "Plater.hpp" +#include "MainFrame.hpp" #include "format.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp index 36b4a61ead..71c3a55db3 100644 --- a/src/slic3r/GUI/Tab.hpp +++ b/src/slic3r/GUI/Tab.hpp @@ -33,6 +33,8 @@ #include "Event.hpp" #include "wxExtensions.hpp" #include "ConfigManipulation.hpp" +#include "Preset.hpp" +#include "GUI_App.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index dd56f2acdd..ad9f0a121e 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -13,6 +13,7 @@ #include "GUI_ObjectList.hpp" #include "I18N.hpp" #include "GUI_Utils.hpp" +#include "Plater.hpp" #include "../Utils/MacDarkMode.hpp" #ifndef __WXGTK__// msw_menuitem_bitmaps is used for MSW and OSX diff --git a/src/slic3r/Utils/PresetUpdater.cpp b/src/slic3r/Utils/PresetUpdater.cpp index b86775c88c..c32613c468 100644 --- a/src/slic3r/Utils/PresetUpdater.cpp +++ b/src/slic3r/Utils/PresetUpdater.cpp @@ -25,6 +25,7 @@ #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" #include "slic3r/Utils/Http.hpp" #include "slic3r/Config/Version.hpp"