FIX: the position of wipe tower changed when new plate
Jira: XXXX Change-Id: I76512b0efddef099cec66fea23a16391b927192a
This commit is contained in:
parent
4b541900f7
commit
2edef8d93e
|
@ -3368,7 +3368,7 @@ void PartPlateList::reset_size(int width, int depth, int height, bool reload_obj
|
||||||
m_plate_width = width;
|
m_plate_width = width;
|
||||||
m_plate_depth = depth;
|
m_plate_depth = depth;
|
||||||
m_plate_height = height;
|
m_plate_height = height;
|
||||||
update_all_plates_pos_and_size(false, false);
|
update_all_plates_pos_and_size(false, false, true);
|
||||||
if (update_shapes) {
|
if (update_shapes) {
|
||||||
set_shapes(m_shape, m_exclude_areas, m_logo_texture_filename, m_height_to_lid, m_height_to_rod);
|
set_shapes(m_shape, m_exclude_areas, m_logo_texture_filename, m_height_to_lid, m_height_to_rod);
|
||||||
}
|
}
|
||||||
|
@ -3868,7 +3868,7 @@ void PartPlateList::update_plate_cols()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PartPlateList::update_all_plates_pos_and_size(bool adjust_position, bool with_unprintable_move)
|
void PartPlateList::update_all_plates_pos_and_size(bool adjust_position, bool with_unprintable_move, bool switch_plate_type)
|
||||||
{
|
{
|
||||||
Vec3d origin1, origin2;
|
Vec3d origin1, origin2;
|
||||||
for (unsigned int i = 0; i < (unsigned int)m_plate_list.size(); ++i)
|
for (unsigned int i = 0; i < (unsigned int)m_plate_list.size(); ++i)
|
||||||
|
@ -3881,7 +3881,7 @@ void PartPlateList::update_all_plates_pos_and_size(bool adjust_position, bool wi
|
||||||
plate->set_pos_and_size(origin1, m_plate_width, m_plate_depth, m_plate_height, adjust_position);
|
plate->set_pos_and_size(origin1, m_plate_width, m_plate_depth, m_plate_height, adjust_position);
|
||||||
|
|
||||||
// set default wipe pos when switch plate
|
// set default wipe pos when switch plate
|
||||||
if (m_plater && plate->get_used_extruders().size() <= 0) {
|
if (switch_plate_type && m_plater && plate->get_used_extruders().size() <= 0) {
|
||||||
set_default_wipe_tower_pos_for_plate(i);
|
set_default_wipe_tower_pos_for_plate(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -700,7 +700,7 @@ public:
|
||||||
//update the plate cols due to plate count change
|
//update the plate cols due to plate count change
|
||||||
void update_plate_cols();
|
void update_plate_cols();
|
||||||
|
|
||||||
void update_all_plates_pos_and_size(bool adjust_position = true, bool with_unprintable_move = true);
|
void update_all_plates_pos_and_size(bool adjust_position = true, bool with_unprintable_move = true, bool switch_plate_type = false);
|
||||||
|
|
||||||
//get the plate cols
|
//get the plate cols
|
||||||
int get_plate_cols() { return m_plate_cols; }
|
int get_plate_cols() { return m_plate_cols; }
|
||||||
|
|
Loading…
Reference in New Issue