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

fix filament_max_volumetric_speed (from 8e4e8023c091e870b2079bcde996cfa7e6a69411)

Browse Source 
supermerill/SuperSlicer#1470
also better translation strings
This commit is contained in:
supermerill 2021-08-12 18:39:46 +02:00 committed by supermerill
parent 666856a010
commit a510c3039c
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode.cpp
View File

@ -3878,7 +3878,7 @@ std::string GCode::_before_extrude(const ExtrusionPath &path, const std::string
}
double filament_max_volumetric_speed = EXTRUDER_CONFIG_WITH_DEFAULT(filament_max_volumetric_speed, 0);
if (filament_max_volumetric_speed > 0) {
speed = std::min(filament_max_volumetric_speed, speed);
speed = std::min(filament_max_volumetric_speed / path.mm3_per_mm, speed);
}
double filament_max_speed = EXTRUDER_CONFIG_WITH_DEFAULT(filament_max_speed, 0);
if (filament_max_speed > 0) {

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

@ -297,17 +297,19 @@ std::string PresetHints::maximum_volumetric_flow_description(const PresetBundle
//FIXME handle gap_fill_speed
if (! out.empty())
out += "\n";
out += (first_layer ? _utf8(L("First layer volumetric")) : (bridging ? _utf8(L("Bridging volumetric")) : _utf8(L("Volumetric"))));
out += " " + _utf8(L("flow rate is maximized")) + " ";
bool limited_by_max_volumetric_speed = max_volumetric_speed > 0 && max_volumetric_speed < max_flow;
out += (limited_by_max_volumetric_speed ?
_utf8(L("by the print profile maximum")) :
(_utf8(L("when printing"))+ " " + max_flow_extrusion_type))
+ " " + _utf8(L("with a volumetric rate"))+ " ";
if (limited_by_max_volumetric_speed)
max_flow = max_volumetric_speed;
out += (boost::format(_utf8(L("%3.2f mm³/s at filament speed %3.2f mm/s."))) % max_flow % (max_flow / filament_crossection)).str();
std::string pattern = (boost::format(_u8L("%s flow rate is maximized "))
% (first_layer ? _u8L("First layer volumetric") : (bridging ? _u8L("Bridging volumetric") : _u8L("Volumetric")))).str();
std::string pattern2;
if (limited_by_max_volumetric_speed)
pattern2 = (boost::format(_u8L("by the print profile maximum volumetric rate of %3.2f mm³/s at filament speed %3.2f mm/s."))
% max_volumetric_speed % (max_volumetric_speed / filament_crossection)).str();
else
pattern2 = (boost::format(_u8L("when printing %s with a volumetric rate of %3.2f mm³/s at filament speed %3.2f mm/s."))
% max_flow_extrusion_type % max_flow % (max_flow / filament_crossection)).str();
out += pattern + " " + pattern2;
}
return out;