From 6eb51a1cca4d99385f8b1795d5fc1063424c1635 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 23 Apr 2020 18:56:09 +0200 Subject: [PATCH] Move ui jobs into separate folder --- src/slic3r/CMakeLists.txt | 18 +++++++++--------- src/slic3r/GUI/{ => Jobs}/ArrangeJob.cpp | 6 +++--- src/slic3r/GUI/{ => Jobs}/ArrangeJob.hpp | 0 src/slic3r/GUI/{ => Jobs}/Job.cpp | 0 src/slic3r/GUI/{ => Jobs}/Job.hpp | 3 ++- .../GUI/{ => Jobs}/ProgressIndicator.hpp | 0 src/slic3r/GUI/{ => Jobs}/RotoptimizeJob.cpp | 2 +- src/slic3r/GUI/{ => Jobs}/RotoptimizeJob.hpp | 0 src/slic3r/GUI/Plater.cpp | 4 ++-- src/slic3r/GUI/Plater.hpp | 2 +- src/slic3r/GUI/ProgressStatusBar.hpp | 2 +- 11 files changed, 19 insertions(+), 18 deletions(-) rename src/slic3r/GUI/{ => Jobs}/ArrangeJob.cpp (98%) rename src/slic3r/GUI/{ => Jobs}/ArrangeJob.hpp (100%) rename src/slic3r/GUI/{ => Jobs}/Job.cpp (100%) rename src/slic3r/GUI/{ => Jobs}/Job.hpp (98%) rename src/slic3r/GUI/{ => Jobs}/ProgressIndicator.hpp (100%) rename src/slic3r/GUI/{ => Jobs}/RotoptimizeJob.cpp (98%) rename src/slic3r/GUI/{ => Jobs}/RotoptimizeJob.hpp (100%) diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index c448fe3ba..1e9f3b862 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -142,17 +142,17 @@ set(SLIC3R_GUI_SOURCES GUI/UpdateDialogs.hpp GUI/FirmwareDialog.cpp GUI/FirmwareDialog.hpp - GUI/ProgressIndicator.hpp - GUI/ProgressStatusBar.hpp - GUI/ProgressStatusBar.cpp GUI/PrintHostDialogs.cpp GUI/PrintHostDialogs.hpp - GUI/Job.hpp - GUI/Job.cpp - GUI/ArrangeJob.hpp - GUI/ArrangeJob.cpp - GUI/RotoptimizeJob.hpp - GUI/RotoptimizeJob.cpp + GUI/Jobs/Job.hpp + GUI/Jobs/Job.cpp + GUI/Jobs/ArrangeJob.hpp + GUI/Jobs/ArrangeJob.cpp + GUI/Jobs/RotoptimizeJob.hpp + GUI/Jobs/RotoptimizeJob.cpp + GUI/Jobs/ProgressIndicator.hpp + GUI/ProgressStatusBar.hpp + GUI/ProgressStatusBar.cpp GUI/Mouse3DController.cpp GUI/Mouse3DController.hpp GUI/DoubleSlider.cpp diff --git a/src/slic3r/GUI/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp similarity index 98% rename from src/slic3r/GUI/ArrangeJob.cpp rename to src/slic3r/GUI/Jobs/ArrangeJob.cpp index e43631f7e..00b9fb654 100644 --- a/src/slic3r/GUI/ArrangeJob.cpp +++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp @@ -2,9 +2,9 @@ #include "libslic3r/MTUtils.hpp" -#include "Plater.hpp" -#include "GLCanvas3D.hpp" -#include "GUI.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/GUI.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ArrangeJob.hpp b/src/slic3r/GUI/Jobs/ArrangeJob.hpp similarity index 100% rename from src/slic3r/GUI/ArrangeJob.hpp rename to src/slic3r/GUI/Jobs/ArrangeJob.hpp diff --git a/src/slic3r/GUI/Job.cpp b/src/slic3r/GUI/Jobs/Job.cpp similarity index 100% rename from src/slic3r/GUI/Job.cpp rename to src/slic3r/GUI/Jobs/Job.cpp diff --git a/src/slic3r/GUI/Job.hpp b/src/slic3r/GUI/Jobs/Job.hpp similarity index 98% rename from src/slic3r/GUI/Job.hpp rename to src/slic3r/GUI/Jobs/Job.hpp index b1a652b5e..130ca2ed9 100644 --- a/src/slic3r/GUI/Job.hpp +++ b/src/slic3r/GUI/Jobs/Job.hpp @@ -5,7 +5,8 @@ #include #include -#include + +#include "ProgressIndicator.hpp" #include diff --git a/src/slic3r/GUI/ProgressIndicator.hpp b/src/slic3r/GUI/Jobs/ProgressIndicator.hpp similarity index 100% rename from src/slic3r/GUI/ProgressIndicator.hpp rename to src/slic3r/GUI/Jobs/ProgressIndicator.hpp diff --git a/src/slic3r/GUI/RotoptimizeJob.cpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp similarity index 98% rename from src/slic3r/GUI/RotoptimizeJob.cpp rename to src/slic3r/GUI/Jobs/RotoptimizeJob.cpp index 10f95201b..4cc34e71c 100644 --- a/src/slic3r/GUI/RotoptimizeJob.cpp +++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp @@ -4,7 +4,7 @@ #include "libslic3r/SLA/Rotfinder.hpp" #include "libslic3r/MinAreaBoundingBox.hpp" -#include "Plater.hpp" +#include "slic3r/GUI/Plater.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/RotoptimizeJob.hpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp similarity index 100% rename from src/slic3r/GUI/RotoptimizeJob.hpp rename to src/slic3r/GUI/Jobs/RotoptimizeJob.hpp diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 2500ee6b8..7f323c554 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -61,8 +61,8 @@ #include "Camera.hpp" #include "Mouse3DController.hpp" #include "Tab.hpp" -#include "ArrangeJob.hpp" -#include "RotoptimizeJob.hpp" +#include "Jobs/ArrangeJob.hpp" +#include "Jobs/RotoptimizeJob.hpp" #include "PresetBundle.hpp" #include "BackgroundSlicingProcess.hpp" #include "ProgressStatusBar.hpp" diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index 121689148..e71eb3db4 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -12,7 +12,7 @@ #include "Selection.hpp" #include "libslic3r/BoundingBox.hpp" -#include "Job.hpp" +#include "Jobs/Job.hpp" #include "wxExtensions.hpp" class wxButton; diff --git a/src/slic3r/GUI/ProgressStatusBar.hpp b/src/slic3r/GUI/ProgressStatusBar.hpp index faeb7a34e..15b10deeb 100644 --- a/src/slic3r/GUI/ProgressStatusBar.hpp +++ b/src/slic3r/GUI/ProgressStatusBar.hpp @@ -6,7 +6,7 @@ #include #include -#include "ProgressIndicator.hpp" +#include "Jobs/ProgressIndicator.hpp" class wxTimer; class wxGauge;