Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2020-03-06 17:10:58 +0300
committerbubnikv <bubnikv@gmail.com>2020-03-06 17:10:58 +0300
commitb3b800de656db89d0b50ca574b15eea0796383f7 (patch)
treefa565ba37d036a30ccfedea6cef713be47bc17f8 /src/slic3r/GUI/GUI_App.hpp
parent85bf78f7e779d838404bef0854bc7c29fd20dbbb (diff)
Refactoring of RemovableDriveManager:
1) On Windows and Linux, the device enumeration now runs at a background thread, while it ran on the UI thread on idle, which may have been blocking on some rare Windows setups, see GH #3515 #3733 #3746 #3766 2) On OSX, the device enumeration now relies on OS callback, no polling is required. 3) Refactored for cleaner interface.
Diffstat (limited to 'src/slic3r/GUI/GUI_App.hpp')
-rw-r--r--src/slic3r/GUI/GUI_App.hpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index 10b09b1da..d02a60ba9 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -29,9 +29,9 @@ class PresetUpdater;
class ModelObject;
class PrintHostJobQueue;
-namespace GUI
-{
+namespace GUI{
+class RemovableDriveManager;
enum FileType
{
FT_STL,
@@ -96,6 +96,8 @@ class GUI_App : public wxApp
// Best translation language, provided by Windows or OSX, owned by wxWidgets.
const wxLanguageInfo *m_language_info_best = nullptr;
+ std::unique_ptr<RemovableDriveManager> m_removable_drive_manager;
+
std::unique_ptr<ImGuiWrapper> m_imgui;
std::unique_ptr<PrintHostJobQueue> m_printhost_job_queue;
ConfigWizard* m_wizard; // Managed by wxWindow tree
@@ -180,6 +182,8 @@ public:
std::vector<Tab *> tabs_list;
+ RemovableDriveManager* removable_drive_manager() { return m_removable_drive_manager.get(); }
+
ImGuiWrapper* imgui() { return m_imgui.get(); }
PrintHostJobQueue& printhost_job_queue() { return *m_printhost_job_queue.get(); }