GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-30 15:22:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPE-1906: Preview and GCodeViewer - Fixed layers detection when using G2/G3 lines

Browse Source
This commit is contained in:
enricoturri1966 2023-09-25 11:41:59 +02:00
parent c19ae886ec
commit 43e023f372
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2258,20 +2258,22 @@ void GCodeViewer::load_toolpaths(const GCodeProcessorResult& gcode_result)
if (move.type == EMoveType::Seam)
++seams_count;
size_t move_id = i - seams_count;
const size_t move_id = i - seams_count;
if (move.type == EMoveType::Extrude) {
if (!move.internal_only) {
// layers zs
const double* const last_z = m_layers.empty() ? nullptr : &m_layers.get_zs().back();
const double z = static_cast<double>(move.position.z());
if (last_z == nullptr || z < *last_z - EPSILON || *last_z + EPSILON < z) {
const size_t start_it = (m_layers.empty() && first_travel_s_id != 0) ? first_travel_s_id : last_travel_s_id;
m_layers.append(z, { start_it, move_id });
}
else
m_layers.get_ranges().back().last = move_id;
// layers zs/ranges
const double* const last_z = m_layers.empty() ? nullptr : &m_layers.get_zs().back();
const double z = static_cast<double>(move.position.z());
if (last_z == nullptr || z < *last_z - EPSILON || *last_z + EPSILON < z) {
// start a new layer
const size_t start_it = (m_layers.empty() && first_travel_s_id != 0) ? first_travel_s_id : last_travel_s_id;
m_layers.append(z, { start_it, move_id });
}
else if (!move.internal_only) {
// update last layer
m_layers.get_ranges().back().last = move_id;
}
// extruder ids
m_extruder_ids.emplace_back(move.extruder_id);
// roles