From 3e9006e2d47c87da40e627034d0dc71c563e98ae Mon Sep 17 00:00:00 2001 From: Mack Date: Thu, 24 Oct 2024 11:12:43 +0800 Subject: [PATCH] FIX:Brim Ears are ignored when cloning objects the maximum diameter is changed to 20; the diameter will not be reset; jira:STUDIO-8497 GITHUB: #5048 Change-Id: I131305671ebc00dcf6b2972994879fe4ea768a36 --- src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp | 6 ++++-- src/slic3r/GUI/Selection.cpp | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp index 1ff24444c..04b11703a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp @@ -35,6 +35,9 @@ GLGizmoBrimEars::GLGizmoBrimEars(GLCanvas3D &parent, const std::string &icon_fil bool GLGizmoBrimEars::on_init() { + + m_new_point_head_diameter = get_brim_default_radius(); + m_shortcut_key = WXK_CONTROL_L; m_desc["head_diameter"] = _L("Head diameter"); @@ -551,7 +554,7 @@ void GLGizmoBrimEars::on_render_input_window(float x, float y, float bottom_limi find_single(); } }; - m_imgui->bbl_slider_float_style("##head_diameter", &m_new_point_head_diameter, 5, 10, "%.1f", 1.0f, true); + m_imgui->bbl_slider_float_style("##head_diameter", &m_new_point_head_diameter, 5, 20, "%.1f", 1.0f, true); if (m_imgui->get_last_slider_status().clicked) { if (m_old_point_head_diameter == 0.f) m_old_point_head_diameter = initial_value; } @@ -747,7 +750,6 @@ void GLGizmoBrimEars::on_set_state() if (m_state == On && m_old_state != On) { // the gizmo was just turned on wxGetApp().plater()->enter_gizmos_stack(); - m_new_point_head_diameter = get_brim_default_radius(); first_layer_slicer(); } if (m_state == Off && m_old_state != Off) { diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index abb313049..bb3e4d334 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -2095,6 +2095,7 @@ void Selection::copy_to_clipboard() dst_object->sla_support_points = src_object->sla_support_points; dst_object->sla_points_status = src_object->sla_points_status; dst_object->sla_drain_holes = src_object->sla_drain_holes; + dst_object->brim_points = src_object->brim_points; dst_object->layer_config_ranges = src_object->layer_config_ranges; // #ys_FIXME_experiment dst_object->layer_height_profile.assign(src_object->layer_height_profile); dst_object->origin_translation = src_object->origin_translation;