From 482841b39e4210a6d737fb3b059f0c55a61a5114 Mon Sep 17 00:00:00 2001
From: Justin Schuh <jschuh@users.noreply.github.com>
Date: Fri, 23 Jul 2021 07:16:21 -0700
Subject: [PATCH 1/3] Disable acceleration control if default_acceleration is
zero
---
src/libslic3r/GCode.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index ff0a7c027..116fcbe7f 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2807,7 +2807,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
gcode += this->unretract();
// adjust acceleration
- {
+ if (m_config.default_acceleration.value > 0) {
double acceleration;
if (this->on_first_layer() && m_config.first_layer_acceleration.value > 0) {
acceleration = m_config.first_layer_acceleration.value;
From 97d3c3e00afd801809fe90e9683d218cf8434cb8 Mon Sep 17 00:00:00 2001
From: Hannes Hauswedell <h2+github.com@fsfe.org>
Date: Sun, 21 Feb 2021 17:58:17 +0000
Subject: [PATCH 2/3] GLGizmoHollow: Increase hole diameter slider range (PR
#6101)
---
src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
index d45a2e613..614e83811 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
@@ -621,7 +621,7 @@ RENDER_AGAIN:
ImGui::PushItemWidth(window_width - diameter_slider_left);
float diam = 2.f * m_new_hole_radius;
- m_imgui->slider_float("##hole_diameter", &diam, 1.f, 15.f, "%.1f mm", 1.f, false);
+ m_imgui->slider_float("##hole_diameter", &diam, 1.f, 25.f, "%.1f mm", 1.f, false);
// Let's clamp the value (which could have been entered by keyboard) to a larger range
// than the slider. This allows entering off-scale values and still protects against
//complete non-sense.
From fc5560aac2a093948b51860c8a23458c37bb6381 Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Wed, 20 Oct 2021 21:59:07 +0200
Subject: [PATCH 3/3] Fix of #3270 (Confusing cooling hint when min and max fan
speed are equal)
---
src/slic3r/GUI/PresetHints.cpp | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp
index 5c5ed2612..ce709d9eb 100644
--- a/src/slic3r/GUI/PresetHints.cpp
+++ b/src/slic3r/GUI/PresetHints.cpp
@@ -34,11 +34,17 @@ std::string PresetHints::cooling_description(const Preset &preset)
"so that no less than %3%s are spent on that layer "
"(however, speed will never be reduced below %4%mm/s)."),
slowdown_below_layer_time, max_fan_speed, slowdown_below_layer_time, min_print_speed);
- if (fan_below_layer_time > slowdown_below_layer_time)
- out += "\n" +
- GUI::format(_L("If estimated layer time is greater, but still below ~%1%s, "
+ if (fan_below_layer_time > slowdown_below_layer_time) {
+ out += "\n";
+ if (min_fan_speed != max_fan_speed)
+ out += GUI::format(_L("If estimated layer time is greater, but still below ~%1%s, "
"fan will run at a proportionally decreasing speed between %2%%% and %3%%%."),
fan_below_layer_time, max_fan_speed, min_fan_speed);
+ else
+ out += GUI::format(_L("If estimated layer time is greater, but still below ~%1%s, "
+ "fan will run at %2%%%"),
+ fan_below_layer_time, min_fan_speed);
+ }
out += "\n";
}
if (preset.config.opt_bool("fan_always_on", 0)) {