3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Complited "update" for TabPrint.

Browse source 
!->It's one unresolved problem - dlg->ShowModal() call update().
Added "get_field" at Tab & Page.
Extended "change_opt_value"
Extended "get_value" to Choise.
This commit is contained in:
YuSanka 2018-01-11 10:33:17 +01:00
parent 129bd898cd
commit 3567981089
6 changed files with 311 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

30
xs/src/slic3r/GUI/Field.cpp
View file

@ -36,13 +36,13 @@ namespace Slic3r { namespace GUI {
boost::any ret_val; boost::any ret_val;
switch (m_opt.type){ switch (m_opt.type){
case coInt: case coInt:
case coPercent:
if (m_opt.type == coPercent) str.RemoveLast();
ret_val = wxAtoi(str); ret_val = wxAtoi(str);
break; break;
case coPercent:
case coPercents: case coPercents:
case coFloats: case coFloats:
case coFloat:{ case coFloat:{
if (m_opt.type == coPercent) str.RemoveLast();
double val; double val;
str.ToCDouble(&val); str.ToCDouble(&val);
ret_val = val; ret_val = val;
@ -241,9 +241,11 @@ void Choice::BUILD() {
if (m_opt.height >= 0) size.SetHeight(m_opt.height); if (m_opt.height >= 0) size.SetHeight(m_opt.height);
if (m_opt.width >= 0) size.SetWidth(m_opt.width); if (m_opt.width >= 0) size.SetWidth(m_opt.width);
auto temp = new wxComboBox(m_parent, wxID_ANY, wxString(""), wxDefaultPosition, size); wxComboBox* temp;
if (m_opt.gui_type.compare("select_open") != 0) if (!m_opt.gui_type.empty() && m_opt.gui_type.compare("select_open") != 0)
temp->SetExtraStyle(wxCB_READONLY); temp = new wxComboBox(m_parent, wxID_ANY, wxString(""), wxDefaultPosition, size);
else
temp = new wxComboBox(m_parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, NULL, wxCB_READONLY);
// recast as a wxWindow to fit the calling convention // recast as a wxWindow to fit the calling convention
window = dynamic_cast<wxWindow*>(temp); window = dynamic_cast<wxWindow*>(temp);
@ -393,9 +395,21 @@ boost::any Choice::get_value()
boost::any ret_val; boost::any ret_val;
wxString ret_str = static_cast<wxComboBox*>(window)->GetValue(); wxString ret_str = static_cast<wxComboBox*>(window)->GetValue();
ret_val = m_opt.type == coEnum ? if (m_opt.type != coEnum)
static_cast<wxComboBox*>(window)->GetSelection() : ret_val = get_value_by_opt_type(ret_str, m_opt.type);
get_value_by_opt_type(ret_str, m_opt.type); else
{
int ret_enum = static_cast<wxComboBox*>(window)->GetSelection();
if (m_opt_id.compare("external_fill_pattern") == 0 ||
m_opt_id.compare("fill_pattern") == 0)
ret_val = static_cast<InfillPattern>(ret_enum);
else if (m_opt_id.compare("gcode_flavor") == 0)
ret_val = static_cast<GCodeFlavor>(ret_enum);
else if (m_opt_id.compare("support_material_pattern") == 0)
ret_val = static_cast<SupportMaterialPattern>(ret_enum);
else if (m_opt_id.compare("seam_position") == 0)
ret_val = static_cast<SeamPosition>(ret_enum);
}
return ret_val; return ret_val;
} }

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

@ -198,10 +198,10 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b
switch (config.def()->get(opt_key)->type){ switch (config.def()->get(opt_key)->type){
case coFloatOrPercent:{ case coFloatOrPercent:{
const auto &val = *config.option<ConfigOptionFloatOrPercent>(opt_key); const auto &val = *config.option<ConfigOptionFloatOrPercent>(opt_key);
config.set_key_value(opt_key, new ConfigOptionFloatOrPercent(boost::any_cast</*ConfigOptionFloatOrPercent*/double>(value), val.percent)); config.set_key_value(opt_key, new ConfigOptionFloatOrPercent(boost::any_cast<double>(value), val.percent));
break;} break;}
case coPercent: case coPercent:
config.set_key_value(opt_key, new ConfigOptionPercent(boost::any_cast</*ConfigOptionPercent*/double>(value))); config.set_key_value(opt_key, new ConfigOptionPercent(boost::any_cast<double>(value)));
break; break;
case coFloat:{ case coFloat:{
double& val = config.opt_float(opt_key); double& val = config.opt_float(opt_key);
@ -231,7 +231,17 @@ void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, b
break; break;
case coInts: case coInts:
break; break;
case coEnum: case coEnum:{
if (opt_key.compare("external_fill_pattern") == 0 ||
opt_key.compare("fill_pattern") == 0)
config.set_key_value(opt_key, new ConfigOptionEnum<InfillPattern>(boost::any_cast<InfillPattern>(value)));
else if (opt_key.compare("gcode_flavor") == 0)
config.set_key_value(opt_key, new ConfigOptionEnum<GCodeFlavor>(boost::any_cast<GCodeFlavor>(value)));
else if (opt_key.compare("support_material_pattern") == 0)
config.set_key_value(opt_key, new ConfigOptionEnum<SupportMaterialPattern>(boost::any_cast<SupportMaterialPattern>(value)));
else if (opt_key.compare("seam_position") == 0)
config.set_key_value(opt_key, new ConfigOptionEnum<SeamPosition>(boost::any_cast<SeamPosition>(value)));
}
break; break;
case coPoints: case coPoints:
break; break;

18
xs/src/slic3r/GUI/OptionsGroup.cpp
View file

@ -219,7 +219,7 @@ void ConfigOptionsGroup::on_change_OG(t_config_option_key opt_id, boost::any val
auto option = m_options.at(opt_id); auto option = m_options.at(opt_id);
// get value // get value
auto field_value = get_value(opt_id); //! auto field_value = get_value(opt_id);
if (option.gui_flags.compare("serialized")==0) { if (option.gui_flags.compare("serialized")==0) {
if (opt_index != -1){ if (opt_index != -1){
// die "Can't set serialized option indexed value" ; // die "Can't set serialized option indexed value" ;
@ -243,7 +243,7 @@ void ConfigOptionsGroup::on_change_OG(t_config_option_key opt_id, boost::any val
} }
} }
OptionsGroup::on_change_OG(opt_id, value); OptionsGroup::on_change_OG(opt_id, value); //!? Why doing this
} }
void ConfigOptionsGroup::reload_config(){ void ConfigOptionsGroup::reload_config(){
@ -331,8 +331,7 @@ boost::any ConfigOptionsGroup::get_config_value(DynamicPrintConfig& config, std:
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 ){
opt_key.compare("external_fill_pattern") == 0 ){
ret = static_cast<int>(config.option<ConfigOptionEnum<InfillPattern>>(opt_key)->value); ret = static_cast<int>(config.option<ConfigOptionEnum<InfillPattern>>(opt_key)->value);
} }
else if (opt_key.compare("gcode_flavor") == 0 ){ else if (opt_key.compare("gcode_flavor") == 0 ){
@ -357,5 +356,16 @@ boost::any ConfigOptionsGroup::get_config_value(DynamicPrintConfig& config, std:
return ret; return ret;
} }
Field* ConfigOptionsGroup::get_fieldc(t_config_option_key opt_key, int opt_index){
std::string opt_id = "";
for (std::map< std::string, std::pair<std::string, int> >::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){
opt_id = it->first;
break;
}
}
return opt_id.empty() ? nullptr : get_field(opt_id);
}
} // GUI } // GUI
} // Slic3r } // Slic3r

1
xs/src/slic3r/GUI/OptionsGroup.hpp
View file

@ -166,6 +166,7 @@ public:
boost::any config_value(std::string opt_key, int opt_index, bool deserialize); boost::any config_value(std::string opt_key, int opt_index, bool deserialize);
// return option value from config // return option value from config
boost::any get_config_value(DynamicPrintConfig& config, std::string opt_key, int opt_index = -1); boost::any get_config_value(DynamicPrintConfig& config, std::string opt_key, int opt_index = -1);
Field* get_fieldc(t_config_option_key opt_key, int opt_index);
}; };
}} }}

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

@ -15,8 +15,6 @@
#include "PresetBundle.hpp" #include "PresetBundle.hpp"
#include "../../libslic3r/Utils.hpp" #include "../../libslic3r/Utils.hpp"
//#include "GCodeSender.hpp"
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
@ -176,7 +174,17 @@ void Tab::load_config(DynamicPrintConfig config)
break; break;
case coInts: case coInts:
break; break;
case coEnum: case coEnum:{
if (opt_key.compare("external_fill_pattern") == 0 ||
opt_key.compare("fill_pattern") == 0)
change_opt_value(m_config, opt_key, config.option<ConfigOptionEnum<InfillPattern>>(opt_key)->value);
else if (opt_key.compare("gcode_flavor") == 0)
change_opt_value(m_config, opt_key, config.option<ConfigOptionEnum<GCodeFlavor>>(opt_key)->value);
else if (opt_key.compare("support_material_pattern") == 0)
change_opt_value(m_config, opt_key, config.option<ConfigOptionEnum<SupportMaterialPattern>>(opt_key)->value);
else if (opt_key.compare("seam_position") == 0)
change_opt_value(m_config, opt_key, config.option<ConfigOptionEnum<SeamPosition>>(opt_key)->value);
}
break; break;
case coPoints: case coPoints:
break; break;
@ -203,6 +211,17 @@ void Tab::reload_config(){
Thaw(); Thaw();
} }
Field* Tab::get_field(t_config_option_key opt_key, int opt_index/* = -1*/) const
{
Field* field = nullptr;
for (auto page : m_pages){
field = page->get_field(opt_key);
if (field != nullptr)
return field;
}
return field;
}
void Tab::load_key_value(std::string opt_key, std::vector<std::string> value) 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, // # To be called by custom widgets, load a value into a config,
@ -419,6 +438,10 @@ void TabPrint::build()
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);
} }
void TabPrint::update() void TabPrint::update()
@ -450,178 +473,217 @@ void TabPrint::update()
load_config(new_conf); load_config(new_conf);
} }
// if ($config->wipe_tower && if (m_config.opt_bool("wipe_tower") &&
// ($config->first_layer_height != 0.2 || $config->layer_height < 0.15 || $config->layer_height > 0.35)) { (m_config.option<ConfigOptionFloatOrPercent>("first_layer_height")->value != 0.2 /*$config->first_layer_height != 0.2*/ ||
// my $dialog = Wx::MessageDialog->new($self, m_config.opt_float("layer_height") < 0.15 || m_config.opt_float("layer_height") > 0.35)) {
// "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?";
// 'Wipe Tower', wxICON_WARNING | wxYES | wxNO); auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO);
// my $new_conf = Slic3r::Config->new; DynamicPrintConfig new_conf = m_config;
// if ($dialog->ShowModal() == wxID_YES) { if (dialog->ShowModal() == wxID_YES) {
// $new_conf->set("first_layer_height", 0.2); const auto &val = *m_config.option<ConfigOptionFloatOrPercent>("first_layer_height");
// $new_conf->set("layer_height", 0.15) if $config->layer_height < 0.15; new_conf.set_key_value("first_layer_height", new ConfigOptionFloatOrPercent(0.2, val.percent));
// $new_conf->set("layer_height", 0.35) if $config->layer_height > 0.35;
// } if (m_config.opt_float("layer_height") < 0.15) new_conf.set_key_value("layer_height", new ConfigOptionFloat(0.15)) ;
// else { if (m_config.opt_float("layer_height") > 0.35) new_conf.set_key_value("layer_height", new ConfigOptionFloat(0.35));
// $new_conf->set("wipe_tower", 0); }
// } else
// $self->load_config($new_conf); new_conf.set_key_value("wipe_tower", new ConfigOptionBool(false));
// } load_config(new_conf);
// }
// if ($config->wipe_tower && $config->support_material && $config->support_material_contact_distance > 0. &&
// ($config->support_material_extruder != 0 || $config->support_material_interface_extruder != 0)) { if (m_config.opt_bool("wipe_tower") && m_config.opt_bool("support_material") &&
// my $dialog = Wx::MessageDialog->new($self, m_config.opt_float("support_material_contact_distance") > 0. &&
// "The Wipe Tower currently supports the non-soluble supports only\n" (m_config.opt_int("support_material_extruder") != 0 || m_config.opt_int("support_material_interface_extruder") != 0)) {
// . "if they are printed with the current extruder without triggering a tool change.\n" std::string msg_text = "The Wipe Tower currently supports the non-soluble supports only\n"
// . "(both support_material_extruder and support_material_interface_extruder need to be set to 0).\n" "if they are printed with the current extruder without triggering a tool change.\n"
// . "\nShall I adjust those settings in order to enable the Wipe Tower?", "(both support_material_extruder and support_material_interface_extruder need to be set to 0).\n"
// 'Wipe Tower', wxICON_WARNING | wxYES | wxNO); "\nShall I adjust those settings in order to enable the Wipe Tower?";
// my $new_conf = Slic3r::Config->new; auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO);
// if ($dialog->ShowModal() == wxID_YES) { DynamicPrintConfig new_conf = m_config;
// $new_conf->set("support_material_extruder", 0); if (dialog->ShowModal() == wxID_YES) {
// $new_conf->set("support_material_interface_extruder", 0); new_conf.set_key_value("support_material_extruder", new ConfigOptionInt(0));
// } new_conf.set_key_value("support_material_interface_extruder", new ConfigOptionInt(0));
// else { }
// $new_conf->set("wipe_tower", 0); else
// } new_conf.set_key_value("wipe_tower", new ConfigOptionBool(false));
// $self->load_config($new_conf); load_config(new_conf);
// } }
//
// if ($config->wipe_tower && $config->support_material && $config->support_material_contact_distance == 0 && if (m_config.opt_bool("wipe_tower") && m_config.opt_bool("support_material") &&
// !$config->support_material_synchronize_layers) { m_config.opt_float("support_material_contact_distance") == 0 &&
// my $dialog = Wx::MessageDialog->new($self, !m_config.opt_bool("support_material_synchronize_layers")) {
// "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?";
// 'Wipe Tower', wxICON_WARNING | wxYES | wxNO); auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Wipe Tower"), wxICON_WARNING | wxYES | wxNO);
// my $new_conf = Slic3r::Config->new; DynamicPrintConfig new_conf = m_config;
// if ($dialog->ShowModal() == wxID_YES) { if (dialog->ShowModal() == wxID_YES) {
// $new_conf->set("support_material_synchronize_layers", 1); new_conf.set_key_value("support_material_synchronize_layers", new ConfigOptionBool(true));
// } }
// else { else
// $new_conf->set("wipe_tower", 0); new_conf.set_key_value("wipe_tower", new ConfigOptionBool(false));
// } load_config(new_conf);
// $self->load_config($new_conf); }
// }
// if (m_config.opt_bool("support_material")) {
// if ($config->support_material) { // Ask only once.
// # Ask only once. if (!m_support_material_overhangs_queried) {
// if (!$self->{support_material_overhangs_queried}) { m_support_material_overhangs_queried = true;
// $self->{support_material_overhangs_queried} = 1; if (!m_config.opt_bool("overhangs")/* != 1*/) {
// if ($config->overhangs != 1) { std::string msg_text = "Supports work better, if the following feature is enabled:\n"
// my $dialog = Wx::MessageDialog->new($self, "- Detect bridging perimeters\n"
// "Supports work better, if the following feature is enabled:\n" "\nShall I adjust those settings for supports?";
// . "- Detect bridging perimeters\n" auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Support Generator"), wxICON_WARNING | wxYES | wxNO | wxCANCEL);
// . "\nShall I adjust those settings for supports?", DynamicPrintConfig new_conf = m_config;
// 'Support Generator', wxICON_WARNING | wxYES | wxNO | wxCANCEL); auto answer = dialog->ShowModal();
// my $answer = $dialog->ShowModal(); if (answer == wxID_YES) {
// my $new_conf = Slic3r::Config->new; // Enable "detect bridging perimeters".
// if ($answer == wxID_YES) { new_conf.set_key_value("overhangs", new ConfigOptionBool(true));
// # Enable "detect bridging perimeters". } else if(answer == wxID_NO) {
// $new_conf->set("overhangs", 1); // Do nothing, leave supports on and "detect bridging perimeters" off.
// } elsif($answer == wxID_NO) { } else if(answer == wxID_CANCEL) {
// # Do nothing, leave supports on and "detect bridging perimeters" off. // Disable supports.
// } elsif($answer == wxID_CANCEL) { new_conf.set_key_value("support_material", new ConfigOptionBool(false));
// # Disable supports. m_support_material_overhangs_queried = false;
// $new_conf->set("support_material", 0); }
// $self->{support_material_overhangs_queried} = 0; load_config(new_conf);
// } }
// $self->load_config($new_conf); }
// } }
// } else {
// } m_support_material_overhangs_queried = false;
// else { }
// $self->{support_material_overhangs_queried} = 0;
// } if (m_config.option<ConfigOptionPercent>("fill_density")->value == 100) {
// auto fill_pattern = m_config.option<ConfigOptionEnum<InfillPattern>>("fill_pattern")->value;
// if ($config->fill_density == 100 std::string str_fill_pattern = "";
// && !first{ $_ eq $config->fill_pattern } @{$Slic3r::Config::Options->{external_fill_pattern}{values}}) { t_config_enum_values map_names = m_config.option<ConfigOptionEnum<InfillPattern>>("fill_pattern")->get_enum_values();
// my $dialog = Wx::MessageDialog->new($self, for (auto it:map_names) {
// "The ".$config->fill_pattern . " infill pattern is not supposed to work at 100% density.\n" if (fill_pattern == it.second) {
// . "\nShall I switch to rectilinear fill pattern?", str_fill_pattern = it.first;
// 'Infill', wxICON_WARNING | wxYES | wxNO); break;
// }
// my $new_conf = Slic3r::Config->new; }
// if ($dialog->ShowModal() == wxID_YES) { if (!str_fill_pattern.empty()){
// $new_conf->set("fill_pattern", 'rectilinear'); auto external_fill_pattern = m_config.def()->get("external_fill_pattern")->enum_values;
// $new_conf->set("fill_density", 100); bool correct_100p_fill = false;
// } for (auto fill : external_fill_pattern)
// else { {
// $new_conf->set("fill_density", 40); if (str_fill_pattern.compare(fill) == 0)
// } correct_100p_fill = true;
// $self->load_config($new_conf); }
// } // 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];
// my $have_perimeters = $config->perimeters > 0; if (!correct_100p_fill){
// $self->get_field($_)->toggle($have_perimeters) std::string msg_text = "The " + str_fill_pattern + " infill pattern is not supposed to work at 100% density.\n"
// for qw(extra_perimeters ensure_vertical_shell_thickness thin_walls overhangs seam_position external_perimeters_first "\nShall I switch to rectilinear fill pattern?";
// external_perimeter_extrusion_width auto dialog = new wxMessageDialog(parent(), msg_text, wxT("Infill"), wxICON_WARNING | wxYES | wxNO);
// perimeter_speed small_perimeter_speed external_perimeter_speed); DynamicPrintConfig new_conf = m_config;
// if (dialog->ShowModal() == wxID_YES) {
// my $have_infill = $config->fill_density > 0; new_conf.set_key_value("fill_pattern", new ConfigOptionEnum<InfillPattern>(ipRectilinear));
// # infill_extruder uses the same logic as in Print::extruders() new_conf.set_key_value("fill_density", new ConfigOptionPercent(100));
// $self->get_field($_)->toggle($have_infill) }
// for qw(fill_pattern infill_every_layers infill_only_where_needed solid_infill_every_layers else
// solid_infill_below_area infill_extruder); new_conf.set_key_value("fill_density", new ConfigOptionPercent(40));
// load_config(new_conf);
// my $have_solid_infill = ($config->top_solid_layers > 0) || ($config->bottom_solid_layers > 0); }
// # solid_infill_extruder uses the same logic as in Print::extruders() }
// $self->get_field($_)->toggle($have_solid_infill) }
// for qw(external_fill_pattern infill_first solid_infill_extruder solid_infill_extrusion_width
// solid_infill_speed); bool have_perimeters = m_config.opt_int("perimeters") > 0;
// std::vector<std::string> vec_enable = { "extra_perimeters", "ensure_vertical_shell_thickness", "thin_walls", "overhangs",
// $self->get_field($_)->toggle($have_infill || $have_solid_infill) "seam_position", "external_perimeters_first", "external_perimeter_extrusion_width",
// for qw(fill_angle bridge_angle infill_extrusion_width infill_speed bridge_speed); "perimeter_speed", "small_perimeter_speed", "external_perimeter_speed" };
// for (auto el : vec_enable)
// $self->get_field('gap_fill_speed')->toggle($have_perimeters && $have_infill); get_field(el)->toggle(have_perimeters);
//
// my $have_top_solid_infill = $config->top_solid_layers > 0; bool have_infill = m_config.option<ConfigOptionPercent>("fill_density")->value > 0;
// $self->get_field($_)->toggle($have_top_solid_infill) vec_enable.resize(0);
// for qw(top_infill_extrusion_width top_solid_infill_speed); vec_enable = { "fill_pattern", "infill_every_layers", "infill_only_where_needed",
// "solid_infill_every_layers", "solid_infill_below_area", "infill_extruder"};
// my $have_default_acceleration = $config->default_acceleration > 0; // infill_extruder uses the same logic as in Print::extruders()
// $self->get_field($_)->toggle($have_default_acceleration) for (auto el : vec_enable)
// for qw(perimeter_acceleration infill_acceleration bridge_acceleration first_layer_acceleration); get_field(el)->toggle(have_infill);
//
// my $have_skirt = $config->skirts > 0 || $config->min_skirt_length > 0; bool have_solid_infill = m_config.opt_int("top_solid_layers") > 0 || m_config.opt_int("bottom_solid_layers") > 0;
// $self->get_field($_)->toggle($have_skirt) vec_enable.resize(0);
// for qw(skirt_distance skirt_height); vec_enable = { "external_fill_pattern", "infill_first", "solid_infill_extruder",
// "solid_infill_extrusion_width", "solid_infill_speed" };
// my $have_brim = $config->brim_width > 0; // solid_infill_extruder uses the same logic as in Print::extruders()
// # perimeter_extruder uses the same logic as in Print::extruders() for (auto el : vec_enable)
// $self->get_field('perimeter_extruder')->toggle($have_perimeters || $have_brim); get_field(el)->toggle(have_solid_infill);
//
// my $have_raft = $config->raft_layers > 0; vec_enable.resize(0);
// my $have_support_material = $config->support_material || $have_raft; vec_enable = { "fill_angle", "bridge_angle", "infill_extrusion_width",
// my $have_support_interface = $config->support_material_interface_layers > 0; "infill_speed", "bridge_speed" };
// my $have_support_soluble = $have_support_material && $config->support_material_contact_distance == 0; for (auto el : vec_enable)
// $self->get_field($_)->toggle($have_support_material) get_field(el)->toggle(have_infill || have_solid_infill);
// for qw(support_material_threshold support_material_pattern support_material_with_sheath
// support_material_spacing support_material_angle get_field("gap_fill_speed")->toggle(have_perimeters && have_infill);
// support_material_interface_layers dont_support_bridges
// support_material_extrusion_width support_material_contact_distance support_material_xy_spacing); bool have_top_solid_infill = m_config.opt_int("top_solid_layers") > 0;
// $self->get_field($_)->toggle($have_support_material && $have_support_interface) vec_enable.resize(0);
// for qw(support_material_interface_spacing support_material_interface_extruder vec_enable = { "top_infill_extrusion_width", "top_solid_infill_speed" };
// support_material_interface_speed support_material_interface_contact_loops); for (auto el : vec_enable)
// $self->get_field('support_material_synchronize_layers')->toggle($have_support_soluble); get_field(el)->toggle(have_top_solid_infill);
//
// $self->get_field('perimeter_extrusion_width')->toggle($have_perimeters || $have_skirt || $have_brim); bool have_default_acceleration = m_config.opt_float("default_acceleration") > 0;
// $self->get_field('support_material_extruder')->toggle($have_support_material || $have_skirt); vec_enable.resize(0);
// $self->get_field('support_material_speed')->toggle($have_support_material || $have_brim || $have_skirt); vec_enable = { "perimeter_acceleration", "infill_acceleration",
// "bridge_acceleration", "first_layer_acceleration"};
// my $have_sequential_printing = $config->complete_objects; for (auto el : vec_enable)
// $self->get_field($_)->toggle($have_sequential_printing) get_field(el)->toggle(have_default_acceleration);
// for qw(extruder_clearance_radius extruder_clearance_height);
// bool have_skirt = m_config.opt_int("skirts") > 0 || m_config.opt_float("min_skirt_length") > 0;
// my $have_ooze_prevention = $config->ooze_prevention; vec_enable.resize(0);
// $self->get_field($_)->toggle($have_ooze_prevention) vec_enable = { "skirt_distance", "skirt_height"};
// for qw(standby_temperature_delta); for (auto el : vec_enable)
// get_field(el)->toggle(have_skirt);
// my $have_wipe_tower = $config->wipe_tower;
// $self->get_field($_)->toggle($have_wipe_tower) bool have_brim = m_config.opt_float("brim_width") > 0;
// for qw(wipe_tower_x wipe_tower_y wipe_tower_width wipe_tower_per_color_wipe); // perimeter_extruder uses the same logic as in Print::extruders()
get_field("perimeter_extruder")->toggle(have_perimeters || have_brim);
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_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;
vec_enable.resize(0);
vec_enable = { "support_material_threshold", "support_material_pattern", "support_material_with_sheath",
"support_material_spacing", "support_material_angle", "support_material_interface_layers",
"dont_support_bridges", "support_material_extrusion_width", "support_material_contact_distance",
"support_material_xy_spacing"};
for (auto el : vec_enable)
get_field(el)->toggle(have_support_material);
vec_enable.resize(0);
vec_enable = { "support_material_interface_spacing", "support_material_interface_extruder",
"support_material_interface_speed", "support_material_interface_contact_loops"};
for (auto el : vec_enable)
get_field(el)->toggle(have_support_material && have_support_interface);
get_field("support_material_synchronize_layers")->toggle(have_support_soluble);
get_field("perimeter_extrusion_width")->toggle(have_perimeters || have_skirt || have_brim);
get_field("support_material_extruder")->toggle(have_support_material || 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");
vec_enable.resize(0);
vec_enable = { "extruder_clearance_radius", "extruder_clearance_height"};
for (auto el : vec_enable)
get_field(el)->toggle(have_sequential_printing);
bool have_ooze_prevention = m_config.opt_bool("ooze_prevention");
get_field("standby_temperature_delta")->toggle(have_ooze_prevention);
bool have_wipe_tower = m_config.opt_bool("wipe_tower");
vec_enable.resize(0);
vec_enable = { "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_per_color_wipe"};
for (auto el : vec_enable)
get_field(el)->toggle(have_wipe_tower);
Thaw(); Thaw();
} }
@ -1168,6 +1230,23 @@ wxSizer* Tab::compatible_printers_widget(wxWindow* parent, wxCheckBox* checkbox,
return sizer; return sizer;
} }
void Page::reload_config()
{
for (auto group : m_optgroups)
group->reload_config();
}
Field* Page::get_field(t_config_option_key opt_key, int opt_index/* = -1*/) const
{
Field* field = nullptr;
for (auto opt : m_optgroups){
field = opt->get_fieldc(opt_key, opt_index);
if (field != nullptr)
return field;
}
return field;
}
// package Slic3r::GUI::Tab::Page; // package Slic3r::GUI::Tab::Page;
ConfigOptionsGroupShp Page::new_optgroup(std::string title, int noncommon_label_width /*= -1*/) ConfigOptionsGroupShp Page::new_optgroup(std::string title, int noncommon_label_width /*= -1*/)
{ {

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

@ -63,10 +63,8 @@ public:
wxString title() const { return m_title; } wxString title() const { return m_title; }
size_t iconID() const { return m_iconID; } size_t iconID() const { return m_iconID; }
void set_config(DynamicPrintConfig* config_in) { m_config = config_in; } void set_config(DynamicPrintConfig* config_in) { m_config = config_in; }
void reload_config(){ void reload_config();
for (auto group: m_optgroups) Field* get_field(t_config_option_key opt_key, int opt_index = -1) const;
group->reload_config();
}
ConfigOptionsGroupShp new_optgroup(std::string title, int noncommon_label_width = -1); ConfigOptionsGroupShp new_optgroup(std::string title, int noncommon_label_width = -1);
}; };
@ -144,6 +142,7 @@ public:
void update_dirty(); void update_dirty();
void load_config(DynamicPrintConfig config); void load_config(DynamicPrintConfig config);
void reload_config(); void reload_config();
Field* get_field(t_config_option_key opt_key, int opt_index = -1) const;
}; };
//Slic3r::GUI::Tab::Print; //Slic3r::GUI::Tab::Print;
@ -154,6 +153,8 @@ public:
TabPrint(wxNotebook* parent, const char *title) : Tab(parent, title) {} TabPrint(wxNotebook* parent, const char *title) : Tab(parent, title) {}
~TabPrint(){} ~TabPrint(){}
bool m_support_material_overhangs_queried = false;
void build() override; void build() override;
void update() override; void update() override;
}; };