mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:miss reset_cut_by_contours When synchronizing parameters 

Jira: STUDIO-4227
Change-Id: Ia6c30a5ada478a320db158e1d10901044c53ecf2
(cherry picked from commit 93de292a97cef762cc62573b3efe98a66f44ecfa)
This commit is contained in:
zhou.xu 2023-10-13 12:00:28 +08:00 committed by Lane.Wei
parent 66eb52c018
commit 8a8020e0a9
2 changed files with 28 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
View File

@ -118,7 +118,6 @@ GLGizmoAdvancedCut::GLGizmoAdvancedCut(GLCanvas3D& parent, const std::string& ic
: GLGizmoRotate3D(parent, icon_filename, sprite_id, nullptr) : GLGizmoRotate3D(parent, icon_filename, sprite_id, nullptr)
, m_movement(0.0) , m_movement(0.0)
, m_buffered_movement(0.0) , m_buffered_movement(0.0)
, m_last_active_id(0)
, m_keep_upper(true) , m_keep_upper(true)
, m_keep_lower(true) , m_keep_lower(true)
, m_cut_to_parts(false) , m_cut_to_parts(false)
@ -385,7 +384,6 @@ void GLGizmoAdvancedCut::reset_cut_plane()
m_movement = 0.0; m_movement = 0.0;
m_height = box.size()[2] / 2.0; m_height = box.size()[2] / 2.0;
m_height_delta = 0;
m_rotation.setZero(); m_rotation.setZero();
m_buffered_movement = 0.0; m_buffered_movement = 0.0;
@ -594,7 +592,6 @@ void GLGizmoAdvancedCut::on_stop_dragging()
m_plane_center_drag_start = m_plane_center; m_plane_center_drag_start = m_plane_center;
reset_cut_by_contours(); reset_cut_by_contours();
m_movement = 0.0; m_movement = 0.0;
m_height_delta = 0.0;
m_rotation.setZero(); m_rotation.setZero();
} }
@ -640,13 +637,11 @@ void GLGizmoAdvancedCut::on_update(const UpdateData& data)
double move = calc_projection(m_drag_pos_start, data.mouse_ray, m_plane_normal); double move = calc_projection(m_drag_pos_start, data.mouse_ray, m_plane_normal);
m_movement = m_start_movement + move; m_movement = m_start_movement + move;
update_plate_center(Axis::Z, move, true); update_plate_center(Axis::Z, move, true);
m_height = m_plane_center.z();
} // move x } // move x
else if (m_hover_id == c_cube_x_move_id && m_cut_mode == CutMode::cutTongueAndGroove) { else if (m_hover_id == c_cube_x_move_id && m_cut_mode == CutMode::cutTongueAndGroove) {
double move = calc_projection(m_drag_pos_start, data.mouse_ray, m_plane_x_direction); double move = calc_projection(m_drag_pos_start, data.mouse_ray, m_plane_x_direction);
m_movement = m_start_movement + move; m_movement = m_start_movement + move;
update_plate_center(Axis::X, move, true); update_plate_center(Axis::X, move, true);
m_height = m_plane_center.z();
} // dragging connectors } // dragging connectors
else if (m_connectors_editing && m_hover_id >= c_connectors_group_id) { else if (m_connectors_editing && m_hover_id >= c_connectors_group_id) {
CutConnectors &connectors = m_c->selection_info()->model_object()->cut_connectors; CutConnectors &connectors = m_c->selection_info()->model_object()->cut_connectors;
@ -1782,14 +1777,13 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b
float rotate_cap = m_imgui->calc_text_size(_L("Rotate")).x; float rotate_cap = m_imgui->calc_text_size(_L("Rotate")).x;
float caption_size = std::max(movement_cap, rotate_cap) + 2 * space_size; float caption_size = std::max(movement_cap, rotate_cap) + 2 * space_size;
m_imperial_units = wxGetApp().app_config->get("use_inches") == "1"; m_imperial_units = wxGetApp().app_config->get("use_inches") == "1";
unsigned int current_active_id = ImGui::GetActiveID();
Vec3d rotation = {Geometry::rad2deg(m_buffered_rotation(0)), Geometry::rad2deg(m_buffered_rotation(1)), Geometry::rad2deg(m_buffered_rotation(2))}; m_buffered_rotation = {Geometry::rad2deg(m_rotation(0)), Geometry::rad2deg(m_rotation(1)), Geometry::rad2deg(m_rotation(2))};
char buf[3][64]; char buf[3][64];
float buf_size[3]; float buf_size[3];
float vec_max = 0, unit_size = 0; float vec_max = 0, unit_size = 0;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
ImGui::DataTypeFormatString(buf[i], IM_ARRAYSIZE(buf[i]), ImGuiDataType_Double, (void *) &rotation[i], "%.2f"); ImGui::DataTypeFormatString(buf[i], IM_ARRAYSIZE(buf[i]), ImGuiDataType_Double, (void *) &m_buffered_rotation[i], "%.2f");
buf_size[i] = ImGui::CalcTextSize(buf[i]).x; buf_size[i] = ImGui::CalcTextSize(buf[i]).x;
vec_max = std::max(buf_size[i], vec_max); vec_max = std::max(buf_size[i], vec_max);
} }
@ -1830,56 +1824,45 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b
m_imgui->text(_L("Rotation") + " "); m_imgui->text(_L("Rotation") + " ");
ImGui::SameLine(caption_size + 1 * space_size); ImGui::SameLine(caption_size + 1 * space_size);
ImGui::PushItemWidth(unit_size); ImGui::PushItemWidth(unit_size);
ImGui::BBLInputDouble("##cut_rotation_x", &rotation[0], 0.0f, 0.0f, "%.2f"); ImGui::BBLInputDouble("##cut_rotation_x", &m_buffered_rotation[0], 0.0f, 0.0f, "%.2f", ImGuiInputTextFlags_EnterReturnsTrue);
ImGui::SameLine(caption_size + 1 * unit_size + 2 * space_size); ImGui::SameLine(caption_size + 1 * unit_size + 2 * space_size);
ImGui::PushItemWidth(unit_size); ImGui::PushItemWidth(unit_size);
ImGui::BBLInputDouble("##cut_rotation_y", &rotation[1], 0.0f, 0.0f, "%.2f"); ImGui::BBLInputDouble("##cut_rotation_y", &m_buffered_rotation[1], 0.0f, 0.0f, "%.2f", ImGuiInputTextFlags_EnterReturnsTrue);
ImGui::SameLine(caption_size + 2 * unit_size + 3 * space_size); ImGui::SameLine(caption_size + 2 * unit_size + 3 * space_size);
ImGui::PushItemWidth(unit_size); ImGui::PushItemWidth(unit_size);
ImGui::BBLInputDouble("##cut_rotation_z", &rotation[2], 0.0f, 0.0f, "%.2f"); ImGui::BBLInputDouble("##cut_rotation_z", &m_buffered_rotation[2], 0.0f, 0.0f, "%.2f", ImGuiInputTextFlags_EnterReturnsTrue);
if (current_active_id != m_last_active_id) { if (std::abs(Geometry::rad2deg(m_rotation(0)) - m_buffered_rotation(0)) > EPSILON || std::abs(Geometry::rad2deg(m_rotation(1)) - m_buffered_rotation(1)) > EPSILON ||
if (std::abs(Geometry::rad2deg(m_rotation(0)) - m_buffered_rotation(0)) > EPSILON || std::abs(Geometry::rad2deg(m_rotation(1)) - m_buffered_rotation(1)) > EPSILON || std::abs(Geometry::rad2deg(m_rotation(2)) - m_buffered_rotation(2)) > EPSILON) {
std::abs(Geometry::rad2deg(m_rotation(2)) - m_buffered_rotation(2)) > EPSILON) { m_rotation(0) = Geometry::deg2rad(m_buffered_rotation(0));
m_rotation = m_buffered_rotation; m_rotation(1) = Geometry::deg2rad(m_buffered_rotation(1));
m_buffered_rotation.setZero(); m_rotation(2) = Geometry::deg2rad(m_buffered_rotation(2));
update_plate_normal_boundingbox_clipper(m_rotation); update_plate_normal_boundingbox_clipper(m_rotation);
m_parent.post_event(SimpleEvent(wxEVT_PAINT)); reset_cut_by_contours();
} m_rotation.setZero();
} else {
m_buffered_rotation(0) = Geometry::deg2rad(rotation(0));
m_buffered_rotation(1) = Geometry::deg2rad(rotation(1));
m_buffered_rotation(2) = Geometry::deg2rad(rotation(2));
} }
ImGui::Separator(); ImGui::Separator();
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4.0f, 10.0f)); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4.0f, 10.0f));
// Movement input box // Movement input box
double movement = m_movement; m_buffered_movement = m_movement;
ImGui::PushItemWidth(caption_size); ImGui::PushItemWidth(caption_size);
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
m_imgui->text(_L("Movement") + " "); m_imgui->text(_L("Movement") + " ");
ImGui::SameLine(caption_size + 1 * space_size); ImGui::SameLine(caption_size + 1 * space_size);
ImGui::PushItemWidth(3 * unit_size + 2 * space_size); ImGui::PushItemWidth(3 * unit_size + 2 * space_size);
ImGui::BBLInputDouble("##cut_movement", &movement, 0.0f, 0.0f, "%.2f"); ImGui::BBLInputDouble("##cut_movement", &m_buffered_movement, 0.0f, 0.0f, "%.2f", ImGuiInputTextFlags_EnterReturnsTrue);
if (current_active_id != m_last_active_id) {
if (std::abs(m_buffered_movement - m_movement) > EPSILON) { if (std::abs(m_buffered_movement - m_movement) > EPSILON) {
m_movement = m_buffered_movement; m_movement = m_buffered_movement;
m_buffered_movement = 0.0; // update absolute height
update_plate_center(Axis::Z, m_movement, false);
// update absolute height reset_cut_by_contours();
m_height_delta = m_plane_normal(2) * m_movement; m_movement = 0.0;
m_height += m_height_delta;
m_buffered_height = m_height;
update_plate_center(Axis::Z, m_movement, false);
m_parent.post_event(SimpleEvent(wxEVT_PAINT));
}
} else {
m_buffered_movement = movement;
} }
// height input box // height input box
double height = m_height; m_height = m_plane_center.z();
m_buffered_height = m_plane_center.z();
ImGui::PushItemWidth(caption_size); ImGui::PushItemWidth(caption_size);
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
// only allow setting height when cut plane is horizontal // only allow setting height when cut plane is horizontal
@ -1888,16 +1871,10 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b
m_imgui->text(_L("Height") + " "); m_imgui->text(_L("Height") + " ");
ImGui::SameLine(caption_size + 1 * space_size); ImGui::SameLine(caption_size + 1 * space_size);
ImGui::PushItemWidth(3 * unit_size + 2 * space_size); ImGui::PushItemWidth(3 * unit_size + 2 * space_size);
ImGui::BBLInputDouble("##cut_height", &height, 0.0f, 0.0f, "%.2f"); ImGui::BBLInputDouble("##cut_height", &m_buffered_height, 0.0f, 0.0f, "%.2f", ImGuiInputTextFlags_EnterReturnsTrue);
if (current_active_id != m_last_active_id) { if (std::abs(m_buffered_height - m_height) > EPSILON) {
if (std::abs(m_buffered_height - m_height) > EPSILON) { update_plate_center(Axis::Z, m_buffered_height - m_height, false);
m_height_delta = m_buffered_height - m_height; reset_cut_by_contours();
m_height = m_buffered_height;
update_plate_center(Axis::Z, m_height - m_plane_center.z(), false);
m_parent.post_event(SimpleEvent(wxEVT_PAINT));
}
} else {
m_buffered_height = height;
} }
ImGui::PopStyleVar(1); ImGui::PopStyleVar(1);
m_imgui->disabled_end(); m_imgui->disabled_end();
@ -2009,8 +1986,6 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b
ImGui::SameLine(); ImGui::SameLine();
const bool reset_clicked = m_imgui->button(_L("Reset")); const bool reset_clicked = m_imgui->button(_L("Reset"));
if (reset_clicked) { reset_all(); } if (reset_clicked) { reset_all(); }
m_last_active_id = current_active_id;
} }
void GLGizmoAdvancedCut::init_connectors_input_window_data() void GLGizmoAdvancedCut::init_connectors_input_window_data()

3
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp
View File

@ -93,7 +93,6 @@ private:
mutable double m_movement; mutable double m_movement;
mutable double m_height; // height of cut plane to heatbed mutable double m_height; // height of cut plane to heatbed
mutable double m_height_delta; // height of cut plane to heatbed
double m_start_movement; double m_start_movement;
double m_start_height; double m_start_height;
@ -120,8 +119,6 @@ private:
mutable Grabber m_move_z_grabber; mutable Grabber m_move_z_grabber;
mutable Grabber m_move_x_grabber; mutable Grabber m_move_x_grabber;
unsigned int m_last_active_id;
bool m_connectors_editing{false}; bool m_connectors_editing{false};
std::vector<size_t> m_invalid_connectors_idxs; std::vector<size_t> m_invalid_connectors_idxs;
bool m_show_shortcuts{false}; bool m_show_shortcuts{false};