GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 19:15:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor preset setting update to its own method and call during load()

Browse Source
This commit is contained in:
Joseph Lenox 2018-11-18 12:02:16 -06:00 committed by Joseph Lenox
parent 88b4c54fc4
commit 3812f13cb5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GUI/Plater/PresetChooser.cpp
View File

@ -109,6 +109,7 @@ void PresetChooser::load(std::array<Presets, preset_types> presets) {
++i; ++i;
} }
this->_update_preset_settings(group);
} }
} }
@ -132,12 +133,16 @@ bool PresetChooser::select_preset_by_name(wxString name, wxBitmapComboBox* choos
return false; return false;
} }
void PresetChooser::_on_select_preset(preset_t preset) { void PresetChooser::_update_preset_settings(preset_t preset) {
// update settings store
auto& settings_presets {_settings.default_presets.at(get_preset(preset))}; auto& settings_presets {_settings.default_presets.at(get_preset(preset))};
settings_presets.clear(); // make sure previous contents are deconstructed settings_presets.clear(); // make sure previous contents are deconstructed
settings_presets = this->_get_selected_presets(preset); settings_presets = this->_get_selected_presets(preset);
}
void PresetChooser::_on_select_preset(preset_t preset) {
// update settings store
this->_update_preset_settings(preset);
// save settings // save settings
_settings.save_settings(); _settings.save_settings();
if (preset == preset_t::Printer) { if (preset == preset_t::Printer) {
@ -165,7 +170,6 @@ wxString PresetChooser::_get_selected_preset(preset_t group, size_t index) const
if (index > selected.size()) { return wxString(""); } if (index > selected.size()) { return wxString(""); }
return selected.at(index); return selected.at(index);
} }
void PresetChooser::_on_change_combobox(preset_t preset, wxBitmapComboBox* choice) { void PresetChooser::_on_change_combobox(preset_t preset, wxBitmapComboBox* choice) {
// Prompt for unsaved changes and undo selections if cancelled and return early // Prompt for unsaved changes and undo selections if cancelled and return early

3
src/GUI/Plater/PresetChooser.hpp
View File

@ -65,6 +65,7 @@ public:
bool prompt_unsaved_changes(); bool prompt_unsaved_changes();
private: private:
wxFlexGridSizer* _local_sizer {}; wxFlexGridSizer* _local_sizer {};
wxWindow* _parent {};
void _on_change_combobox(preset_t preset, wxBitmapComboBox* choice); void _on_change_combobox(preset_t preset, wxBitmapComboBox* choice);
chooser_name_map __chooser_names; chooser_name_map __chooser_names;
@ -85,6 +86,8 @@ private:
/// Fetch the preset name corresponding to the chooser index /// Fetch the preset name corresponding to the chooser index
wxString _get_selected_preset(preset_t group, size_t index) const; wxString _get_selected_preset(preset_t group, size_t index) const;
/// Update Settings presets with the state of this system
void _update_preset_settings(preset_t preset);
}; };
}} // Slic3r::GUI }} // Slic3r::GUI