3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 00:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ENH:refine GcodeViewer

Browse source 
1.recalculate layout of filament page
2.add fan speed and temperature page
3.fix that value of time and percent too small to display correctly

Change-Id: I5d0cfaea03aa6e9286fe2d7243de7dd413fe7982
This commit is contained in:
liz.li 2022-10-25 18:21:31 +08:00 • committed by Lane.Wei
parent 5761f8c050
commit e27a1cdd9b
4 changed files with 315 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libslic3r/Utils.hpp
View file

@ -346,7 +346,7 @@ inline std::string short_time(const std::string &time)
int days = 0;
int hours = 0;
int minutes = 0;
int seconds = 0;
float seconds = 0;
if (time.find('d') != std::string::npos)
::sscanf(time.c_str(), "%dd %dh %dm %ds", &days, &hours, &minutes, &seconds);
else if (time.find('h') != std::string::npos)
@ -354,7 +354,7 @@ inline std::string short_time(const std::string &time)
else if (time.find('m') != std::string::npos)
::sscanf(time.c_str(), "%dm %ds", &minutes, &seconds);
else if (time.find('s') != std::string::npos)
::sscanf(time.c_str(), "%ds", &seconds);
::sscanf(time.c_str(), "%fs", &seconds);
// Round to full minutes.
if (days + hours + minutes > 0 && seconds >= 30) {
if (++minutes == 60) {
@ -372,9 +372,13 @@ inline std::string short_time(const std::string &time)
else if (hours > 0)
::sprintf(buffer, "%dh%dm", hours, minutes);
else if (minutes > 0)
::sprintf(buffer, "%dm%ds", minutes, seconds);
else
::sprintf(buffer, "%ds", seconds);
::sprintf(buffer, "%dm%ds", minutes, (int)seconds);
else if (seconds > 1)
::sprintf(buffer, "%ds", (int)seconds);
else if (seconds > 0)
::sprintf(buffer, "<1s");
else if (seconds == 0)
::sprintf(buffer, "0s");
return buffer;
}
@ -395,8 +399,10 @@ inline std::string get_time_dhms(float time_in_secs)
::sprintf(buffer, "%dh %dm %ds", hours, minutes, (int)time_in_secs);
else if (minutes > 0)
::sprintf(buffer, "%dm %ds", minutes, (int)time_in_secs);
else
else if (time_in_secs > 1)
::sprintf(buffer, "%ds", (int)time_in_secs);
else
::sprintf(buffer, "%fs", time_in_secs);
return buffer;
}