From 6e8ff40ad5ce4ce9a2e1c159a9b14bfbe6102d2f Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Tue, 28 Nov 2023 11:23:55 +0800 Subject: [PATCH] ENH:add reset_cut_by_contours in on_load function Jira:STUDIO-5269 m_connector_size_tolerance default value is 0.1f Change-Id: I6c67fff3cb0c1190e9141ed6f68fbfa848679f35 --- src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp | 8 ++++---- src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp index 07c4ab523..9c20ba208 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp @@ -456,7 +456,8 @@ void GLGizmoAdvancedCut::on_load(cereal::BinaryInputArchive &ar) m_transformed_bounding_box = transformed_bounding_box(m_ar_plane_center, m_rotate_matrix); set_center_pos(m_ar_plane_center); - + m_rotation = Geometry::extract_euler_angles(m_rotate_matrix); + m_movement = 0; if (m_cut_mode != (CutMode) mode) switch_to_mode((CutMode) mode); else if (m_cut_mode == CutMode::cutTongueAndGroove) { @@ -472,12 +473,11 @@ void GLGizmoAdvancedCut::on_load(cereal::BinaryInputArchive &ar) update_plane_model(); } reset_cut_by_contours(); + } else if (m_cut_mode == CutMode::cutPlanar) { + reset_cut_by_contours(); } m_parent.request_extra_frame(); - - m_rotation = Geometry::extract_euler_angles(m_rotate_matrix); - m_movement = 0; update_buffer_data(); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp index fbdc6be66..0e274da38 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp @@ -164,7 +164,7 @@ private: float m_connector_depth_ratio_tolerance{0.1f}; float m_connector_size{2.5f}; - float m_connector_size_tolerance{0.f}; + float m_connector_size_tolerance{0.1f}; // Input params for cut with snaps float m_snap_space_proportion{0.3f}; float m_snap_bulge_proportion{0.15f};