From cde4d16f4a60bfb7c525944d35f27d796c36dda2 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Thu, 2 Nov 2023 13:14:43 +0100 Subject: [PATCH 1/2] Fix of #11089: nozzle digging into the print when 'wipe_tower_no_sparse_layers' was enabled --- src/libslic3r/GCode/WipeTowerIntegration.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/GCode/WipeTowerIntegration.cpp b/src/libslic3r/GCode/WipeTowerIntegration.cpp index aa0e57562e..7ad3ee518b 100644 --- a/src/libslic3r/GCode/WipeTowerIntegration.cpp +++ b/src/libslic3r/GCode/WipeTowerIntegration.cpp @@ -54,7 +54,8 @@ std::string WipeTowerIntegration::append_tcr(GCodeGenerator &gcodegen, const Wip const bool should_travel_to_tower = ! tcr.priming && (tcr.force_travel // wipe tower says so || ! needs_toolchange // this is just finishing the tower with no toolchange - || is_ramming); + || is_ramming + || will_go_down); // don't dig into the print if (should_travel_to_tower) { gcode += gcodegen.retract(); gcodegen.m_avoid_crossing_perimeters.use_external_mp_once(); From 57b5b8814b4c6b34fd9be560be792d76ba4e57c4 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 3 Nov 2023 10:36:08 +0100 Subject: [PATCH 2/2] Fix for #11574 > 2.7.0-a1 Temperature Variation Input --- src/slic3r/GUI/Widgets/SpinInput.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp index f8471bf7b7..a012140400 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.cpp +++ b/src/slic3r/GUI/Widgets/SpinInput.cpp @@ -286,7 +286,7 @@ void SpinInput::Create(wxWindow *parent, state_handler.attach({&label_color, &text_color}); state_handler.update_binds(); - text_ctrl = new wxTextCtrl(this, wxID_ANY, text, {20, 4}, wxDefaultSize, style | wxBORDER_NONE | wxTE_PROCESS_ENTER, wxTextValidator(wxFILTER_DIGITS)); + text_ctrl = new wxTextCtrl(this, wxID_ANY, text, {20, 4}, wxDefaultSize, style | wxBORDER_NONE | wxTE_PROCESS_ENTER, wxTextValidator(wxFILTER_NUMERIC)); #ifdef __WXOSX__ text_ctrl->OSXDisableAllSmartSubstitutions(); #endif // __WXOSX__ @@ -462,7 +462,7 @@ void SpinInputDouble::Create(wxWindow *parent, state_handler.attach({&label_color, &text_color}); state_handler.update_binds(); - text_ctrl = new wxTextCtrl(this, wxID_ANY, text, {20, 4}, wxDefaultSize, style | wxBORDER_NONE | wxTE_PROCESS_ENTER, wxTextValidator(wxFILTER_DIGITS)); + text_ctrl = new wxTextCtrl(this, wxID_ANY, text, {20, 4}, wxDefaultSize, style | wxBORDER_NONE | wxTE_PROCESS_ENTER, wxTextValidator(wxFILTER_NUMERIC)); #ifdef __WXOSX__ text_ctrl->OSXDisableAllSmartSubstitutions(); #endif // __WXOSX__