diff options
author | YuSanka <yusanka@gmail.com> | 2019-08-22 14:19:01 +0300 |
---|---|---|
committer | YuSanka <yusanka@gmail.com> | 2019-08-22 14:19:01 +0300 |
commit | 8828ec78608e9a9efae05cea2a980750f2346888 (patch) | |
tree | 42c343d0d986a98152cee2c4c3ec94d7f2d36029 /src/slic3r/GUI/GUI_ObjectSettings.cpp | |
parent | 7ff68ad210386a8d77fe247c201f098127aae933 (diff) |
Code refactoring: ConfigManipulation moved to separate files.
Use of ConfigManipulation inside of TabPrint(TabSLAPrint)::update().
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectSettings.cpp')
-rw-r--r-- | src/slic3r/GUI/GUI_ObjectSettings.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp index 0279904b4..1b884cc24 100644 --- a/src/slic3r/GUI/GUI_ObjectSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp @@ -9,7 +9,7 @@ #include <boost/algorithm/string.hpp> #include "I18N.hpp" -#include "Tab.hpp" +#include "ConfigManipulation.hpp" #include <wx/wupdlock.h> @@ -184,17 +184,18 @@ void ObjectSettings::update_config_values(DynamicPrintConfig* config) { // load checked values from main_config to config config->apply_only(main_config, config->keys(), true); - + // Initialize UI components with the config values. for (auto og : m_og_settings) - og->reload_config(); // load new config values to accorded fields - update_config_values(config); // next config che + og->reload_config(); + // next config check + update_config_values(config); }; - auto get_field = [this](const t_config_option_key & opt_key) + auto get_field = [this](const t_config_option_key & opt_key, int opt_index) { Field* field = nullptr; for (auto og : m_og_settings) { - field = og->get_fieldc(opt_key, -1); + field = og->get_fieldc(opt_key, opt_index); if (field != nullptr) return field; } |