From 38dca8396fccdea1095ffc46b0874e637ff92296 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 7 Mar 2018 15:05:41 +0100 Subject: [PATCH] Updated back_to_initial_value and fixed some bugs for Extruders --- xs/src/slic3r/GUI/Field.cpp | 2 +- xs/src/slic3r/GUI/Field.hpp | 2 ++ xs/src/slic3r/GUI/GUI.cpp | 8 +++++-- xs/src/slic3r/GUI/OptionsGroup.cpp | 29 +++++++++++++++++++++++-- xs/src/slic3r/GUI/OptionsGroup.hpp | 10 +++++---- xs/src/slic3r/GUI/Tab.cpp | 34 +++++++++++++++++++++++------- xs/src/slic3r/GUI/Tab.hpp | 1 + 7 files changed, 69 insertions(+), 17 deletions(-) diff --git a/xs/src/slic3r/GUI/Field.cpp b/xs/src/slic3r/GUI/Field.cpp index 7bee68d95..890ce51ce 100644 --- a/xs/src/slic3r/GUI/Field.cpp +++ b/xs/src/slic3r/GUI/Field.cpp @@ -47,7 +47,7 @@ namespace Slic3r { namespace GUI { void Field::on_back_to_initial_value() { - if (m_back_to_initial_value != nullptr) + if (m_back_to_initial_value != nullptr && m_is_modified_value) m_back_to_initial_value(m_opt_id); } diff --git a/xs/src/slic3r/GUI/Field.hpp b/xs/src/slic3r/GUI/Field.hpp index 662636796..b711052b5 100644 --- a/xs/src/slic3r/GUI/Field.hpp +++ b/xs/src/slic3r/GUI/Field.hpp @@ -68,6 +68,8 @@ public: // This is used to avoid recursive invocation of the field change/update by wxWidgets. bool m_disable_change_event {false}; + // This is used to avoid recursive invocation of the field change/update by wxWidgets. + bool m_is_modified_value {false}; /// Copy of ConfigOption for deduction purposes const ConfigOptionDef m_opt {ConfigOptionDef()}; diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp index 92d810bab..1079aa9b0 100644 --- a/xs/src/slic3r/GUI/GUI.cpp +++ b/xs/src/slic3r/GUI/GUI.cpp @@ -421,9 +421,13 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b config.set_key_value(opt_key, new ConfigOptionString(boost::any_cast(value))); break; case coStrings:{ - if (opt_key.compare("compatible_printers") == 0){ + if (opt_key.compare("compatible_printers") == 0 || + config.def()->get(opt_key)->gui_flags.compare("serialized") == 0){ config.option(opt_key)->values.resize(0); - for (auto el : boost::any_cast>(value)) + std::vector values = boost::any_cast>(value); + if (values.size() == 1 && values[0] == "") + break; + for (auto el : values) config.option(opt_key)->values.push_back(el); } else{ diff --git a/xs/src/slic3r/GUI/OptionsGroup.cpp b/xs/src/slic3r/GUI/OptionsGroup.cpp index d19d9b548..dfa3ba3b2 100644 --- a/xs/src/slic3r/GUI/OptionsGroup.cpp +++ b/xs/src/slic3r/GUI/OptionsGroup.cpp @@ -3,6 +3,8 @@ #include #include +#include +#include #include "Utils.hpp" namespace Slic3r { namespace GUI { @@ -80,6 +82,7 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co if (!this->m_disabled) this->back_to_initial_value(opt_id); }; + if (!m_is_tab_opt) field->m_Undo_btn->Hide(); // assign function objects for callbacks, etc. return field; @@ -255,6 +258,12 @@ void ConfigOptionsGroup::on_change_OG(t_config_option_key opt_id, boost::any val // # Currently used for the post_process config value only. // my @values = split / ; / , $field_value; // $self->config->set($opt_key, \@values); + std::string str = boost::any_cast(value); + if (str.back() == ';') + str.pop_back(); + std::vector values; + boost::split(values, str, boost::is_any_of(";")); + change_opt_value(*m_config, opt_key, values); } else { if (opt_index == -1) { @@ -279,9 +288,16 @@ void ConfigOptionsGroup::back_to_initial_value(const std::string opt_key) if (m_get_initial_config == nullptr) return; DynamicPrintConfig config = m_get_initial_config(); - boost::any value = get_config_value(config, opt_key); + boost::any value; + if (opt_key == "extruders_count"){ + auto *nozzle_diameter = dynamic_cast(config.option("nozzle_diameter")); + value = int(nozzle_diameter->values.size()); + } + else + value = get_config_value(config, opt_key); + set_value(opt_key, value); - on_change_OG(opt_key, get_value(opt_key)/*value*/); + on_change_OG(opt_key, get_value(opt_key)); } void ConfigOptionsGroup::reload_config(){ @@ -354,6 +370,12 @@ boost::any ConfigOptionsGroup::get_config_value(DynamicPrintConfig& config, std: case coStrings: if (config.option(opt_key)->values.empty()) ret = text_value; + else if (opt->gui_flags.compare("serialized") == 0){ + std::vector values = config.option(opt_key)->values; + for (auto el : values) + text_value += el + ";"; + ret = text_value; + } else ret = static_cast(config.opt_string(opt_key, static_cast(idx))); break; @@ -397,6 +419,9 @@ boost::any ConfigOptionsGroup::get_config_value(DynamicPrintConfig& config, std: } Field* ConfigOptionsGroup::get_fieldc(t_config_option_key opt_key, int opt_index){ + Field* field = get_field(opt_key); + if (field != nullptr) + return field; std::string opt_id = ""; for (std::map< std::string, std::pair >::iterator it = m_opt_map.begin(); it != m_opt_map.end(); ++it) { if (opt_key == m_opt_map.at(it->first).first && opt_index == m_opt_map.at(it->first).second){ diff --git a/xs/src/slic3r/GUI/OptionsGroup.hpp b/xs/src/slic3r/GUI/OptionsGroup.hpp index bf096809f..63ba91e6c 100644 --- a/xs/src/slic3r/GUI/OptionsGroup.hpp +++ b/xs/src/slic3r/GUI/OptionsGroup.hpp @@ -113,8 +113,8 @@ public: inline void enable() { for (auto& field : m_fields) field.second->enable(); } inline void disable() { for (auto& field : m_fields) field.second->disable(); } - OptionsGroup(wxWindow* _parent, wxString title) : - m_parent(_parent), title(title) { + OptionsGroup(wxWindow* _parent, wxString title, bool is_tab_opt=false) : + m_parent(_parent), title(title), m_is_tab_opt(is_tab_opt) { sizer = (staticbox ? new wxStaticBoxSizer(new wxStaticBox(_parent, wxID_ANY, title), wxVERTICAL) : new wxBoxSizer(wxVERTICAL)); auto num_columns = 1U; if (label_width != 0) num_columns++; @@ -136,6 +136,8 @@ protected: t_optionfield_map m_fields; bool m_disabled {false}; wxGridSizer* m_grid_sizer {nullptr}; + // "true" if option is created in preset tabs + bool m_is_tab_opt{ false }; /// Generate a wxSizer or wxWindow from a configuration option /// Precondition: opt resolves to a known ConfigOption @@ -151,8 +153,8 @@ protected: class ConfigOptionsGroup: public OptionsGroup { public: - ConfigOptionsGroup(wxWindow* parent, wxString title, DynamicPrintConfig* _config = nullptr) : - OptionsGroup(parent, title), m_config(_config) {} + ConfigOptionsGroup(wxWindow* parent, wxString title, DynamicPrintConfig* _config = nullptr, bool is_tab_opt = false) : + OptionsGroup(parent, title, is_tab_opt), m_config(_config) {} /// reference to libslic3r config, non-owning pointer (?). DynamicPrintConfig* m_config {nullptr}; diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp index f61e4a78c..d9f64f120 100644 --- a/xs/src/slic3r/GUI/Tab.cpp +++ b/xs/src/slic3r/GUI/Tab.cpp @@ -144,12 +144,24 @@ void Tab::update_dirty(){ m_presets->update_dirty_ui(m_presets_choice); on_presets_changed(); auto dirty_options = m_presets->current_dirty_options(); + + bool change_extruder_data = false; + + if (name() == "printer"){ + TabPrinter* tab_printer = static_cast(this); + if (tab_printer->m_initial_extruders_count != tab_printer->m_extruders_count){ + dirty_options.emplace_back("extruders_count"); + change_extruder_data = true; + } + } // Add new dirty options to m_dirty_options for (auto opt_key : dirty_options){ Field* field = get_field(opt_key/*, opt_index*/); if (field != nullptr && find(m_dirty_options.begin(), m_dirty_options.end(), opt_key) == m_dirty_options.end()){ - field->m_Label->SetForegroundColour(*get_modified_label_clr()); + if (field->m_Label != nullptr) + field->m_Label->SetForegroundColour(*get_modified_label_clr()); field->m_Undo_btn->SetBitmap(wxBitmap(from_u8(wxMSW ? var("action_undo.png") : var("arrow_undo.png")), wxBITMAP_TYPE_PNG)); + field->m_is_modified_value = true; m_dirty_options.push_back(opt_key); } @@ -164,7 +176,9 @@ void Tab::update_dirty(){ if (field != nullptr && find(dirty_options.begin(), dirty_options.end(), opt_key) == dirty_options.end()) { field->m_Undo_btn->SetBitmap(wxBitmap(from_u8(var("Bullet_white.png")), wxBITMAP_TYPE_PNG)); - field->m_Label->SetForegroundColour(wxSYS_COLOUR_WINDOWTEXT); + if (field->m_Label != nullptr) + field->m_Label->SetForegroundColour(wxSYS_COLOUR_WINDOWTEXT); + field->m_is_modified_value = false; std::vector::iterator itr = find(m_dirty_options.begin(), m_dirty_options.end(), opt_key); if (itr != m_dirty_options.end()){ m_dirty_options.erase(itr); @@ -200,11 +214,13 @@ void Tab::load_config(DynamicPrintConfig config) int opt_index = 0; for(auto opt_key : m_config->diff(config)) { switch ( config.def()->get(opt_key)->type ){ - case coFloatOrPercent: - value = config.option(opt_key)->value; + case coFloatOrPercent:{ + const auto &conf_val = *config.option(opt_key); + value = conf_val.percent ? std::to_string(int(conf_val.value)) + "%" : std::to_string(conf_val.value); + } break; case coPercent: - value = config.option(opt_key)->value; + value = std::to_string(int(config.option(opt_key)->value)); break; case coFloat: value = config.opt_float(opt_key); @@ -610,7 +626,8 @@ void TabPrint::update() DynamicPrintConfig new_conf = *m_config; if (dialog->ShowModal() == wxID_YES) { const auto &val = *m_config->option("first_layer_height"); - new_conf.set_key_value("first_layer_height", new ConfigOptionFloatOrPercent(0.2, val.percent)); + auto percent = val.percent; + new_conf.set_key_value("first_layer_height", new ConfigOptionFloatOrPercent(0.2, percent)); if (m_config->opt_float("layer_height") < 0.15) new_conf.set_key_value("layer_height", new ConfigOptionFloat(0.15)); if (m_config->opt_float("layer_height") > 0.35) new_conf.set_key_value("layer_height", new ConfigOptionFloat(0.35)); @@ -977,7 +994,7 @@ void TabPrinter::build() auto default_config = m_preset_bundle->full_config(); auto *nozzle_diameter = dynamic_cast(m_config->option("nozzle_diameter")); - m_extruders_count = nozzle_diameter->values.size(); + m_initial_extruders_count = m_extruders_count = nozzle_diameter->values.size(); auto page = add_options_page(_(L("General")), "printer_empty.png"); auto optgroup = page->new_optgroup(_(L("Size and coordinates"))); @@ -1222,6 +1239,7 @@ void TabPrinter::extruders_count_changed(size_t extruders_count){ m_preset_bundle->printers.get_edited_preset().set_num_extruders(extruders_count); m_preset_bundle->update_multi_material_filament_presets(); build_extruder_pages(); + reload_config(); on_value_change("extruders_count", extruders_count); } @@ -1771,7 +1789,7 @@ bool Page::set_value(t_config_option_key opt_key, boost::any value){ ConfigOptionsGroupShp Page::new_optgroup(wxString title, int noncommon_label_width /*= -1*/) { //! config_ have to be "right" - ConfigOptionsGroupShp optgroup = std::make_shared(this, title, m_config); + ConfigOptionsGroupShp optgroup = std::make_shared(this, title, m_config, true); if (noncommon_label_width >= 0) optgroup->label_width = noncommon_label_width; diff --git a/xs/src/slic3r/GUI/Tab.hpp b/xs/src/slic3r/GUI/Tab.hpp index 345559c7e..f1a9e58ee 100644 --- a/xs/src/slic3r/GUI/Tab.hpp +++ b/xs/src/slic3r/GUI/Tab.hpp @@ -222,6 +222,7 @@ public: wxButton* m_octoprint_host_test_btn; size_t m_extruders_count; + size_t m_initial_extruders_count; std::vector m_extruder_pages; TabPrinter() {}