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

Fixed empty 'G1' lines generated by the wipe tower:

Browse Source 
They are not nice and trigger assertions in CoolingBuffer
This commit is contained in:
Lukas Matena 2022-07-12 10:59:21 +02:00
parent d02a0ec1b2
commit f41d72d656
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/GCode/WipeTower.cpp
View File

@ -11,6 +11,8 @@
#include "BoundingBox.hpp" #include "BoundingBox.hpp"
#include "LocalesUtils.hpp" #include "LocalesUtils.hpp"
#include <boost/algorithm/string/predicate.hpp>
namespace Slic3r namespace Slic3r
{ {
@ -170,12 +172,18 @@ public:
m_gcode += set_format_F(f); m_gcode += set_format_F(f);
} }
// Append newline if at least one of X,Y,E,F was changed.
// Otherwise, remove the "G1".
if (! boost::ends_with(m_gcode, "G1"))
m_gcode += "\n";
else
m_gcode.erase(m_gcode.end()-2, m_gcode.end());
m_current_pos.x() = x; m_current_pos.x() = x;
m_current_pos.y() = y; m_current_pos.y() = y;
// Update the elapsed time with a rough estimate. // Update the elapsed time with a rough estimate.
m_elapsed_time += ((len == 0.f) ? std::abs(e) : len) / m_current_feedrate * 60.f; m_elapsed_time += ((len == 0.f) ? std::abs(e) : len) / m_current_feedrate * 60.f;
m_gcode += "\n";
return *this; return *this;
} }