3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed post-processing of placeholders in gcode when not exporting remaining times

Browse Source
This commit is contained in:
enricoturri1966 2020-11-03 12:26:48 +01:00
parent f94e94f53e
commit 8af25f7771
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -363,7 +363,7 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename)
std::string ret; std::string ret;
if (line == First_Line_M73_Placeholder_Tag || line == Last_Line_M73_Placeholder_Tag) { if (export_remaining_time_enabled && (line == First_Line_M73_Placeholder_Tag || line == Last_Line_M73_Placeholder_Tag)) {
for (size_t i = 0; i < static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Count); ++i) { for (size_t i = 0; i < static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Count); ++i) {
const TimeMachine& machine = machines[i]; const TimeMachine& machine = machines[i];
if (machine.enabled) { if (machine.enabled) {
@ -376,10 +376,11 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename)
else if (line == Estimated_Printing_Time_Placeholder_Tag) { else if (line == Estimated_Printing_Time_Placeholder_Tag) {
for (size_t i = 0; i < static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Count); ++i) { for (size_t i = 0; i < static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Count); ++i) {
const TimeMachine& machine = machines[i]; const TimeMachine& machine = machines[i];
if (machine.enabled) { PrintEstimatedTimeStatistics::ETimeMode mode = static_cast<PrintEstimatedTimeStatistics::ETimeMode>(i);
if (mode == PrintEstimatedTimeStatistics::ETimeMode::Normal || machine.enabled) {
char buf[128]; char buf[128];
sprintf(buf, "; estimated printing time (%s mode) = %s\n", sprintf(buf, "; estimated printing time (%s mode) = %s\n",
(static_cast<PrintEstimatedTimeStatistics::ETimeMode>(i) == PrintEstimatedTimeStatistics::ETimeMode::Normal) ? "normal" : "silent", (mode == PrintEstimatedTimeStatistics::ETimeMode::Normal) ? "normal" : "silent",
get_time_dhms(machine.time).c_str()); get_time_dhms(machine.time).c_str());
ret += buf; ret += buf;
} }
@ -405,21 +406,23 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename)
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 = [&]() {
for (size_t i = 0; i < static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Count); ++i) { if (export_remaining_time_enabled) {
const TimeMachine& machine = machines[i]; for (size_t i = 0; i < static_cast<size_t>(PrintEstimatedTimeStatistics::ETimeMode::Count); ++i) {
if (machine.enabled) { const TimeMachine& machine = machines[i];
// Skip all machine.g1_times_cache below g1_lines_counter. if (machine.enabled) {
auto& it = g1_times_cache_it[i]; // Skip all machine.g1_times_cache below g1_lines_counter.
while (it != machine.g1_times_cache.end() && it->id < g1_lines_counter) auto& it = g1_times_cache_it[i];
++ it; while (it != machine.g1_times_cache.end() && it->id < g1_lines_counter)
if (it != machine.g1_times_cache.end() && it->id == g1_lines_counter) { ++it;
float elapsed_time = it->elapsed_time; if (it != machine.g1_times_cache.end() && it->id == g1_lines_counter) {
std::pair<int, int> to_export = { int(100.0f * elapsed_time / machine.time), float elapsed_time = it->elapsed_time;
time_in_minutes(machine.time - elapsed_time) }; std::pair<int, int> to_export = { int(100.0f * elapsed_time / machine.time),
if (last_exported[i] != to_export) { time_in_minutes(machine.time - elapsed_time) };
export_line += format_line_M73(machine.line_m73_mask.c_str(), if (last_exported[i] != to_export) {
to_export.first, to_export.second); export_line += format_line_M73(machine.line_m73_mask.c_str(),
last_exported[i] = to_export; to_export.first, to_export.second);
last_exported[i] = to_export;
}
} }
} }
} }
@ -805,8 +808,7 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
update_estimated_times_stats(); update_estimated_times_stats();
// post-process to add M73 lines into the gcode // post-process to add M73 lines into the gcode
if (m_time_processor.export_remaining_time_enabled) m_time_processor.post_process(filename);
m_time_processor.post_process(filename);
#if ENABLE_GCODE_VIEWER_DATA_CHECKING #if ENABLE_GCODE_VIEWER_DATA_CHECKING
std::cout << "\n"; std::cout << "\n";