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

Added overriding and overridable options.

Browse Source
This commit is contained in:
Joseph Lenox 2018-06-13 21:32:22 -05:00 committed by Joseph Lenox
parent f13fbf3cee
commit ac62b78943
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/GUI/Dialogs/PresetEditor.hpp
View File

@ -30,6 +30,12 @@ public:
virtual t_config_option_keys my_options() = 0; virtual t_config_option_keys my_options() = 0;
static t_config_option_keys options() { return t_config_option_keys {}; } static t_config_option_keys options() { return t_config_option_keys {}; }
static t_config_option_keys overridable_options() { return t_config_option_keys {}; };
static t_config_option_keys overriding_options() { return t_config_option_keys {}; };
virtual t_config_option_keys my_overridable_options() = 0;
virtual t_config_option_keys my_overriding_options() = 0;
wxSizer* sizer() { return _sizer; }; wxSizer* sizer() { return _sizer; };
PresetEditor(wxWindow* parent, t_config_option_keys options = {}); PresetEditor(wxWindow* parent, t_config_option_keys options = {});
PresetEditor() : PresetEditor(nullptr, {}) {}; PresetEditor() : PresetEditor(nullptr, {}) {};
@ -83,6 +89,13 @@ public:
wxString title() override { return _("Print Settings"); } wxString title() override { return _("Print Settings"); }
std::string name() override { return "print"s; } std::string name() override { return "print"s; }
t_config_option_keys my_overridable_options() override { return PresetEditor::overridable_options(); };
static t_config_option_keys overridable_options() { return PresetEditor::overridable_options(); };
t_config_option_keys my_overriding_options() override { return PresetEditor::overriding_options(); };
static t_config_option_keys overriding_options() { return PresetEditor::overriding_options(); };
/// Static method to retrieve list of options that this preset governs. /// Static method to retrieve list of options that this preset governs.
static t_config_option_keys options() { static t_config_option_keys options() {
return t_config_option_keys return t_config_option_keys
@ -149,6 +162,11 @@ public:
"retract_length"s, "retract_lift"s, "retract_speed"s, "retract_restart_extra"s, "retract_length"s, "retract_lift"s, "retract_speed"s, "retract_restart_extra"s,
"retract_before_travel"s, "retract_layer_change"s, "wipe"s "retract_before_travel"s, "retract_layer_change"s, "wipe"s
}; }; }; };
static t_config_option_keys overriding_options() { return PresetEditor::overriding_options(); };
t_config_option_keys my_overridable_options() override { return PrinterEditor::overridable_options(); };
t_config_option_keys my_overriding_options() override { return PrinterEditor::overriding_options(); };
static t_config_option_keys options() { static t_config_option_keys options() {
return t_config_option_keys return t_config_option_keys
@ -186,6 +204,12 @@ public:
MaterialEditor(wxWindow* parent, t_config_option_keys options = {}); MaterialEditor(wxWindow* parent, t_config_option_keys options = {});
MaterialEditor() : MaterialEditor(nullptr, {}) {}; MaterialEditor() : MaterialEditor(nullptr, {}) {};
t_config_option_keys my_overridable_options() override { return PresetEditor::overridable_options(); };
t_config_option_keys my_overriding_options() override { return PrinterEditor::overridable_options(); };
static t_config_option_keys overriding_options() { return PrinterEditor::overridable_options(); };
static t_config_option_keys overridable_options() { return PresetEditor::overridable_options(); };
static t_config_option_keys options() { static t_config_option_keys options() {
return t_config_option_keys return t_config_option_keys
{ {