amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix of issue 1368 (vector index out of bounds in the wipe tower generator)

Browse source
This commit is contained in:
Lukas Matena 2018-10-29 13:29:10 +01:00
parent 720fb29768
commit f2836d4738
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
View file

@ -643,7 +643,8 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::tool_change(unsigned int tool, boo
"\n\n"); "\n\n");
// Ask our writer about how much material was consumed: // Ask our writer about how much material was consumed:
m_used_filament_length[m_current_tool] += writer.get_and_reset_used_filament_length(); if (m_current_tool < m_used_filament_length.size())
m_used_filament_length[m_current_tool] += writer.get_and_reset_used_filament_length();
ToolChangeResult result; ToolChangeResult result;
result.priming = false; result.priming = false;
@ -1068,8 +1069,9 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::finish_layer()
m_depth_traversed = m_wipe_tower_depth-m_perimeter_width; m_depth_traversed = m_wipe_tower_depth-m_perimeter_width;
// Ask our writer about how much material was consumed: // Ask our writer about how much material was consumed.
m_used_filament_length[m_current_tool] += writer.get_and_reset_used_filament_length(); if (m_current_tool < m_used_filament_length.size())
m_used_filament_length[m_current_tool] += writer.get_and_reset_used_filament_length();
ToolChangeResult result; ToolChangeResult result;
result.priming = false; result.priming = false;
@ -1166,7 +1168,6 @@ void WipeTowerPrusaMM::save_on_last_wipe()
} }
} }
// Processes vector m_plan and calls respective functions to generate G-code for the wipe tower // Processes vector m_plan and calls respective functions to generate G-code for the wipe tower
// Resulting ToolChangeResults are appended into vector "result" // Resulting ToolChangeResults are appended into vector "result"
void WipeTowerPrusaMM::generate(std::vector<std::vector<WipeTower::ToolChangeResult>> &result) void WipeTowerPrusaMM::generate(std::vector<std::vector<WipeTower::ToolChangeResult>> &result)
@ -1256,6 +1257,4 @@ void WipeTowerPrusaMM::make_wipe_tower_square()
lay.extra_spacing = lay.depth / lay.toolchanges_depth(); lay.extra_spacing = lay.depth / lay.toolchanges_depth();
} }
}; // namespace Slic3r }; // namespace Slic3r