From 32ba66c48f8552a1f2116d35834bf6d85b91a39c Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 22 Nov 2016 18:46:32 +0100 Subject: [PATCH] Don't grey out the retract_speed option when using firmware retraction because it's still used by auto-speed pressure regulator. #3283 --- lib/Slic3r/GUI/Tab.pm | 7 ++++++- xs/src/libslic3r/PrintConfig.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm index fe4c7e4523..91f6e92730 100644 --- a/lib/Slic3r/GUI/Tab.pm +++ b/lib/Slic3r/GUI/Tab.pm @@ -1385,7 +1385,12 @@ sub _update { # some options only apply when not using firmware retraction $self->get_field($_, $i)->toggle($retraction && !$config->use_firmware_retraction) - for qw(retract_speed retract_restart_extra wipe); + for qw(retract_restart_extra wipe); + + # retraction speed is also used by auto-speed pressure regulator, even when + # user enabled firmware retraction + $self->get_field('retract_speed', $i)->toggle($retraction); + if ($config->use_firmware_retraction && $config->get_at('wipe', $i)) { my $dialog = Wx::MessageDialog->new($self, "The Wipe option is not available when using the Firmware Retraction mode.\n" diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp index b9e68cf883..97c6f1f92f 100644 --- a/xs/src/libslic3r/PrintConfig.cpp +++ b/xs/src/libslic3r/PrintConfig.cpp @@ -882,7 +882,7 @@ PrintConfigDef::PrintConfigDef() def = this->add("retract_speed", coFloats); def->label = "Speed"; def->full_label = "Retraction Speed"; - def->tooltip = "The speed for retractions (it only applies to the extruder motor)."; + def->tooltip = "The speed for retractions (it only applies to the extruder motor). If you use the Firmware Retraction option, please note this value still affects the auto-speed pressure regulator."; def->sidetext = "mm/s"; def->cli = "retract-speed=f@"; {