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

Slightly faster time estimation

Browse source
This commit is contained in:
Enrico Turri 2018-07-20 12:05:08 +02:00
parent c1d1721dae
commit 4b8e10a05c
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/src/libslic3r/GCode.cpp
View file

@ -863,9 +863,9 @@ void GCode::_do_export(Print &print, FILE *file, GCodePreviewData *preview_data)
_write(file, m_writer.postamble()); _write(file, m_writer.postamble());
// calculates estimated printing time // calculates estimated printing time
m_normal_time_estimator.calculate_time(); m_normal_time_estimator.calculate_time(false);
if (m_silent_time_estimator_enabled) if (m_silent_time_estimator_enabled)
m_silent_time_estimator.calculate_time(); m_silent_time_estimator.calculate_time(false);
// Get filament stats. // Get filament stats.
print.filament_stats.clear(); print.filament_stats.clear();

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

@ -196,11 +196,14 @@ namespace Slic3r {
} }
} }
void GCodeTimeEstimator::calculate_time() void GCodeTimeEstimator::calculate_time(bool start_from_beginning)
{ {
PROFILE_FUNC(); PROFILE_FUNC();
_reset_time(); if (start_from_beginning)
_set_blocks_st_synchronize(false); {
_reset_time();
_set_blocks_st_synchronize(false);
}
_calculate_time(); _calculate_time();
#if ENABLE_MOVE_STATS #if ENABLE_MOVE_STATS

5
xs/src/libslic3r/GCodeTimeEstimator.hpp
View file

@ -227,7 +227,10 @@ namespace Slic3r {
void add_gcode_block(const std::string &str) { this->add_gcode_block(str.c_str()); } void add_gcode_block(const std::string &str) { this->add_gcode_block(str.c_str()); }
// Calculates the time estimate from the gcode lines added using add_gcode_line() or add_gcode_block() // Calculates the time estimate from the gcode lines added using add_gcode_line() or add_gcode_block()
void calculate_time(); // start_from_beginning:
// if set to true all blocks will be used to calculate the time estimate,
// if set to false only the blocks not yet processed will be used and the calculated time will be added to the current calculated time
void calculate_time(bool start_from_beginning);
// Calculates the time estimate from the given gcode in string format // Calculates the time estimate from the given gcode in string format
void calculate_time_from_text(const std::string& gcode); void calculate_time_from_text(const std::string& gcode);