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

Checks to see if config option has been changed before going any further for several config options.

Browse Source 
N of 1 testing indicates that it may help with latency.
This commit is contained in:
Joseph Lenox 2018-04-17 21:55:44 -05:00
parent 7457cfdac2
commit c206ae77a3
1 changed files with 114 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
lib/Slic3r/GUI/PresetEditor.pm
View File

@ -4,7 +4,7 @@ use warnings;
use utf8; use utf8;
use File::Basename qw(basename); use File::Basename qw(basename);
use List::Util qw(first); use List::Util qw(first any);
use Wx qw(:bookctrl :dialog :keycode :icon :id :misc :panel :sizer :treectrl :window use Wx qw(:bookctrl :dialog :keycode :icon :id :misc :panel :sizer :treectrl :window
:button wxTheApp); :button wxTheApp);
use Wx::Event qw(EVT_BUTTON EVT_CHOICE EVT_KEY_DOWN EVT_TREE_SEL_CHANGED EVT_CHECKBOX); use Wx::Event qw(EVT_BUTTON EVT_CHOICE EVT_KEY_DOWN EVT_TREE_SEL_CHANGED EVT_CHECKBOX);
@ -147,12 +147,11 @@ sub on_value_change {
# propagate event to the parent # propagate event to the parent
sub _on_value_change { sub _on_value_change {
my ($self, $opt_key) = @_; my ($self, $opt_key) = @_;
wxTheApp->CallAfter(sub { wxTheApp->CallAfter(sub {
$self->current_preset->_dirty_config->apply($self->config); $self->current_preset->_dirty_config->apply($self->config);
$self->{on_value_change}->($opt_key) if $self->{on_value_change}; $self->{on_value_change}->($opt_key) if $self->{on_value_change};
$self->load_presets; $self->load_presets;
$self->_update; $self->_update($opt_key);
}); });
} }
@ -794,122 +793,141 @@ sub reload_config {
} }
sub _update { sub _update {
my ($self) = @_; my ($self, $key) = @_;
my $opt_key = $key;
$opt_key = "all_keys" if (length($key // '') == 0);
my $config = $self->{config}; my $config = $self->{config};
if (any { /$opt_key/ } qw(all_keys spiral_vase perimeters top_solid_layers fill_density support_material)) {
if ($config->spiral_vase && !($config->perimeters == 1 && $config->top_solid_layers == 0 && $config->fill_density == 0 && $config->support_material == 0)) { if ($config->spiral_vase && !($config->perimeters == 1 && $config->top_solid_layers == 0 && $config->fill_density == 0 && $config->support_material == 0)) {
my $dialog = Wx::MessageDialog->new($self, my $dialog = Wx::MessageDialog->new($self,
"The Spiral Vase mode requires:\n" "The Spiral Vase mode requires:\n"
. "- one perimeter\n" . "- one perimeter\n"
. "- no top solid layers\n" . "- no top solid layers\n"
. "- 0% fill density\n" . "- 0% fill density\n"
. "- no support material\n" . "- no support material\n"
. "\nShall I adjust those settings in order to enable Spiral Vase?", . "\nShall I adjust those settings in order to enable Spiral Vase?",
'Spiral Vase', wxICON_WARNING | wxYES | wxNO); 'Spiral Vase', wxICON_WARNING | wxYES | wxNO);
if ($dialog->ShowModal() == wxID_YES) { if ($dialog->ShowModal() == wxID_YES) {
my $new_conf = Slic3r::Config->new;
$new_conf->set("perimeters", 1);
$new_conf->set("top_solid_layers", 0);
$new_conf->set("fill_density", 0);
$new_conf->set("support_material", 0);
$self->_load_config($new_conf);
} else {
my $new_conf = Slic3r::Config->new;
$new_conf->set("spiral_vase", 0);
$self->_load_config($new_conf);
}
}
if ($config->support_material) {
# Ask only once.
if (! $self->{support_material_overhangs_queried}) {
$self->{support_material_overhangs_queried} = 1;
if ($config->overhangs != 1) {
my $dialog = Wx::MessageDialog->new($self,
"Supports work better, if the following feature is enabled:\n"
. "- Detect bridging perimeters\n"
. "\nShall I adjust those settings for supports?",
'Support Generator', wxICON_WARNING | wxYES | wxNO | wxCANCEL);
my $answer = $dialog->ShowModal();
my $new_conf = Slic3r::Config->new; my $new_conf = Slic3r::Config->new;
if ($answer == wxID_YES) { $new_conf->set("perimeters", 1);
# Enable "detect bridging perimeters". $new_conf->set("top_solid_layers", 0);
$new_conf->set("overhangs", 1); $new_conf->set("fill_density", 0);
} elsif ($answer == wxID_NO) { $new_conf->set("support_material", 0);
# Do nothing, leave supports on and "detect bridging perimeters" off. $self->_load_config($new_conf);
} elsif ($answer == wxID_CANCEL) { } else {
# Disable supports. my $new_conf = Slic3r::Config->new;
$new_conf->set("support_material", 0); $new_conf->set("spiral_vase", 0);
$self->{support_material_overhangs_queried} = 0;
}
$self->_load_config($new_conf); $self->_load_config($new_conf);
} }
} }
} else { }
$self->{support_material_overhangs_queried} = 0;
if (any { /$opt_key/ } qw(all_keys support_material)) {
if ($config->support_material) {
# Ask only once.
if (! $self->{support_material_overhangs_queried}) {
$self->{support_material_overhangs_queried} = 1;
if ($config->overhangs != 1) {
my $dialog = Wx::MessageDialog->new($self,
"Supports work better, if the following feature is enabled:\n"
. "- Detect bridging perimeters\n"
. "\nShall I adjust those settings for supports?",
'Support Generator', wxICON_WARNING | wxYES | wxNO | wxCANCEL);
my $answer = $dialog->ShowModal();
my $new_conf = Slic3r::Config->new;
if ($answer == wxID_YES) {
# Enable "detect bridging perimeters".
$new_conf->set("overhangs", 1);
} elsif ($answer == wxID_NO) {
# Do nothing, leave supports on and "detect bridging perimeters" off.
} elsif ($answer == wxID_CANCEL) {
# Disable supports.
$new_conf->set("support_material", 0);
$self->{support_material_overhangs_queried} = 0;
}
$self->_load_config($new_conf);
}
}
} else {
$self->{support_material_overhangs_queried} = 0;
}
} }
if ($config->fill_density == 100 if (any { /$opt_key/ } qw(all_keys fill_density fill_pattern top_infill_pattern)) {
&& !first { $_ eq $config->fill_pattern } @{$Slic3r::Config::Options->{top_infill_pattern}{values}}) { if ($config->fill_density == 100
my $dialog = Wx::MessageDialog->new($self, && !first { $_ eq $config->fill_pattern } @{$Slic3r::Config::Options->{top_infill_pattern}{values}}) {
"The " . $config->fill_pattern . " infill pattern is not supposed to work at 100% density.\n" my $dialog = Wx::MessageDialog->new($self,
. "\nShall I switch to rectilinear fill pattern?", "The " . $config->fill_pattern . " infill pattern is not supposed to work at 100% density.\n"
'Infill', wxICON_WARNING | wxYES | wxNO); . "\nShall I switch to rectilinear fill pattern?",
'Infill', wxICON_WARNING | wxYES | wxNO);
my $new_conf = Slic3r::Config->new;
if ($dialog->ShowModal() == wxID_YES) { my $new_conf = Slic3r::Config->new;
$new_conf->set("fill_pattern", 'rectilinear'); if ($dialog->ShowModal() == wxID_YES) {
} else { $new_conf->set("fill_pattern", 'rectilinear');
$new_conf->set("fill_density", 40); } else {
$new_conf->set("fill_density", 40);
}
$self->_load_config($new_conf);
} }
$self->_load_config($new_conf);
} }
my $have_perimeters = $config->perimeters > 0; my $have_perimeters = $config->perimeters > 0;
$self->get_field($_)->toggle($have_perimeters) if (any { /$opt_key/ } qw(all_keys perimeters)) {
for qw(extra_perimeters thin_walls overhangs seam_position external_perimeters_first $self->get_field($_)->toggle($have_perimeters)
external_perimeter_extrusion_width for qw(extra_perimeters thin_walls overhangs seam_position external_perimeters_first
perimeter_speed small_perimeter_speed external_perimeter_speed); external_perimeter_extrusion_width
perimeter_speed small_perimeter_speed external_perimeter_speed);
}
my $have_adaptive_slicing = $config->adaptive_slicing; my $have_adaptive_slicing = $config->adaptive_slicing;
$self->get_field($_)->toggle($have_adaptive_slicing) if (any { /$opt_key/ } qw(all_keys adaptive_slicing)) {
for qw(adaptive_slicing_quality match_horizontal_surfaces); $self->get_field($_)->toggle($have_adaptive_slicing)
$self->get_field($_)->toggle(!$have_adaptive_slicing) for qw(adaptive_slicing_quality match_horizontal_surfaces);
for qw(layer_height); $self->get_field($_)->toggle(!$have_adaptive_slicing)
for qw(layer_height);
}
my $have_infill = $config->fill_density > 0; my $have_infill = $config->fill_density > 0;
# infill_extruder uses the same logic as in Print::extruders() if (any { /$opt_key/ } qw(all_keys fill_density)) {
$self->get_field($_)->toggle($have_infill) # infill_extruder uses the same logic as in Print::extruders()
for qw(fill_pattern infill_every_layers infill_only_where_needed solid_infill_every_layers $self->get_field($_)->toggle($have_infill)
solid_infill_below_area infill_extruder); for qw(fill_pattern infill_every_layers infill_only_where_needed solid_infill_every_layers
solid_infill_below_area infill_extruder);
}
my $have_solid_infill = ($config->top_solid_layers > 0) || ($config->bottom_solid_layers > 0); 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() if (any { /$opt_key/ } qw(all_keys top_solid_layers bottom_solid_layers)) {
$self->get_field($_)->toggle($have_solid_infill) # solid_infill_extruder uses the same logic as in Print::extruders()
for qw(top_infill_pattern bottom_infill_pattern infill_first solid_infill_extruder $self->get_field($_)->toggle($have_solid_infill)
solid_infill_extrusion_width solid_infill_speed); for qw(top_infill_pattern bottom_infill_pattern infill_first solid_infill_extruder
solid_infill_extrusion_width solid_infill_speed);
$self->get_field($_)->toggle($have_infill || $have_solid_infill) }
for qw(fill_angle infill_extrusion_width infill_speed bridge_speed);
if (any { /$opt_key/ } qw(all_keys top_solid_layers bottom_solid_layers fill_density)) {
$self->get_field('fill_gaps')->toggle($have_perimeters && $have_infill); $self->get_field($_)->toggle($have_infill || $have_solid_infill)
$self->get_field('gap_fill_speed')->toggle($have_perimeters && $have_infill && $config->fill_gaps); for qw(fill_angle infill_extrusion_width infill_speed bridge_speed);
}
if (any { /$opt_key/ } qw(all_keys fill_density perimeters)) {
$self->get_field('fill_gaps')->toggle($have_perimeters && $have_infill);
$self->get_field('gap_fill_speed')->toggle($have_perimeters && $have_infill && $config->fill_gaps);
}
my $have_top_solid_infill = $config->top_solid_layers > 0; my $have_top_solid_infill = $config->top_solid_layers > 0;
$self->get_field($_)->toggle($have_top_solid_infill) $self->get_field($_)->toggle($have_top_solid_infill)
for qw(top_infill_extrusion_width top_solid_infill_speed); for qw(top_infill_extrusion_width top_solid_infill_speed);
my $have_autospeed = any { $config->get("${_}_speed") eq '0' } my $have_autospeed = any { $config->get("${_}_speed") eq '0' }
qw(perimeter external_perimeter small_perimeter qw(perimeter external_perimeter small_perimeter
infill solid_infill top_solid_infill gap_fill support_material infill solid_infill top_solid_infill gap_fill support_material
support_material_interface); support_material_interface);
$self->get_field('max_print_speed')->toggle($have_autospeed); $self->get_field('max_print_speed')->toggle($have_autospeed);
my $have_default_acceleration = $config->default_acceleration > 0; my $have_default_acceleration = $config->default_acceleration > 0;
$self->get_field($_)->toggle($have_default_acceleration) $self->get_field($_)->toggle($have_default_acceleration)
for qw(perimeter_acceleration infill_acceleration bridge_acceleration first_layer_acceleration); for qw(perimeter_acceleration infill_acceleration bridge_acceleration first_layer_acceleration);
my $have_skirt = $config->skirts > 0 || $config->min_skirt_length > 0; my $have_skirt = $config->skirts > 0 || $config->min_skirt_length > 0;
$self->get_field($_)->toggle($have_skirt) $self->get_field($_)->toggle($have_skirt)
for qw(skirt_distance skirt_height); for qw(skirt_distance skirt_height);