FIX: the wrong alignment of wipe tower perimeter for some model
jira: STUDIO-9133 Change-Id: If7771ccaf383e2abb4ff738c83e4b638315f274c
This commit is contained in:
parent
177b823680
commit
0121cf2d69
|
@ -1452,12 +1452,12 @@ WipeTower::box_coordinates WipeTower::align_perimeter(const WipeTower::box_coord
|
||||||
box_coordinates aligned_box = perimeter_box;
|
box_coordinates aligned_box = perimeter_box;
|
||||||
|
|
||||||
float spacing = m_extra_spacing * m_perimeter_width;
|
float spacing = m_extra_spacing * m_perimeter_width;
|
||||||
float up = perimeter_box.lu(1) - m_perimeter_width;
|
float up = perimeter_box.lu(1) - m_perimeter_width - EPSILON;
|
||||||
up = align_ceil(up, spacing);
|
up = align_ceil(up, spacing);
|
||||||
up += m_perimeter_width;
|
up += m_perimeter_width;
|
||||||
up = std::min(up, m_wipe_tower_depth);
|
up = std::min(up, m_wipe_tower_depth);
|
||||||
|
|
||||||
float down = perimeter_box.ld(1) - m_perimeter_width;
|
float down = perimeter_box.ld(1) - m_perimeter_width + EPSILON;
|
||||||
down = align_floor(down, spacing);
|
down = align_floor(down, spacing);
|
||||||
down += m_perimeter_width;
|
down += m_perimeter_width;
|
||||||
down = std::max(down, -m_y_shift);
|
down = std::max(down, -m_y_shift);
|
||||||
|
|
Loading…
Reference in New Issue