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

Time estimate shown in GUI as formatted string / Write to file made by class GCode's private methods

Browse source
This commit is contained in:
Enrico Turri 2017-12-14 09:18:28 +01:00
parent 20234c94ee
commit 0fe855cd6d
7 changed files with 146 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

22
xs/src/libslic3r/GCodeTimeEstimator.cpp
View file

@ -157,6 +157,16 @@ namespace Slic3r {
reset();
}
void GCodeTimeEstimator::calculate_time_from_lines(const std::vector<std::string>& gcode_lines)
{
for (const std::string& line : gcode_lines)
{
_parser.parse_line(line, boost::bind(&GCodeTimeEstimator::_process_gcode_line, this, _1, _2));
}
_calculate_time();
reset();
}
void GCodeTimeEstimator::add_gcode_line(const std::string& gcode_line)
{
_parser.parse_line(gcode_line, boost::bind(&GCodeTimeEstimator::_process_gcode_line, this, _1, _2));
@ -354,8 +364,14 @@ namespace Slic3r {
int minutes = (int)(timeinsecs / 60.0f);
timeinsecs -= (float)minutes * 60.0f;
char buffer[16];
::sprintf(buffer, "%02d:%02d:%02d", hours, minutes, (int)timeinsecs);
char buffer[64];
if (hours > 0)
::sprintf(buffer, "%dh %dm %ds", hours, minutes, (int)timeinsecs);
else if (minutes > 0)
::sprintf(buffer, "%dm %ds", minutes, (int)timeinsecs);
else
::sprintf(buffer, "%ds", (int)timeinsecs);
return buffer;
}
@ -393,7 +409,7 @@ namespace Slic3r {
{
if (line.cmd.length() > 1)
{
switch (line.cmd[0])
switch (::toupper(line.cmd[0]))
{
case 'G':
{