From edb9583f76a3214807bf796f793a8c03c732770e Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Tue, 11 Feb 2025 20:18:56 +0800 Subject: [PATCH] FIX: fix the display of N3S jira: STUDIO-10291 & STUDIO-10285 Change-Id: I10c1d3d210a875b75bb31ed33f8db451bdadb5e7 --- src/slic3r/GUI/CalibrationWizardSavePage.cpp | 13 ++++++++++--- src/slic3r/GUI/PresetComboBoxes.cpp | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index 9f43facf9..421b7e8a5 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -59,9 +59,16 @@ static wxString get_tray_name_by_tray_id(int tray_id) tray_name = "Ext"; } else { - char prefix = 'A' + (tray_id / 4); - char suffix = '0' + 1 + tray_id % 4; - tray_name = std::string(1, prefix) + std::string(1, suffix); + int ams_id = tray_id / 4; + int slot_id = tray_id % 4; + if (ams_id >= 0 && ams_id < 26) { + char prefix = 'A' + ams_id; + char suffix = '0' + 1 + slot_id; + tray_name = std::string(1, prefix) + std::string(1, suffix); + } else if (ams_id >= 128 && ams_id < 153) { + char prefix = 'A' + ams_id - 128; + tray_name = std::string(1, prefix); + } } return tray_name; } diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index ca53a82dd..8bc97dfda 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -1652,6 +1652,10 @@ GUI::CalibrateFilamentComboBox::~CalibrateFilamentComboBox() void GUI::CalibrateFilamentComboBox::load_tray(DynamicPrintConfig &config) { m_tray_name = config.opt_string("tray_name", 0u); + size_t pos = m_tray_name.find("HT-"); + if (pos != std::string::npos) { + m_tray_name = m_tray_name.substr(pos + 3); + } m_filament_id = config.opt_string("filament_id", 0u); m_tag_uid = config.opt_string("tag_uid", 0u); m_filament_type = config.opt_string("filament_type", 0u);