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

Fix of G-code remaining times export, that I broke with my optimizations.

Browse source
This commit is contained in:
bubnikv 2018-12-19 12:02:17 +01:00
parent b2e40d5046
commit d414ef3395
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/libslic3r/GCodeTimeEstimator.cpp
View file

@ -290,7 +290,8 @@ namespace Slic3r {
// buffer line to export only when greater than 64K to reduce writing calls // buffer line to export only when greater than 64K to reduce writing calls
std::string export_line; std::string export_line;
char time_line[64]; char time_line[64];
while (std::getline(in, gcode_line)) G1LineIdToBlockIdMap::const_iterator it_line_id = _g1_line_ids.begin();
while (std::getline(in, gcode_line))
{ {
if (!in.good()) if (!in.good())
{ {
@ -309,7 +310,6 @@ namespace Slic3r {
gcode_line += "\n"; gcode_line += "\n";
// add remaining time lines where needed // add remaining time lines where needed
G1LineIdToBlockIdMap::const_iterator it_line_id = _g1_line_ids.begin();
_parser.parse_line(gcode_line, _parser.parse_line(gcode_line,
[this, &it_line_id, &g1_lines_count, &last_recorded_time, &time_line, &gcode_line, time_mask, interval](GCodeReader& reader, const GCodeReader::GCodeLine& line) [this, &it_line_id, &g1_lines_count, &last_recorded_time, &time_line, &gcode_line, time_mask, interval](GCodeReader& reader, const GCodeReader::GCodeLine& line)
{ {
@ -317,23 +317,23 @@ namespace Slic3r {
{ {
++g1_lines_count; ++g1_lines_count;
if (!line.has_e()) assert(it_line_id == _g1_line_ids.end() || it_line_id->first >= g1_lines_count);
return;
if ((it_line_id != _g1_line_ids.end()) && (it_line_id->first == g1_lines_count) && (it_line_id->second < (unsigned int)_blocks.size())) const Block *block = nullptr;
{ if (it_line_id != _g1_line_ids.end() && it_line_id->first == g1_lines_count) {
const Block& block = _blocks[it_line_id->second]; if (line.has_e() && it_line_id->second < (unsigned int)_blocks.size())
++ it_line_id; block = &_blocks[it_line_id->second];
if (block.elapsed_time != -1.0f) ++it_line_id;
}
if (block != nullptr && block->elapsed_time != -1.0f) {
float block_remaining_time = _time - block->elapsed_time;
if (std::abs(last_recorded_time - block_remaining_time) > interval)
{ {
float block_remaining_time = _time - block.elapsed_time; sprintf(time_line, time_mask.c_str(), std::to_string((int)(100.0f * block->elapsed_time / _time)).c_str(), _get_time_minutes(block_remaining_time).c_str());
if (std::abs(last_recorded_time - block_remaining_time) > interval) gcode_line += time_line;
{
sprintf(time_line, time_mask.c_str(), std::to_string((int)(100.0f * block.elapsed_time / _time)).c_str(), _get_time_minutes(block_remaining_time).c_str());
gcode_line += time_line;
last_recorded_time = block_remaining_time; last_recorded_time = block_remaining_time;
}
} }
} }
} }