amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Added "update" for TabFilament.

Browse source 
Added "reload_compatible_printers_widget" and extended "load_key_value" for Tab.
Extended "change_opt_value" in GIU
This commit is contained in:
YuSanka 2018-01-12 12:41:13 +01:00
parent 3567981089
commit d3b4dbf8bc
3 changed files with 179 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xs/src/slic3r/GUI/GUI.cpp
View file

@ -190,6 +190,11 @@ void create_preset_tabs(PresetBundle *preset_bundle, AppConfig *app_config)
add_created_tab(new TabPrint (g_wxTabPanel, "Print"), preset_bundle, app_config); add_created_tab(new TabPrint (g_wxTabPanel, "Print"), preset_bundle, app_config);
add_created_tab(new TabFilament(g_wxTabPanel, "Filament"), preset_bundle, app_config); add_created_tab(new TabFilament(g_wxTabPanel, "Filament"), preset_bundle, app_config);
add_created_tab(new TabPrinter (g_wxTabPanel, "Printer"), preset_bundle, app_config); add_created_tab(new TabPrinter (g_wxTabPanel, "Printer"), preset_bundle, app_config);
g_wxTabPanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, ([](wxCommandEvent e){
Tab* panel = (Tab*)g_wxTabPanel->GetCurrentPage();
if (panel->GetName().compare("Filament")==0)
panel->OnActivate();
}), g_wxTabPanel->GetId() );
} }
void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, boost::any value) void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, boost::any value)
@ -217,7 +222,17 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b
case coString: case coString:
config.set_key_value(opt_key, new ConfigOptionString(boost::any_cast<std::string>(value))); config.set_key_value(opt_key, new ConfigOptionString(boost::any_cast<std::string>(value)));
break; break;
case coStrings: case coStrings:{
if (opt_key.compare("compatible_printers") == 0){
config.option<ConfigOptionStrings>(opt_key)->values.resize(0);
for (auto el : boost::any_cast<std::vector<std::string>>(value))
config.option<ConfigOptionStrings>(opt_key)->values.push_back(el);
}
else{
ConfigOptionStrings* vec_new = new ConfigOptionStrings{ boost::any_cast<std::string>(value) };
config.option<ConfigOptionStrings>(opt_key)->set_at(vec_new, 0, 0);
}
}
break; break;
case coBool: case coBool:
config.set_key_value(opt_key, new ConfigOptionBool(boost::any_cast<bool>(value))); config.set_key_value(opt_key, new ConfigOptionBool(boost::any_cast<bool>(value)));
@ -229,7 +244,10 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b
case coInt: case coInt:
config.set_key_value(opt_key, new ConfigOptionInt(boost::any_cast<int>(value))); config.set_key_value(opt_key, new ConfigOptionInt(boost::any_cast<int>(value)));
break; break;
case coInts: case coInts:{
ConfigOptionInts* vec_new = new ConfigOptionInts{ boost::any_cast<int>(value) };
config.option<ConfigOptionInts>(opt_key)->set_at(vec_new, 0, 0);
}
break; break;
case coEnum:{ case coEnum:{
if (opt_key.compare("external_fill_pattern") == 0 || if (opt_key.compare("external_fill_pattern") == 0 ||
@ -255,11 +273,6 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b
{ {
int i = 0;//no reason, just experiment int i = 0;//no reason, just experiment
} }
catch (...)
{
//std::string
}
} }
void add_created_tab(Tab* panel, PresetBundle *preset_bundle, AppConfig *app_config) void add_created_tab(Tab* panel, PresetBundle *preset_bundle, AppConfig *app_config)

244
xs/src/slic3r/GUI/Tab.cpp
View file

@ -13,6 +13,7 @@
#include "Tab.h" #include "Tab.h"
#include "PresetBundle.hpp" #include "PresetBundle.hpp"
#include "PresetHints.hpp"
#include "../../libslic3r/Utils.hpp" #include "../../libslic3r/Utils.hpp"
namespace Slic3r { namespace Slic3r {
@ -129,7 +130,7 @@ PageShp Tab::add_options_page(wxString title, std::string icon, bool is_extruder
if (!is_extruder_pages) if (!is_extruder_pages)
m_pages.push_back(page); m_pages.push_back(page);
page->set_config(&m_config); page->set_config(m_config);
return page; return page;
} }
@ -145,45 +146,45 @@ void Tab::update_dirty(){
void Tab::load_config(DynamicPrintConfig config) void Tab::load_config(DynamicPrintConfig config)
{ {
bool modified = 0; bool modified = 0;
for(auto opt_key : m_config.diff(config)) { for(auto opt_key : m_config->diff(config)) {
switch ( config.def()->get(opt_key)->type ){ switch ( config.def()->get(opt_key)->type ){
case coFloatOrPercent: case coFloatOrPercent:
change_opt_value(m_config, opt_key, config.option<ConfigOptionFloatOrPercent>(opt_key)->value); change_opt_value(*m_config, opt_key, config.option<ConfigOptionFloatOrPercent>(opt_key)->value);
break; break;
case coPercent: case coPercent:
change_opt_value(m_config, opt_key, config.option<ConfigOptionPercent>(opt_key)->value); change_opt_value(*m_config, opt_key, config.option<ConfigOptionPercent>(opt_key)->value);
break; break;
case coFloat: case coFloat:
change_opt_value(m_config, opt_key, config.opt_float(opt_key)); change_opt_value(*m_config, opt_key, config.opt_float(opt_key));
break; break;
// case coPercents: // case coPercents:
// case coFloats: // case coFloats:
case coString: case coString:
change_opt_value(m_config, opt_key, config.opt_string(opt_key)); change_opt_value(*m_config, opt_key, config.opt_string(opt_key));
break; break;
case coStrings: case coStrings:
break; break;
case coBool: case coBool:
change_opt_value(m_config, opt_key, config.opt_bool(opt_key)); change_opt_value(*m_config, opt_key, config.opt_bool(opt_key));
break; break;
case coBools: case coBools:
// opt = new ConfigOptionBools(0, config.opt_bool(opt_key)); //! 0? // opt = new ConfigOptionBools(0, config.opt_bool(opt_key)); //! 0?
break; break;
case coInt: case coInt:
change_opt_value(m_config, opt_key, config.opt_int(opt_key)); change_opt_value(*m_config, opt_key, config.opt_int(opt_key));
break; break;
case coInts: case coInts:
break; break;
case coEnum:{ case coEnum:{
if (opt_key.compare("external_fill_pattern") == 0 || if (opt_key.compare("external_fill_pattern") == 0 ||
opt_key.compare("fill_pattern") == 0) opt_key.compare("fill_pattern") == 0)
change_opt_value(m_config, opt_key, config.option<ConfigOptionEnum<InfillPattern>>(opt_key)->value); change_opt_value(*m_config, opt_key, config.option<ConfigOptionEnum<InfillPattern>>(opt_key)->value);
else if (opt_key.compare("gcode_flavor") == 0) else if (opt_key.compare("gcode_flavor") == 0)
change_opt_value(m_config, opt_key, config.option<ConfigOptionEnum<GCodeFlavor>>(opt_key)->value); change_opt_value(*m_config, opt_key, config.option<ConfigOptionEnum<GCodeFlavor>>(opt_key)->value);
else if (opt_key.compare("support_material_pattern") == 0) else if (opt_key.compare("support_material_pattern") == 0)
change_opt_value(m_config, opt_key, config.option<ConfigOptionEnum<SupportMaterialPattern>>(opt_key)->value); change_opt_value(*m_config, opt_key, config.option<ConfigOptionEnum<SupportMaterialPattern>>(opt_key)->value);
else if (opt_key.compare("seam_position") == 0) else if (opt_key.compare("seam_position") == 0)
change_opt_value(m_config, opt_key, config.option<ConfigOptionEnum<SeamPosition>>(opt_key)->value); change_opt_value(*m_config, opt_key, config.option<ConfigOptionEnum<SeamPosition>>(opt_key)->value);
} }
break; break;
case coPoints: case coPoints:
@ -222,27 +223,33 @@ Field* Tab::get_field(t_config_option_key opt_key, int opt_index/* = -1*/) const
return field; return field;
} }
void Tab::load_key_value(std::string opt_key, std::vector<std::string> value) // To be called by custom widgets, load a value into a config,
// update the preset selection boxes (the dirty flags)
void Tab::load_key_value(std::string opt_key, boost::any value)
{ {
// # To be called by custom widgets, load a value into a config, change_opt_value(*m_config, opt_key, value);
// # update the preset selection boxes (the dirty flags) // Mark the print & filament enabled if they are compatible with the currently selected preset.
// $self->{config}->set($opt_key, $value);
// # Mark the print & filament enabled if they are compatible with the currently selected preset.
if (opt_key.compare("compatible_printers") == 0) { if (opt_key.compare("compatible_printers") == 0) {
// wxTheApp->{preset_bundle}->update_compatible_with_printer(0); m_preset_bundle->update_compatible_with_printer(0);
// $self->{presets}->update_tab_ui($self->{presets_choice}, $self->{show_incompatible_presets}); }
// } else { m_presets->update_dirty_ui(m_presets_choice);
// $self->{presets}->update_dirty_ui($self->{presets_choice}); on_presets_changed();
} update();
// $self->_on_presets_changed; }
// $self->_update;
void Tab::reload_compatible_printers_widget()
{
bool has_any = !m_config->option<ConfigOptionStrings>("compatible_printers")->values.empty();
has_any ? m_compatible_printers_btn->Enable() : m_compatible_printers_btn->Disable();
m_compatible_printers_checkbox->SetValue(!has_any);
get_field("compatible_printers_condition")->toggle(!has_any);
} }
void TabPrint::build() void TabPrint::build()
{ {
m_presets = &m_preset_bundle->prints; m_presets = &m_preset_bundle->prints;
m_config = m_presets->get_edited_preset().config; m_config = &m_presets->get_edited_preset().config;
m_config_def = m_config.def(); m_config_def = m_config->def();
auto page = add_options_page("Layers and perimeters", "layers.png"); auto page = add_options_page("Layers and perimeters", "layers.png");
auto optgroup = page->new_optgroup("Layer height"); auto optgroup = page->new_optgroup("Layer height");
@ -435,6 +442,9 @@ void TabPrint::build()
optgroup = page->new_optgroup("Profile dependencies"); optgroup = page->new_optgroup("Profile dependencies");
line = Line{ "Compatible printers", "" }; line = Line{ "Compatible printers", "" };
line.widget = [this](wxWindow* parent){ line.widget = [this](wxWindow* parent){
m_compatible_printers_checkbox = new wxCheckBox(parent, wxID_ANY, "All");
m_compatible_printers_btn = new wxButton(parent, wxID_ANY, "Set…", wxDefaultPosition,
wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
return compatible_printers_widget(parent, m_compatible_printers_checkbox, m_compatible_printers_btn); return compatible_printers_widget(parent, m_compatible_printers_checkbox, m_compatible_printers_btn);
}; };
optgroup->append_line(line); optgroup->append_line(line);
@ -444,13 +454,19 @@ void TabPrint::build()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
} }
// Reload current config (aka presets->edited_preset->config) into the UI fields.
void TabPrint::reload_config(){
reload_compatible_printers_widget();
Tab::reload_config();
}
void TabPrint::update() void TabPrint::update()
{ {
Freeze(); Freeze();
if ( m_config.opt_bool("spiral_vase") && if ( m_config->opt_bool("spiral_vase") &&
!(m_config.opt_int("perimeters") == 1 && m_config.opt_int("top_solid_layers") == 0 && /*m_config.opt_float("fill_density") == 0*/ !(m_config->opt_int("perimeters") == 1 && m_config->opt_int("top_solid_layers") == 0 && /*m_config->opt_float("fill_density") == 0*/
m_config.option<ConfigOptionPercent>("fill_density")->value == 0)) { m_config->option<ConfigOptionPercent>("fill_density")->value == 0)) {
std::string msg_text = "The Spiral Vase mode requires:\n" std::string msg_text = "The Spiral Vase mode requires:\n"
"- one perimeter\n" "- one perimeter\n"
"- no top solid layers\n" "- no top solid layers\n"
@ -459,7 +475,7 @@ void TabPrint::update()
"- no ensure_vertical_shell_thickness\n" "- no ensure_vertical_shell_thickness\n"
"\nShall I adjust those settings in order to enable Spiral Vase?"; "\nShall I adjust those settings in order to enable Spiral Vase?";
auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Spiral Vase"), wxICON_WARNING | wxYES | wxNO); auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Spiral Vase"), wxICON_WARNING | wxYES | wxNO);
DynamicPrintConfig new_conf = m_config;//new DynamicPrintConfig; DynamicPrintConfig new_conf = *m_config;//new DynamicPrintConfig;
if (dialog->ShowModal() == wxID_YES) { if (dialog->ShowModal() == wxID_YES) {
new_conf.set_key_value("perimeters", new ConfigOptionInt(1)); new_conf.set_key_value("perimeters", new ConfigOptionInt(1));
new_conf.set_key_value("top_solid_layers", new ConfigOptionInt(0)); new_conf.set_key_value("top_solid_layers", new ConfigOptionInt(0));
@ -473,36 +489,36 @@ void TabPrint::update()
load_config(new_conf); load_config(new_conf);
} }
if (m_config.opt_bool("wipe_tower") && if (m_config->opt_bool("wipe_tower") &&
(m_config.option<ConfigOptionFloatOrPercent>("first_layer_height")->value != 0.2 /*$config->first_layer_height != 0.2*/ || (m_config->option<ConfigOptionFloatOrPercent>("first_layer_height")->value != 0.2 /*$config->first_layer_height != 0.2*/ ||
m_config.opt_float("layer_height") < 0.15 || m_config.opt_float("layer_height") > 0.35)) { m_config->opt_float("layer_height") < 0.15 || m_config->opt_float("layer_height") > 0.35)) {
std::string msg_text = "The Wipe Tower currently supports only:\n" std::string msg_text = "The Wipe Tower currently supports only:\n"
"- first layer height 0.2mm\n" "- first layer height 0.2mm\n"
"- layer height from 0.15mm to 0.35mm\n" "- layer height from 0.15mm to 0.35mm\n"
"\nShall I adjust those settings in order to enable the Wipe Tower?"; "\nShall I adjust those settings in order to enable the Wipe Tower?";
auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO); auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO);
DynamicPrintConfig new_conf = m_config; DynamicPrintConfig new_conf = *m_config;
if (dialog->ShowModal() == wxID_YES) { if (dialog->ShowModal() == wxID_YES) {
const auto &val = *m_config.option<ConfigOptionFloatOrPercent>("first_layer_height"); const auto &val = *m_config->option<ConfigOptionFloatOrPercent>("first_layer_height");
new_conf.set_key_value("first_layer_height", new ConfigOptionFloatOrPercent(0.2, val.percent)); new_conf.set_key_value("first_layer_height", new ConfigOptionFloatOrPercent(0.2, val.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.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)); if (m_config->opt_float("layer_height") > 0.35) new_conf.set_key_value("layer_height", new ConfigOptionFloat(0.35));
} }
else else
new_conf.set_key_value("wipe_tower", new ConfigOptionBool(false)); new_conf.set_key_value("wipe_tower", new ConfigOptionBool(false));
load_config(new_conf); load_config(new_conf);
} }
if (m_config.opt_bool("wipe_tower") && m_config.opt_bool("support_material") && if (m_config->opt_bool("wipe_tower") && m_config->opt_bool("support_material") &&
m_config.opt_float("support_material_contact_distance") > 0. && m_config->opt_float("support_material_contact_distance") > 0. &&
(m_config.opt_int("support_material_extruder") != 0 || m_config.opt_int("support_material_interface_extruder") != 0)) { (m_config->opt_int("support_material_extruder") != 0 || m_config->opt_int("support_material_interface_extruder") != 0)) {
std::string msg_text = "The Wipe Tower currently supports the non-soluble supports only\n" std::string msg_text = "The Wipe Tower currently supports the non-soluble supports only\n"
"if they are printed with the current extruder without triggering a tool change.\n" "if they are printed with the current extruder without triggering a tool change.\n"
"(both support_material_extruder and support_material_interface_extruder need to be set to 0).\n" "(both support_material_extruder and support_material_interface_extruder need to be set to 0).\n"
"\nShall I adjust those settings in order to enable the Wipe Tower?"; "\nShall I adjust those settings in order to enable the Wipe Tower?";
auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO); auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO);
DynamicPrintConfig new_conf = m_config; DynamicPrintConfig new_conf = *m_config;
if (dialog->ShowModal() == wxID_YES) { if (dialog->ShowModal() == wxID_YES) {
new_conf.set_key_value("support_material_extruder", new ConfigOptionInt(0)); new_conf.set_key_value("support_material_extruder", new ConfigOptionInt(0));
new_conf.set_key_value("support_material_interface_extruder", new ConfigOptionInt(0)); new_conf.set_key_value("support_material_interface_extruder", new ConfigOptionInt(0));
@ -512,14 +528,14 @@ void TabPrint::update()
load_config(new_conf); load_config(new_conf);
} }
if (m_config.opt_bool("wipe_tower") && m_config.opt_bool("support_material") && if (m_config->opt_bool("wipe_tower") && m_config->opt_bool("support_material") &&
m_config.opt_float("support_material_contact_distance") == 0 && m_config->opt_float("support_material_contact_distance") == 0 &&
!m_config.opt_bool("support_material_synchronize_layers")) { !m_config->opt_bool("support_material_synchronize_layers")) {
std::string msg_text = "For the Wipe Tower to work with the soluble supports, the support layers\n" std::string msg_text = "For the Wipe Tower to work with the soluble supports, the support layers\n"
"need to be synchronized with the object layers.\n" "need to be synchronized with the object layers.\n"
"\nShall I synchronize support layers in order to enable the Wipe Tower?"; "\nShall I synchronize support layers in order to enable the Wipe Tower?";
auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO); auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO);
DynamicPrintConfig new_conf = m_config; DynamicPrintConfig new_conf = *m_config;
if (dialog->ShowModal() == wxID_YES) { if (dialog->ShowModal() == wxID_YES) {
new_conf.set_key_value("support_material_synchronize_layers", new ConfigOptionBool(true)); new_conf.set_key_value("support_material_synchronize_layers", new ConfigOptionBool(true));
} }
@ -528,16 +544,16 @@ void TabPrint::update()
load_config(new_conf); load_config(new_conf);
} }
if (m_config.opt_bool("support_material")) { if (m_config->opt_bool("support_material")) {
// Ask only once. // Ask only once.
if (!m_support_material_overhangs_queried) { if (!m_support_material_overhangs_queried) {
m_support_material_overhangs_queried = true; m_support_material_overhangs_queried = true;
if (!m_config.opt_bool("overhangs")/* != 1*/) { if (!m_config->opt_bool("overhangs")/* != 1*/) {
std::string msg_text = "Supports work better, if the following feature is enabled:\n" std::string msg_text = "Supports work better, if the following feature is enabled:\n"
"- Detect bridging perimeters\n" "- Detect bridging perimeters\n"
"\nShall I adjust those settings for supports?"; "\nShall I adjust those settings for supports?";
auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Support Generator"), wxICON_WARNING | wxYES | wxNO | wxCANCEL); auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Support Generator"), wxICON_WARNING | wxYES | wxNO | wxCANCEL);
DynamicPrintConfig new_conf = m_config; DynamicPrintConfig new_conf = *m_config;
auto answer = dialog->ShowModal(); auto answer = dialog->ShowModal();
if (answer == wxID_YES) { if (answer == wxID_YES) {
// Enable "detect bridging perimeters". // Enable "detect bridging perimeters".
@ -557,10 +573,10 @@ void TabPrint::update()
m_support_material_overhangs_queried = false; m_support_material_overhangs_queried = false;
} }
if (m_config.option<ConfigOptionPercent>("fill_density")->value == 100) { if (m_config->option<ConfigOptionPercent>("fill_density")->value == 100) {
auto fill_pattern = m_config.option<ConfigOptionEnum<InfillPattern>>("fill_pattern")->value; auto fill_pattern = m_config->option<ConfigOptionEnum<InfillPattern>>("fill_pattern")->value;
std::string str_fill_pattern = ""; std::string str_fill_pattern = "";
t_config_enum_values map_names = m_config.option<ConfigOptionEnum<InfillPattern>>("fill_pattern")->get_enum_values(); t_config_enum_values map_names = m_config->option<ConfigOptionEnum<InfillPattern>>("fill_pattern")->get_enum_values();
for (auto it:map_names) { for (auto it:map_names) {
if (fill_pattern == it.second) { if (fill_pattern == it.second) {
str_fill_pattern = it.first; str_fill_pattern = it.first;
@ -568,7 +584,7 @@ void TabPrint::update()
} }
} }
if (!str_fill_pattern.empty()){ if (!str_fill_pattern.empty()){
auto external_fill_pattern = m_config.def()->get("external_fill_pattern")->enum_values; auto external_fill_pattern = m_config->def()->get("external_fill_pattern")->enum_values;
bool correct_100p_fill = false; bool correct_100p_fill = false;
for (auto fill : external_fill_pattern) for (auto fill : external_fill_pattern)
{ {
@ -576,12 +592,12 @@ void TabPrint::update()
correct_100p_fill = true; correct_100p_fill = true;
} }
// get fill_pattern name from enum_labels for using this one at dialog_msg // get fill_pattern name from enum_labels for using this one at dialog_msg
str_fill_pattern = m_config.def()->get("fill_pattern")->enum_labels[fill_pattern]; str_fill_pattern = m_config->def()->get("fill_pattern")->enum_labels[fill_pattern];
if (!correct_100p_fill){ if (!correct_100p_fill){
std::string msg_text = "The " + str_fill_pattern + " infill pattern is not supposed to work at 100% density.\n" std::string msg_text = "The " + str_fill_pattern + " infill pattern is not supposed to work at 100% density.\n"
"\nShall I switch to rectilinear fill pattern?"; "\nShall I switch to rectilinear fill pattern?";
auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Infill"), wxICON_WARNING | wxYES | wxNO); auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Infill"), wxICON_WARNING | wxYES | wxNO);
DynamicPrintConfig new_conf = m_config; DynamicPrintConfig new_conf = *m_config;
if (dialog->ShowModal() == wxID_YES) { if (dialog->ShowModal() == wxID_YES) {
new_conf.set_key_value("fill_pattern", new ConfigOptionEnum<InfillPattern>(ipRectilinear)); new_conf.set_key_value("fill_pattern", new ConfigOptionEnum<InfillPattern>(ipRectilinear));
new_conf.set_key_value("fill_density", new ConfigOptionPercent(100)); new_conf.set_key_value("fill_density", new ConfigOptionPercent(100));
@ -593,14 +609,14 @@ void TabPrint::update()
} }
} }
bool have_perimeters = m_config.opt_int("perimeters") > 0; bool have_perimeters = m_config->opt_int("perimeters") > 0;
std::vector<std::string> vec_enable = { "extra_perimeters", "ensure_vertical_shell_thickness", "thin_walls", "overhangs", std::vector<std::string> vec_enable = { "extra_perimeters", "ensure_vertical_shell_thickness", "thin_walls", "overhangs",
"seam_position", "external_perimeters_first", "external_perimeter_extrusion_width", "seam_position", "external_perimeters_first", "external_perimeter_extrusion_width",
"perimeter_speed", "small_perimeter_speed", "external_perimeter_speed" }; "perimeter_speed", "small_perimeter_speed", "external_perimeter_speed" };
for (auto el : vec_enable) for (auto el : vec_enable)
get_field(el)->toggle(have_perimeters); get_field(el)->toggle(have_perimeters);
bool have_infill = m_config.option<ConfigOptionPercent>("fill_density")->value > 0; bool have_infill = m_config->option<ConfigOptionPercent>("fill_density")->value > 0;
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "fill_pattern", "infill_every_layers", "infill_only_where_needed", vec_enable = { "fill_pattern", "infill_every_layers", "infill_only_where_needed",
"solid_infill_every_layers", "solid_infill_below_area", "infill_extruder"}; "solid_infill_every_layers", "solid_infill_below_area", "infill_extruder"};
@ -608,7 +624,7 @@ void TabPrint::update()
for (auto el : vec_enable) for (auto el : vec_enable)
get_field(el)->toggle(have_infill); get_field(el)->toggle(have_infill);
bool have_solid_infill = m_config.opt_int("top_solid_layers") > 0 || m_config.opt_int("bottom_solid_layers") > 0; bool have_solid_infill = m_config->opt_int("top_solid_layers") > 0 || m_config->opt_int("bottom_solid_layers") > 0;
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "external_fill_pattern", "infill_first", "solid_infill_extruder", vec_enable = { "external_fill_pattern", "infill_first", "solid_infill_extruder",
"solid_infill_extrusion_width", "solid_infill_speed" }; "solid_infill_extrusion_width", "solid_infill_speed" };
@ -624,33 +640,33 @@ void TabPrint::update()
get_field("gap_fill_speed")->toggle(have_perimeters && have_infill); get_field("gap_fill_speed")->toggle(have_perimeters && have_infill);
bool have_top_solid_infill = m_config.opt_int("top_solid_layers") > 0; bool have_top_solid_infill = m_config->opt_int("top_solid_layers") > 0;
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "top_infill_extrusion_width", "top_solid_infill_speed" }; vec_enable = { "top_infill_extrusion_width", "top_solid_infill_speed" };
for (auto el : vec_enable) for (auto el : vec_enable)
get_field(el)->toggle(have_top_solid_infill); get_field(el)->toggle(have_top_solid_infill);
bool have_default_acceleration = m_config.opt_float("default_acceleration") > 0; bool have_default_acceleration = m_config->opt_float("default_acceleration") > 0;
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "perimeter_acceleration", "infill_acceleration", vec_enable = { "perimeter_acceleration", "infill_acceleration",
"bridge_acceleration", "first_layer_acceleration"}; "bridge_acceleration", "first_layer_acceleration"};
for (auto el : vec_enable) for (auto el : vec_enable)
get_field(el)->toggle(have_default_acceleration); get_field(el)->toggle(have_default_acceleration);
bool have_skirt = m_config.opt_int("skirts") > 0 || m_config.opt_float("min_skirt_length") > 0; bool have_skirt = m_config->opt_int("skirts") > 0 || m_config->opt_float("min_skirt_length") > 0;
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "skirt_distance", "skirt_height"}; vec_enable = { "skirt_distance", "skirt_height"};
for (auto el : vec_enable) for (auto el : vec_enable)
get_field(el)->toggle(have_skirt); get_field(el)->toggle(have_skirt);
bool have_brim = m_config.opt_float("brim_width") > 0; bool have_brim = m_config->opt_float("brim_width") > 0;
// perimeter_extruder uses the same logic as in Print::extruders() // perimeter_extruder uses the same logic as in Print::extruders()
get_field("perimeter_extruder")->toggle(have_perimeters || have_brim); get_field("perimeter_extruder")->toggle(have_perimeters || have_brim);
bool have_raft = m_config.opt_int("raft_layers") > 0; bool have_raft = m_config->opt_int("raft_layers") > 0;
bool have_support_material = m_config.opt_bool("support_material") || have_raft; bool have_support_material = m_config->opt_bool("support_material") || have_raft;
bool have_support_interface = m_config.opt_int("support_material_interface_layers") > 0; bool have_support_interface = m_config->opt_int("support_material_interface_layers") > 0;
bool have_support_soluble = have_support_material && m_config.opt_float("support_material_contact_distance") == 0; bool have_support_soluble = have_support_material && m_config->opt_float("support_material_contact_distance") == 0;
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "support_material_threshold", "support_material_pattern", "support_material_with_sheath", vec_enable = { "support_material_threshold", "support_material_pattern", "support_material_with_sheath",
"support_material_spacing", "support_material_angle", "support_material_interface_layers", "support_material_spacing", "support_material_angle", "support_material_interface_layers",
@ -670,16 +686,16 @@ void TabPrint::update()
get_field("support_material_extruder")->toggle(have_support_material || have_skirt); get_field("support_material_extruder")->toggle(have_support_material || have_skirt);
get_field("support_material_speed")->toggle(have_support_material || have_brim || have_skirt); get_field("support_material_speed")->toggle(have_support_material || have_brim || have_skirt);
bool have_sequential_printing = m_config.opt_bool("complete_objects"); bool have_sequential_printing = m_config->opt_bool("complete_objects");
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "extruder_clearance_radius", "extruder_clearance_height"}; vec_enable = { "extruder_clearance_radius", "extruder_clearance_height"};
for (auto el : vec_enable) for (auto el : vec_enable)
get_field(el)->toggle(have_sequential_printing); get_field(el)->toggle(have_sequential_printing);
bool have_ooze_prevention = m_config.opt_bool("ooze_prevention"); bool have_ooze_prevention = m_config->opt_bool("ooze_prevention");
get_field("standby_temperature_delta")->toggle(have_ooze_prevention); get_field("standby_temperature_delta")->toggle(have_ooze_prevention);
bool have_wipe_tower = m_config.opt_bool("wipe_tower"); bool have_wipe_tower = m_config->opt_bool("wipe_tower");
vec_enable.resize(0); vec_enable.resize(0);
vec_enable = { "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_per_color_wipe"}; vec_enable = { "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_per_color_wipe"};
for (auto el : vec_enable) for (auto el : vec_enable)
@ -690,8 +706,9 @@ void TabPrint::update()
void TabFilament::build() void TabFilament::build()
{ {
m_config = m_preset_bundle->filaments.get_edited_preset().config; m_presets = &m_preset_bundle->filaments;
m_config_def = m_config.def(); m_config = &m_preset_bundle->filaments.get_edited_preset().config;
m_config_def = m_config->def();
auto page = add_options_page("Filament", "spool.png"); auto page = add_options_page("Filament", "spool.png");
auto optgroup = page->new_optgroup("Filament"); auto optgroup = page->new_optgroup("Filament");
@ -720,6 +737,7 @@ void TabFilament::build()
line = { "", "" }; line = { "", "" };
line.full_width = 1; line.full_width = 1;
line.widget = [this](wxWindow* parent) { line.widget = [this](wxWindow* parent) {
m_cooling_description_line = new wxStaticText(parent, wxID_ANY, "", wxDefaultPosition, wxSize(400, -1));
return description_line_widget(parent, m_cooling_description_line); return description_line_widget(parent, m_cooling_description_line);
}; };
optgroup->append_line(line); optgroup->append_line(line);
@ -749,6 +767,7 @@ void TabFilament::build()
line = {"",""}; line = {"",""};
line.full_width = 1; line.full_width = 1;
line.widget = [this](wxWindow* parent) { line.widget = [this](wxWindow* parent) {
m_volumetric_speed_description_line = new wxStaticText(parent, wxID_ANY, "", wxDefaultPosition, wxSize(400, -1));
return description_line_widget(parent, m_volumetric_speed_description_line); return description_line_widget(parent, m_volumetric_speed_description_line);
}; };
optgroup->append_line(line); optgroup->append_line(line);
@ -778,17 +797,53 @@ void TabFilament::build()
optgroup = page->new_optgroup("Profile dependencies"); optgroup = page->new_optgroup("Profile dependencies");
line = {"Compatible printers", ""}; line = {"Compatible printers", ""};
line.widget = [this](wxWindow* parent){ line.widget = [this](wxWindow* parent){
m_compatible_printers_checkbox = new wxCheckBox(parent, wxID_ANY, "All");
m_compatible_printers_btn = new wxButton(parent, wxID_ANY, "Set…", wxDefaultPosition,
wxDefaultSize, wxBU_LEFT | wxBU_EXACTFIT);
return compatible_printers_widget(parent, m_compatible_printers_checkbox, m_compatible_printers_btn); return compatible_printers_widget(parent, m_compatible_printers_checkbox, m_compatible_printers_btn);
}; };
optgroup->append_line(line); optgroup->append_line(line);
option = optgroup->get_option("compatible_printers_condition");
option.opt.full_width = true;
optgroup->append_single_option_line(option);
}
// Reload current config (aka presets->edited_preset->config) into the UI fields.
void TabFilament::reload_config(){
reload_compatible_printers_widget();
Tab::reload_config();
}
void TabFilament::update()
{
wxString text = wxString::FromUTF8(PresetHints::cooling_description(m_presets->get_edited_preset()).c_str());
m_cooling_description_line->SetLabel(text);
text = wxString::FromUTF8(PresetHints::maximum_volumetric_flow_description(*m_preset_bundle).c_str());
m_volumetric_speed_description_line->SetLabel(text);
bool cooling = m_config->opt_bool("cooling", 0);
bool fan_always_on = cooling || m_config->opt_bool("fan_always_on", 0);
std::vector<std::string> vec_enable = { "max_fan_speed", "fan_below_layer_time", "slowdown_below_layer_time", "min_print_speed" };
for (auto el : vec_enable)
get_field(el)->toggle(cooling);
vec_enable.resize(0);
vec_enable = { "min_fan_speed", "disable_fan_first_layers" };
for (auto el : vec_enable)
get_field(el)->toggle(fan_always_on);
}
void TabFilament::OnActivate()
{
m_volumetric_speed_description_line->SetLabel(PresetHints::maximum_volumetric_flow_description(*m_preset_bundle));
} }
wxSizer* TabFilament::description_line_widget(wxWindow* parent, wxStaticText* StaticText) wxSizer* TabFilament::description_line_widget(wxWindow* parent, wxStaticText* StaticText)
{ {
StaticText = new wxStaticText(parent, wxID_ANY, "gfghjkkl;\n fgdsufhsreotklg\n iesrftorsikgyfkh\nauiwrhfidj", wxDefaultPosition, wxDefaultSize);
auto font = (new wxSystemSettings)->GetFont(wxSYS_DEFAULT_GUI_FONT); auto font = (new wxSystemSettings)->GetFont(wxSYS_DEFAULT_GUI_FONT);
StaticText->SetFont(font); StaticText->SetFont(font);
StaticText->Wrap(400);
StaticText->GetParent()->Layout(); StaticText->GetParent()->Layout();
auto sizer = new wxBoxSizer(wxHORIZONTAL); auto sizer = new wxBoxSizer(wxHORIZONTAL);
@ -798,11 +853,12 @@ wxSizer* TabFilament::description_line_widget(wxWindow* parent, wxStaticText* St
void TabPrinter::build() void TabPrinter::build()
{ {
m_config = m_preset_bundle->printers.get_edited_preset().config; m_presets = &m_preset_bundle->printers;
m_config_def = m_config.def(); // It will be used in get_option_(const std::string title) m_config = &m_preset_bundle->printers.get_edited_preset().config;
m_config_def = m_config->def(); // It will be used in get_option_(const std::string title)
auto default_config = m_preset_bundle->full_config(); auto default_config = m_preset_bundle->full_config();
auto *nozzle_diameter = dynamic_cast<const ConfigOptionFloats*>(m_config.option("nozzle_diameter")); auto *nozzle_diameter = dynamic_cast<const ConfigOptionFloats*>(m_config->option("nozzle_diameter"));
m_extruders_count = nozzle_diameter->values.size(); m_extruders_count = nozzle_diameter->values.size();
auto page = add_options_page("General", "printer_empty.png"); auto page = add_options_page("General", "printer_empty.png");
@ -1161,10 +1217,10 @@ void Tab::toggle_show_hide_incompatible(wxCommandEvent &event){};
// # Return a callback to create a Tab widget to mark the preferences as compatible / incompatible to the current printer. // # Return a callback to create a Tab widget to mark the preferences as compatible / incompatible to the current printer.
wxSizer* Tab::compatible_printers_widget(wxWindow* parent, wxCheckBox* checkbox, wxButton* btn) wxSizer* Tab::compatible_printers_widget(wxWindow* parent, wxCheckBox* checkbox, wxButton* btn)
{ {
checkbox = new wxCheckBox(parent, wxID_ANY, "All"); // checkbox = new wxCheckBox(parent, wxID_ANY, "All");
//
btn = new wxButton(parent, wxID_ANY, "Set…", wxDefaultPosition, wxDefaultSize, // btn = new wxButton(parent, wxID_ANY, "Set…", wxDefaultPosition, wxDefaultSize,
wxBU_LEFT | wxBU_EXACTFIT); // wxBU_LEFT | wxBU_EXACTFIT);
// btn->SetFont(GUI::small_font); // btn->SetFont(GUI::small_font);
btn->SetBitmap(wxBitmap(wxString::FromUTF8(Slic3r::var("printer_empty.png").c_str()), wxBITMAP_TYPE_PNG)); btn->SetBitmap(wxBitmap(wxString::FromUTF8(Slic3r::var("printer_empty.png").c_str()), wxBITMAP_TYPE_PNG));
@ -1174,21 +1230,17 @@ wxSizer* Tab::compatible_printers_widget(wxWindow* parent, wxCheckBox* checkbox,
checkbox->Bind(wxEVT_CHECKBOX, ([=](wxCommandEvent e) checkbox->Bind(wxEVT_CHECKBOX, ([=](wxCommandEvent e)
{ {
btn->Enable(!checkbox->GetValue()); btn->Enable(!checkbox->GetValue());
// # All printers have been made compatible with this preset. // All printers have been made compatible with this preset.
// _load_key_value('compatible_printers', []) if checkbox->GetValue(); if (checkbox->GetValue())
load_key_value("compatible_printers", std::vector<std::string> {});
get_field("compatible_printers_condition")->toggle(checkbox->GetValue());
}) ); }) );
btn->Bind(wxEVT_BUTTON, ([=](wxCommandEvent e) btn->Bind(wxEVT_BUTTON, ([this, parent, checkbox, btn](wxCommandEvent e)
{ {
PresetCollection *prints = new PresetCollection(Preset::TYPE_PRINT, Preset::print_options());
prints->preset(0).config.opt_string("print_settings_id", true);
prints->preset(0).config.optptr("compatible_printers", true);
DynamicPrintConfig config_ = prints->get_edited_preset().config;
// # Collect names of non-default non-external printer profiles. // # Collect names of non-default non-external printer profiles.
PresetCollection *printers = new PresetCollection(Preset::TYPE_PRINTER, Preset::print_options()); PresetCollection *printers = &m_preset_bundle->printers;//new PresetCollection(Preset::TYPE_PRINTER, Preset::print_options());
printers->preset(0).config.opt_string("print_settings_id", true);
wxArrayString presets; wxArrayString presets;
for (size_t idx = 0; idx < printers->size(); ++idx) for (size_t idx = 0; idx < printers->size(); ++idx)
{ {
@ -1202,7 +1254,7 @@ wxSizer* Tab::compatible_printers_widget(wxWindow* parent, wxCheckBox* checkbox,
"Compatible printers", presets); "Compatible printers", presets);
// # Collect and set indices of printers marked as compatible. // # Collect and set indices of printers marked as compatible.
wxArrayInt selections; wxArrayInt selections;
auto *compatible_printers = dynamic_cast<const ConfigOptionStrings*>(config_.option("compatible_printers")); auto *compatible_printers = dynamic_cast<const ConfigOptionStrings*>(m_config->option("compatible_printers"));
if (compatible_printers != nullptr || !compatible_printers->values.empty()) if (compatible_printers != nullptr || !compatible_printers->values.empty())
for (auto preset_name : compatible_printers->values) for (auto preset_name : compatible_printers->values)
for (size_t idx = 0; idx < presets.GetCount(); ++idx) for (size_t idx = 0; idx < presets.GetCount(); ++idx)
@ -1212,19 +1264,19 @@ wxSizer* Tab::compatible_printers_widget(wxWindow* parent, wxCheckBox* checkbox,
break; break;
} }
dlg->SetSelections(selections); dlg->SetSelections(selections);
// # Show the dialog. std::vector<std::string> value;
// Show the dialog.
if (dlg->ShowModal() == wxID_OK) { if (dlg->ShowModal() == wxID_OK) {
selections.Clear(); selections.Clear();
selections = dlg->GetSelections(); selections = dlg->GetSelections();
std::vector<std::string> value;
for (auto idx : selections) for (auto idx : selections)
value.push_back(presets[idx].ToStdString()); value.push_back(presets[idx].ToStdString());
if (/*!@$value*/value.empty()) { if (value.empty()) {
checkbox->SetValue(1); checkbox->SetValue(1);
btn->Disable(); btn->Disable();
} }
// # All printers have been made compatible with this preset. // All printers have been made compatible with this preset.
// _load_key_value('compatible_printers', $value); load_key_value("compatible_printers", value);
} }
})); }));
return sizer; return sizer;

16
xs/src/slic3r/GUI/Tab.h
View file

@ -99,7 +99,7 @@ public:
PresetBundle* m_preset_bundle; PresetBundle* m_preset_bundle;
bool m_no_controller; bool m_no_controller;
PresetCollection* m_presets; PresetCollection* m_presets;
DynamicPrintConfig m_config; //! tmp_val DynamicPrintConfig* m_config; //! tmp_val
const ConfigDef* m_config_def; // It will be used in get_option_(const std::string title) const ConfigDef* m_config_def; // It will be used in get_option_(const std::string title)
t_change m_on_value_change{ nullptr }; t_change m_on_value_change{ nullptr };
@ -126,7 +126,8 @@ public:
wxSizer* compatible_printers_widget(wxWindow* parent, wxCheckBox* checkbox, wxButton* btn); wxSizer* compatible_printers_widget(wxWindow* parent, wxCheckBox* checkbox, wxButton* btn);
void load_key_value(std::string opt_key, std::vector<std::string> value); void load_key_value(std::string opt_key, boost::any value);
void reload_compatible_printers_widget();
void OnTreeSelChange(wxTreeEvent& event); void OnTreeSelChange(wxTreeEvent& event);
void OnKeyDown(wxKeyEvent& event); void OnKeyDown(wxKeyEvent& event);
@ -137,11 +138,12 @@ public:
PageShp add_options_page(wxString title, std::string icon, bool is_extruder_pages = false); PageShp add_options_page(wxString title, std::string icon, bool is_extruder_pages = false);
virtual void OnActivate(){};
virtual void build() = 0; virtual void build() = 0;
virtual void update() = 0; virtual void update() = 0;
void update_dirty(); void update_dirty();
void load_config(DynamicPrintConfig config); void load_config(DynamicPrintConfig config);
void reload_config(); virtual void reload_config();
Field* get_field(t_config_option_key opt_key, int opt_index = -1) const; Field* get_field(t_config_option_key opt_key, int opt_index = -1) const;
}; };
@ -156,14 +158,15 @@ public:
bool m_support_material_overhangs_queried = false; bool m_support_material_overhangs_queried = false;
void build() override; void build() override;
void reload_config() override;
void update() override; void update() override;
}; };
//Slic3r::GUI::Tab::Filament; //Slic3r::GUI::Tab::Filament;
class TabFilament : public Tab class TabFilament : public Tab
{ {
wxStaticText* m_cooling_description_line;
wxStaticText* m_volumetric_speed_description_line; wxStaticText* m_volumetric_speed_description_line;
wxStaticText* m_cooling_description_line;
public: public:
TabFilament() {} TabFilament() {}
TabFilament(wxNotebook* parent, const char *title) : Tab(parent, title) {} TabFilament(wxNotebook* parent, const char *title) : Tab(parent, title) {}
@ -172,7 +175,10 @@ public:
wxSizer* description_line_widget(wxWindow* parent, wxStaticText* StaticText); wxSizer* description_line_widget(wxWindow* parent, wxStaticText* StaticText);
void build() override; void build() override;
void update() override{}; void reload_config() override;
void update() override;
void OnActivate() override;
}; };
//Slic3r::GUI::Tab::Printer; //Slic3r::GUI::Tab::Printer;