amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Pimped up GCodeProcessor::TimeProcessor::post_process():

Browse source 
replaced implicit lambda capture with explicit listing of captured
context for readability and code correctness. Captured this as const.
This commit is contained in:
Vojtech Bubnik 2021-09-06 18:08:13 +02:00
parent b41e321473
commit 428509ac00
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libslic3r/GCode/GCodeProcessor.cpp
View file

@ -476,11 +476,19 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename, st
g1_times_cache_it.emplace_back(machine.g1_times_cache.begin()); g1_times_cache_it.emplace_back(machine.g1_times_cache.begin());
// add lines M73 to exported gcode // add lines M73 to exported gcode
auto process_line_G1 = [&]() { auto process_line_G1 = [
// Lambdas, mostly for string formatting, all with an empty capture block.
time_in_minutes, format_time_float, format_line_M73_main, format_line_M73_stop_int, format_line_M73_stop_float, time_in_last_minute,
&self = std::as_const(*this),
// Caches, to be modified
&g1_times_cache_it, &last_exported_main, &last_exported_stop,
// String output
&export_line]
(const size_t g1_lines_counter) {
unsigned int exported_lines_count = 0; unsigned int exported_lines_count = 0;
if (export_remaining_time_enabled) { if (self.export_remaining_time_enabled) {
for (size_t i = 0; i < static_cast<size_t>(PrintEstimatedStatistics::ETimeMode::Count); ++i) { for (size_t i = 0; i < static_cast<size_t>(PrintEstimatedStatistics::ETimeMode::Count); ++i) {
const TimeMachine& machine = machines[i]; const TimeMachine& machine = self.machines[i];
if (machine.enabled) { if (machine.enabled) {
// export pair <percent, remaining time> // export pair <percent, remaining time>
// Skip all machine.g1_times_cache below g1_lines_counter. // Skip all machine.g1_times_cache below g1_lines_counter.
@ -581,8 +589,7 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename, st
parser.parse_line(gcode_line, parser.parse_line(gcode_line,
[&](GCodeReader& reader, const GCodeReader::GCodeLine& line) { [&](GCodeReader& reader, const GCodeReader::GCodeLine& line) {
if (line.cmd_is("G1")) { if (line.cmd_is("G1")) {
unsigned int extra_lines_count = process_line_G1(); unsigned int extra_lines_count = process_line_G1(g1_lines_counter ++);
++g1_lines_counter;
if (extra_lines_count > 0) if (extra_lines_count > 0)
offsets.push_back({ line_id, extra_lines_count }); offsets.push_back({ line_id, extra_lines_count });
} }