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

Follow-up of 573194e059 -> Fixed crash when opening a gcode file

Browse Source
This commit is contained in:
enricoturri1966 2020-09-07 11:30:31 +02:00
parent 014a90b51b
commit 8579184d70
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -759,13 +759,16 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
// process gcode // process gcode
m_result.id = ++s_result_id; m_result.id = ++s_result_id;
// 1st move must be a dummy move
m_result.moves.emplace_back(MoveVertex()); m_result.moves.emplace_back(MoveVertex());
m_parser.parse_file(filename, [this, cancel_callback, &last_cancel_callback_time](GCodeReader& reader, const GCodeReader::GCodeLine& line) { m_parser.parse_file(filename, [this, cancel_callback, &last_cancel_callback_time](GCodeReader& reader, const GCodeReader::GCodeLine& line) {
auto curr_time = std::chrono::high_resolution_clock::now(); if (cancel_callback != nullptr) {
// call the cancel callback every 100 ms // call the cancel callback every 100 ms
if (std::chrono::duration_cast<std::chrono::milliseconds>(curr_time - last_cancel_callback_time).count() > 100) { auto curr_time = std::chrono::high_resolution_clock::now();
cancel_callback(); if (std::chrono::duration_cast<std::chrono::milliseconds>(curr_time - last_cancel_callback_time).count() > 100) {
last_cancel_callback_time = curr_time; cancel_callback();
last_cancel_callback_time = curr_time;
}
} }
process_gcode_line(line); process_gcode_line(line);
}); });

2
src/libslic3r/GCode/GCodeProcessor.hpp
View File

@ -420,7 +420,7 @@ namespace Slic3r {
// Process the gcode contained in the file with the given filename // Process the gcode contained in the file with the given filename
// throws CanceledException through print->throw_if_canceled() (sent by the caller as callback). // throws CanceledException through print->throw_if_canceled() (sent by the caller as callback).
void process_file(const std::string& filename, std::function<void()> cancel_callback = std::function<void()>()); void process_file(const std::string& filename, std::function<void()> cancel_callback = nullptr);
float get_time(PrintEstimatedTimeStatistics::ETimeMode mode) const; float get_time(PrintEstimatedTimeStatistics::ETimeMode mode) const;
std::string get_time_dhm(PrintEstimatedTimeStatistics::ETimeMode mode) const; std::string get_time_dhm(PrintEstimatedTimeStatistics::ETimeMode mode) const;