3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Wipe Tower: Fixed some ordering issue in the G-code writer.

Browse source
This commit is contained in:
bubnikv 2017-05-22 20:56:42 +02:00
parent c9c4105289
commit aad9f61bad
1 changed files with 8 additions and 6 deletions

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

@ -126,8 +126,9 @@ public:
// extrude quickly amount e to x2 with feed f. // extrude quickly amount e to x2 with feed f.
Writer& ram(float x1, float x2, float dy, float e0, float e, float f) Writer& ram(float x1, float x2, float dy, float e0, float e, float f)
{ {
return extrude_explicit(x1, m_current_pos.y + dy, e0, f) extrude_explicit(x1, m_current_pos.y + dy, e0, f);
.extrude_explicit(x2, m_current_pos.y, e); extrude_explicit(x2, m_current_pos.y, e);
return *this;
} }
// Let the end of the pulled out filament cool down in the cooling tube // Let the end of the pulled out filament cool down in the cooling tube
@ -135,8 +136,9 @@ public:
// at the current Y position to spread the leaking material. // at the current Y position to spread the leaking material.
Writer& cool(float x1, float x2, float e1, float e2, float f) Writer& cool(float x1, float x2, float e1, float e2, float f)
{ {
return extrude_explicit(x1, m_current_pos.y, e1, f) extrude_explicit(x1, m_current_pos.y, e1, f);
.extrude_explicit(x2, m_current_pos.y, e2); extrude_explicit(x2, m_current_pos.y, e2);
return *this;
} }
Writer& set_tool(int tool) Writer& set_tool(int tool)
@ -254,7 +256,7 @@ private:
std::string set_format_F(float f) { std::string set_format_F(float f) {
char buf[64]; char buf[64];
sprintf(buf, " F%.0f", f); sprintf(buf, " F%d", int(floor(f + 0.5f)));
m_current_feedrate = f; m_current_feedrate = f;
return buf; return buf;
} }
@ -729,7 +731,7 @@ std::pair<std::string, WipeTower::xy> WipeTowerPrusaMM::finish_layer(Purpose pur
";------------------\n\n\n\n\n\n\n"); ";------------------\n\n\n\n\n\n\n");
// Indicate that this wipe tower layer is fully covered. // Indicate that this wipe tower layer is fully covered.
m_idx_tool_change_in_layer = m_max_color_changes; m_idx_tool_change_in_layer = (unsigned int)m_max_color_changes;
} }
return std::pair<std::string, xy>(writer.gcode(), writer.pos()); return std::pair<std::string, xy>(writer.gcode(), writer.pos());