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

SPE-2324: Fixed assignment of toolpaths color for pre-gcode preview

Browse Source
This commit is contained in:
enricoturri1966 2024-05-28 13:51:07 +02:00 committed by Lukas Matena
parent cbb5aa0a26
commit 1eba581199
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp
View File

@ -523,16 +523,21 @@ private:
uint8_t color_print_color_id(double print_z, size_t extruder_id) const { uint8_t color_print_color_id(double print_z, size_t extruder_id) const {
auto it = std::find_if(m_color_print_values.begin(), m_color_print_values.end(), auto it = std::find_if(m_color_print_values.begin(), m_color_print_values.end(),
[print_z](const Slic3r::CustomGCode::Item& code) { [print_z](const Slic3r::CustomGCode::Item& code) {
return std::fabs(code.print_z - print_z) < EPSILON; return std::fabs(code.print_z - print_z) < EPSILON;
}); });
if (it != m_color_print_values.end()) { if (it != m_color_print_values.end()) {
Slic3r::CustomGCode::Type type = it->type; Slic3r::CustomGCode::Type type = it->type;
// pause print or custom Gcode // pause print or custom Gcode
if (type == Slic3r::CustomGCode::PausePrint || type == Slic3r::CustomGCode::Custom || type == Slic3r::CustomGCode::Template) if (type == Slic3r::CustomGCode::PausePrint || (type != Slic3r::CustomGCode::ColorChange && type != Slic3r::CustomGCode::Template))
return static_cast<uint8_t>(m_color_print_colors_count - 1); // last color item is a gray color for pause print or custom G-code return static_cast<uint8_t>(m_color_print_colors_count - 1); // last color item is a gray color for pause print or custom G-code
switch (it->type) { switch (it->type) {
// change color for current extruder // change color for current extruder
case Slic3r::CustomGCode::ColorChange: { return color_change_color_id(it, extruder_id); } case Slic3r::CustomGCode::ColorChange: {
const int c = color_change_color_id(it, extruder_id);
if (c >= 0)
return static_cast<uint8_t>(c);
break;
}
// change tool (extruder) // change tool (extruder)
case Slic3r::CustomGCode::ToolChange: { return tool_change_color_id(it, extruder_id); } case Slic3r::CustomGCode::ToolChange: { return tool_change_color_id(it, extruder_id); }
default: { break; } default: { break; }
@ -545,7 +550,12 @@ private:
--it; --it;
switch (it->type) { switch (it->type) {
// change color for current extruder // change color for current extruder
case Slic3r::CustomGCode::ColorChange: { return color_change_color_id(it, extruder_id); } case Slic3r::CustomGCode::ColorChange: {
const int c = color_change_color_id(it, extruder_id);
if (c >= 0)
return static_cast<uint8_t>(c);
break;
}
// change tool (extruder) // change tool (extruder)
case Slic3r::CustomGCode::ToolChange: { return tool_change_color_id(it, extruder_id); } case Slic3r::CustomGCode::ToolChange: { return tool_change_color_id(it, extruder_id); }
default: { break; } default: { break; }
@ -555,7 +565,7 @@ private:
return std::min<uint8_t>(m_extruders_count - 1, static_cast<uint8_t>(extruder_id)); return std::min<uint8_t>(m_extruders_count - 1, static_cast<uint8_t>(extruder_id));
} }
uint8_t color_change_color_id(std::vector<Slic3r::CustomGCode::Item>::const_iterator it, size_t extruder_id) const { int color_change_color_id(std::vector<Slic3r::CustomGCode::Item>::const_iterator it, size_t extruder_id) const {
if (m_extruders_count == 1) if (m_extruders_count == 1)
return m600_color_id(it); return m600_color_id(it);
@ -573,7 +583,7 @@ private:
if (!is_tool_change && it->extruder == static_cast<int>(extruder_id + 1)) if (!is_tool_change && it->extruder == static_cast<int>(extruder_id + 1))
return m600_color_id(it); return m600_color_id(it);
return 0; return -1;
} }
uint8_t tool_change_color_id(std::vector<Slic3r::CustomGCode::Item>::const_iterator it, size_t extruder_id) const { uint8_t tool_change_color_id(std::vector<Slic3r::CustomGCode::Item>::const_iterator it, size_t extruder_id) const {
@ -591,14 +601,14 @@ private:
return std::min<uint8_t>(m_extruders_count - 1, std::max<uint8_t>(current_extruder - 1, 0)); return std::min<uint8_t>(m_extruders_count - 1, std::max<uint8_t>(current_extruder - 1, 0));
} }
uint8_t m600_color_id(std::vector<Slic3r::CustomGCode::Item>::const_iterator it) const { int m600_color_id(std::vector<Slic3r::CustomGCode::Item>::const_iterator it) const {
uint8_t shift = 0; int shift = 0;
while (it != m_color_print_values.begin()) { while (it != m_color_print_values.begin()) {
--it; --it;
if (it->type == Slic3r::CustomGCode::ColorChange) if (it->type == Slic3r::CustomGCode::ColorChange)
++shift; ++shift;
} }
return m_extruders_count + shift; return static_cast<int>(m_extruders_count) + shift;
} }
}; };