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

Added absolute time to estimated time for color print and fixed a bug in showing estimated times for print color for silent mode

Browse source
This commit is contained in:
Enrico Turri 2019-08-02 12:05:02 +02:00
parent 28cc595350
commit c791ba776f
4 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libslic3r/GCodeTimeEstimator.cpp
View file

@ -694,22 +694,38 @@ namespace Slic3r {
return m_color_times;
}
std::vector<std::string> GCodeTimeEstimator::get_color_times_dhms() const
std::vector<std::string> GCodeTimeEstimator::get_color_times_dhms(bool include_absolute) const
{
std::vector<std::string> ret;
float total_time = 0.0f;
for (float t : m_color_times)
{
ret.push_back(_get_time_dhms(t));
total_time += t;
std::string time = "";
if (include_absolute)
time += _get_time_dhms(total_time) + " (";
time += _get_time_dhms(t);
if (include_absolute)
time += ")";
ret.push_back(time);
}
return ret;
}
std::vector<std::string> GCodeTimeEstimator::get_color_times_minutes() const
std::vector<std::string> GCodeTimeEstimator::get_color_times_minutes(bool include_absolute) const
{
std::vector<std::string> ret;
float total_time = 0.0f;
for (float t : m_color_times)
{
ret.push_back(_get_time_minutes(t));
total_time += t;
std::string time = "";
if (include_absolute)
time += _get_time_minutes(total_time) + " (";
time += _get_time_minutes(t);
if (include_absolute)
time += ")";
ret.push_back(time);
}
return ret;
}