3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators

Browse source
This commit is contained in:
Enrico Turri 2018-06-21 16:08:30 +02:00
commit d2588d9da1
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,14 +142,11 @@ public:
}
m_gcode += "G1";
if (rot.x != rotated_current_pos.x) {
m_gcode += set_format_X(rot.x); // Transform current position back to wipe tower coordinates (was updated by set_format_X)
m_current_pos.x = x;
}
if (rot.y != rotated_current_pos.y) {
if (std::abs(dx) > EPSILON)
m_gcode += set_format_X(rot.x);
if (std::abs(dy) > EPSILON)
m_gcode += set_format_Y(rot.y);
m_current_pos.y = y;
}
if (e != 0.f)
m_gcode += set_format_E(e);
@ -157,8 +154,8 @@ public:
if (f != 0.f && f != m_current_feedrate)
m_gcode += set_format_F(f);
m_current_pos.x = x;
m_current_pos.y = y;
// Update the elapsed time with a rough estimate.
m_elapsed_time += ((len == 0) ? std::abs(e) : len) / m_current_feedrate * 60.f;