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

ENABLE_GCODE_VIEWER -> Integration of time estimator into GCodeProcessor

Browse source
This commit is contained in:
enricoturri1966 2020-07-16 11:09:21 +02:00
parent 755fdb5ab4
commit 3a88e69896
9 changed files with 1631 additions and 704 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libslic3r/GCodeTimeEstimator.cpp
View file

@ -678,21 +678,6 @@ namespace Slic3r {
return _get_time_minutes(get_time());
}
#if ENABLE_GCODE_VIEWER
std::vector<std::pair<CustomGCode::Type, std::pair<float, float>>> GCodeTimeEstimator::get_custom_gcode_times(bool include_remaining) const
{
std::vector<std::pair<CustomGCode::Type, std::pair<float, float>>> ret;
float total_time = 0.0f;
for (const auto& [type, time] : m_custom_gcode_times) {
float remaining = include_remaining ? m_time - total_time : 0.0f;
ret.push_back({ type, { time, remaining } });
total_time += time;
}
return ret;
}
#else
std::vector<std::pair<CustomGCode::Type, float>> GCodeTimeEstimator::get_custom_gcode_times() const
{
return m_custom_gcode_times;
@ -736,7 +721,6 @@ namespace Slic3r {
}
return ret;
}
#endif // ENABLE_GCODE_VIEWER
#if ENABLE_GCODE_VIEWER
std::vector<std::pair<CustomGCode::Type, std::pair<std::string, std::string>>> GCodeTimeEstimator::get_custom_gcode_times_dhm(bool include_remaining) const