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/AppConfig.hpp | |
| 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/AppConfig.hpp')
| -rw-r--r-- | src/slic3r/GUI/AppConfig.hpp | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/src/slic3r/GUI/AppConfig.hpp b/src/slic3r/GUI/AppConfig.hpp index c49260173..58e04433b 100644 --- a/src/slic3r/GUI/AppConfig.hpp +++ b/src/slic3r/GUI/AppConfig.hpp @@ -134,16 +134,36 @@ public: void set_recent_projects(const std::vector<std::string>& recent_projects); void set_mouse_device(const std::string& name, double translation_speed, double translation_deadzone, float rotation_speed, float rotation_deadzone, double zoom_speed); - bool get_mouse_device_translation_speed(const std::string& name, double& speed); - bool get_mouse_device_translation_deadzone(const std::string& name, double& deadzone); - bool get_mouse_device_rotation_speed(const std::string& name, float& speed); - bool get_mouse_device_rotation_deadzone(const std::string& name, float& deadzone); - bool get_mouse_device_zoom_speed(const std::string& name, double& speed); + std::vector<std::string> get_mouse_device_names() const; + bool get_mouse_device_translation_speed(const std::string& name, double& speed) const + { return get_3dmouse_device_numeric_value(name, "translation_speed", speed); } + bool get_mouse_device_translation_deadzone(const std::string& name, double& deadzone) const + { return get_3dmouse_device_numeric_value(name, "translation_deadzone", deadzone); } + bool get_mouse_device_rotation_speed(const std::string& name, float& speed) const + { return get_3dmouse_device_numeric_value(name, "rotation_speed", speed); } + bool get_mouse_device_rotation_deadzone(const std::string& name, float& deadzone) const + { return get_3dmouse_device_numeric_value(name, "rotation_deadzone", deadzone); } + bool get_mouse_device_zoom_speed(const std::string& name, double& speed) const + { return get_3dmouse_device_numeric_value(name, "zoom_speed", speed); } static const std::string SECTION_FILAMENTS; static const std::string SECTION_MATERIALS; private: + template<typename T> + bool get_3dmouse_device_numeric_value(const std::string &device_name, const char *parameter_name, T &out) const + { + std::string key = std::string("mouse_device:") + device_name; + auto it = m_storage.find(key); + if (it == m_storage.end()) + return false; + auto it_val = it->second.find(parameter_name); + if (it_val == it->second.end()) + return false; + out = T(::atof(it_val->second.c_str())); + return true; + } + // Map of section, name -> value std::map<std::string, std::map<std::string, std::string>> m_storage; // Map of enabled vendors / models / variants |