3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into fs_emboss

Browse Source
This commit is contained in:
Filip Sykala 2021-10-21 08:36:46 +02:00
commit 943ad1a5c7
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode.cpp
View File

@ -2807,7 +2807,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
gcode += this->unretract(); gcode += this->unretract();
// adjust acceleration // adjust acceleration
{ if (m_config.default_acceleration.value > 0) {
double acceleration; double acceleration;
if (this->on_first_layer() && m_config.first_layer_acceleration.value > 0) { if (this->on_first_layer() && m_config.first_layer_acceleration.value > 0) {
acceleration = m_config.first_layer_acceleration.value; acceleration = m_config.first_layer_acceleration.value;

2
src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
View File

@ -621,7 +621,7 @@ RENDER_AGAIN:
ImGui::PushItemWidth(window_width - diameter_slider_left); ImGui::PushItemWidth(window_width - diameter_slider_left);
float diam = 2.f * m_new_hole_radius; 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 // 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 // than the slider. This allows entering off-scale values and still protects against
//complete non-sense. //complete non-sense.

12
src/slic3r/GUI/PresetHints.cpp
View File

@ -34,11 +34,17 @@ std::string PresetHints::cooling_description(const Preset &preset)
"so that no less than %3%s are spent on that layer " "so that no less than %3%s are spent on that layer "
"(however, speed will never be reduced below %4%mm/s)."), "(however, speed will never be reduced below %4%mm/s)."),
slowdown_below_layer_time, max_fan_speed, slowdown_below_layer_time, min_print_speed); slowdown_below_layer_time, max_fan_speed, slowdown_below_layer_time, min_print_speed);
if (fan_below_layer_time > slowdown_below_layer_time) if (fan_below_layer_time > slowdown_below_layer_time) {
out += "\n" + out += "\n";
GUI::format(_L("If estimated layer time is greater, but still below ~%1%s, " 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 will run at a proportionally decreasing speed between %2%%% and %3%%%."),
fan_below_layer_time, max_fan_speed, min_fan_speed); 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"; out += "\n";
} }
if (preset.config.opt_bool("fan_always_on", 0)) { if (preset.config.opt_bool("fan_always_on", 0)) {