Fixed empty 'G1' lines generated by the wipe tower:
They are not nice and trigger assertions in CoolingBuffer
This commit is contained in:
parent
d02a0ec1b2
commit
f41d72d656
1 changed files with 9 additions and 1 deletions
|
@ -11,6 +11,8 @@
|
|||
#include "BoundingBox.hpp"
|
||||
#include "LocalesUtils.hpp"
|
||||
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
|
||||
|
||||
namespace Slic3r
|
||||
{
|
||||
|
@ -170,12 +172,18 @@ public:
|
|||
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.y() = y;
|
||||
|
||||
// Update the elapsed time with a rough estimate.
|
||||
m_elapsed_time += ((len == 0.f) ? std::abs(e) : len) / m_current_feedrate * 60.f;
|
||||
m_gcode += "\n";
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue