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

G-code window - Fixed file mapping for gcode files generated by other slicers

Browse Source
This commit is contained in:
enricoturri1966 2021-03-15 11:27:24 +01:00
parent 14aca210cb
commit 117a6ace5a
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/slic3r/GUI/GCodeViewer.cpp
View File

@ -308,15 +308,28 @@ void GCodeViewer::SequentialView::GCodeWindow::load_gcode()
try try
{ {
boost::nowide::ifstream f(m_filename);
std::string line;
// generate mapping for accessing data in file by line number // generate mapping for accessing data in file by line number
boost::nowide::ifstream f(m_filename);
f.seekg(0, f.end);
uint64_t file_length = static_cast<uint64_t>(f.tellg());
f.seekg(0, f.beg);
std::string line;
uint64_t offset = 0; uint64_t offset = 0;
while (std::getline(f, line)) { while (std::getline(f, line)) {
size_t line_length = static_cast<uint64_t>(line.length()); uint64_t line_length = static_cast<uint64_t>(line.length());
m_lines_map.push_back({ offset, line_length }); m_lines_map.push_back({ offset, line_length });
offset += static_cast<uint64_t>(line_length) + 1; offset += static_cast<uint64_t>(line_length) + 1;
} }
if (offset != file_length) {
// if the final offset does not match with file length, lines are terminated with CR+LF
// so update all offsets accordingly
for (size_t i = 0; i < m_lines_map.size(); ++i) {
m_lines_map[i].first += static_cast<uint64_t>(i);
}
}
} }
catch (...) catch (...)
{ {