From 38faa0ae460ad4a2688d3b0ff7928552f2204738 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Wed, 10 Sep 2025 18:03:15 +0800 Subject: [PATCH] FIX:support different picture for different machine jira: STUDIO-13919 Change-Id: I391887c637345795d3af82b3d274fb995c03b190 (cherry picked from commit 8979c2fbc10f49e257aa30b660ef9d09f00c90a1) --- resources/profiles/BBL/machine/Bambu Lab H2S.json | 4 +++- src/slic3r/GUI/Plater.cpp | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/profiles/BBL/machine/Bambu Lab H2S.json b/resources/profiles/BBL/machine/Bambu Lab H2S.json index f70454809d..e399e9eebe 100644 --- a/resources/profiles/BBL/machine/Bambu Lab H2S.json +++ b/resources/profiles/BBL/machine/Bambu Lab H2S.json @@ -6,8 +6,10 @@ "bed_model": "bbl-3dp-O1S.stl", "bed_texture": "bbl-3dp-logo.svg", "use_double_extruder_default_texture": "true", + "bottom_texture_rect": "40,-14.5,70,8", "default_bed_type": "Textured PEI Plate", - "right_icon_offset_bed": "10", + "image_bed_type": "o", + "right_icon_offset_bed": "10;-5", "family": "BBL-3DP", "machine_tech": "FFF", "model_id": "O1S", diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 8f445db32d..ef8401a899 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2486,6 +2486,11 @@ bool Sidebar::reset_bed_type_combox_choices(bool is_sidebar_init) } auto pm = p->plater->get_curr_printer_model(); + if (pm) { + if (m_cur_image_bed_type != pm->image_bed_type) { + m_cur_image_bed_type = pm->image_bed_type; + } + } if (m_last_combo_bedtype_count != 0 && pm) { auto cur_count = (int) BedType::btCount - 1 - pm->not_support_bed_types.size(); if (cur_count == m_last_combo_bedtype_count) {//no change @@ -2497,9 +2502,6 @@ bool Sidebar::reset_bed_type_combox_choices(bool is_sidebar_init) m_cur_combox_bed_types.clear(); if (pm &&bed_type_def && bed_type_def->enum_keys_map) { int index = 0; - if (m_cur_image_bed_type != pm->image_bed_type) { - m_cur_image_bed_type = pm->image_bed_type; - } for (auto item : bed_type_def->enum_labels) { index++; bool find = std::find(pm->not_support_bed_types.begin(), pm->not_support_bed_types.end(), item) != pm->not_support_bed_types.end();