diff options
author | bubnikv <bubnikv@gmail.com> | 2020-03-04 13:36:36 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2020-03-04 13:36:36 +0300 |
commit | 0b96855c2ee2ed0aa2a57890be70679ee7882a00 (patch) | |
tree | 365dd694af8217e79c6a9ec451a88c2b0f3a9fb6 /src/slic3r/GUI/Plater.cpp | |
parent | a87ba5d6a6912a06999d0b1f4e19280969b30ddf (diff) |
Reworked the 3DConnexion interfacing code to run the device
enumeration / connect / disconnect and read out at the background
thread only.
Diffstat (limited to 'src/slic3r/GUI/Plater.cpp')
-rw-r--r-- | src/slic3r/GUI/Plater.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index a57225954..4e8eea69b 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2145,6 +2145,10 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) // updates camera type from .ini file camera.set_type(get_config("use_perspective_camera")); + // Load the 3DConnexion device database. + mouse3d_controller.load_config(*wxGetApp().app_config); + // Start the background thread to detect and connect to a HID device (Windows and Linux). + // Connect to a 3DConnextion driver (OSX). mouse3d_controller.init(); // Initialize the Undo / Redo stack with a first snapshot. @@ -2156,8 +2160,6 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) Plater::priv::~priv() { - mouse3d_controller.shutdown(); - if (config != nullptr) delete config; } |