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

Wipe tower rotation - bug fix (now returning start_pos correctly)

Browse source
This commit is contained in:
Lukas Matena 2017-12-01 11:10:01 +01:00
parent 55570119f7
commit cb84a6cfce
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,9 +70,9 @@ public:
const std::vector<WipeTower::Extrusion>& extrusions() const { return m_extrusions; } const std::vector<WipeTower::Extrusion>& extrusions() const { return m_extrusions; }
float x() const { return m_current_pos.x; } float x() const { return m_current_pos.x; }
float y() const { return m_current_pos.y; } float y() const { return m_current_pos.y; }
const WipeTower::xy& start_pos() const { return m_start_pos; }
const WipeTower::xy& pos() const { return m_current_pos; } const WipeTower::xy& pos() const { return m_current_pos; }
const WipeTower::xy printer_pos() const { return m_current_pos.rotate(m_wipe_tower_pos,m_angle_deg); } const WipeTower::xy start_pos_rotated() const { return m_start_pos.rotate(m_wipe_tower_pos,m_angle_deg); }
const WipeTower::xy pos_rotated() const { return m_current_pos.rotate(m_wipe_tower_pos,m_angle_deg); }
float elapsed_time() const { return m_elapsed_time; } float elapsed_time() const { return m_elapsed_time; }
// Extrude with an explicitely provided amount of extrusion. // Extrude with an explicitely provided amount of extrusion.
@ -87,7 +87,6 @@ public:
double len = sqrt(dx*dx+dy*dy); double len = sqrt(dx*dx+dy*dy);
// For rotated wipe tower, transform position to printer coordinates // For rotated wipe tower, transform position to printer coordinates
//Q zavadet nove promenne? rotace o zaporny uhel?
WipeTower::xy rotated_current_pos( m_current_pos.rotate(m_wipe_tower_pos,m_angle_deg) ); WipeTower::xy rotated_current_pos( m_current_pos.rotate(m_wipe_tower_pos,m_angle_deg) );
WipeTower::xy rot( WipeTower::xy(x,y).rotate(m_wipe_tower_pos,m_angle_deg ) ); WipeTower::xy rot( WipeTower::xy(x,y).rotate(m_wipe_tower_pos,m_angle_deg ) );
@ -491,8 +490,8 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::prime(
result.gcode = writer.gcode(); result.gcode = writer.gcode();
result.elapsed_time = writer.elapsed_time(); result.elapsed_time = writer.elapsed_time();
result.extrusions = writer.extrusions(); result.extrusions = writer.extrusions();
result.start_pos = writer.start_pos(); result.start_pos = writer.start_pos_rotated();
result.end_pos = writer.printer_pos(); result.end_pos = writer.pos_rotated();
return result; return result;
} }
@ -627,8 +626,8 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::tool_change(unsigned int tool, boo
result.gcode = writer.gcode(); result.gcode = writer.gcode();
result.elapsed_time = writer.elapsed_time(); result.elapsed_time = writer.elapsed_time();
result.extrusions = writer.extrusions(); result.extrusions = writer.extrusions();
result.start_pos = writer.start_pos(); result.start_pos = writer.start_pos_rotated();
result.end_pos = writer.printer_pos(); result.end_pos = writer.pos_rotated();
return result; return result;
} }
@ -728,8 +727,8 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::toolchange_Brim(Purpose purpose, b
result.gcode = writer.gcode(); result.gcode = writer.gcode();
result.elapsed_time = writer.elapsed_time(); result.elapsed_time = writer.elapsed_time();
result.extrusions = writer.extrusions(); result.extrusions = writer.extrusions();
result.start_pos = writer.start_pos(); result.start_pos = writer.start_pos_rotated();
result.end_pos = writer.printer_pos(); result.end_pos = writer.pos_rotated();
return result; return result;
} }
@ -1049,8 +1048,8 @@ WipeTower::ToolChangeResult WipeTowerPrusaMM::finish_layer(Purpose purpose)
result.gcode = writer.gcode(); result.gcode = writer.gcode();
result.elapsed_time = writer.elapsed_time(); result.elapsed_time = writer.elapsed_time();
result.extrusions = writer.extrusions(); result.extrusions = writer.extrusions();
result.start_pos = writer.start_pos(); result.start_pos = writer.start_pos_rotated();
result.end_pos = writer.printer_pos(); result.end_pos = writer.pos_rotated();
return result; return result;
} }