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

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
This commit is contained in:
zhou.xu 2023-11-28 11:23:55 +08:00 committed by Lane.Wei
parent e4cfd78e2c
commit 6e8ff40ad5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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); m_transformed_bounding_box = transformed_bounding_box(m_ar_plane_center, m_rotate_matrix);
set_center_pos(m_ar_plane_center); 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) if (m_cut_mode != (CutMode) mode)
switch_to_mode((CutMode) mode); switch_to_mode((CutMode) mode);
else if (m_cut_mode == CutMode::cutTongueAndGroove) { else if (m_cut_mode == CutMode::cutTongueAndGroove) {
@ -472,12 +473,11 @@ void GLGizmoAdvancedCut::on_load(cereal::BinaryInputArchive &ar)
update_plane_model(); update_plane_model();
} }
reset_cut_by_contours(); reset_cut_by_contours();
} else if (m_cut_mode == CutMode::cutPlanar) {
reset_cut_by_contours();
} }
m_parent.request_extra_frame(); m_parent.request_extra_frame();
m_rotation = Geometry::extract_euler_angles(m_rotate_matrix);
m_movement = 0;
update_buffer_data(); update_buffer_data();
} }

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

@ -164,7 +164,7 @@ private:
float m_connector_depth_ratio_tolerance{0.1f}; float m_connector_depth_ratio_tolerance{0.1f};
float m_connector_size{2.5f}; 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 // Input params for cut with snaps
float m_snap_space_proportion{0.3f}; float m_snap_space_proportion{0.3f};
float m_snap_bulge_proportion{0.15f}; float m_snap_bulge_proportion{0.15f};