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

FIX: fix the display of N3S 

jira: STUDIO-10291 & STUDIO-10285
Change-Id: I10c1d3d210a875b75bb31ed33f8db451bdadb5e7
This commit is contained in:
zhimin.zeng 2025-02-11 20:18:56 +08:00 committed by lane.wei
parent da2baffd86
commit edb9583f76
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/CalibrationWizardSavePage.cpp
View File

@ -59,9 +59,16 @@ static wxString get_tray_name_by_tray_id(int tray_id)
tray_name = "Ext"; tray_name = "Ext";
} }
else { else {
char prefix = 'A' + (tray_id / 4); int ams_id = tray_id / 4;
char suffix = '0' + 1 + tray_id % 4; int slot_id = tray_id % 4;
tray_name = std::string(1, prefix) + std::string(1, suffix); 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; return tray_name;
} }

4
src/slic3r/GUI/PresetComboBoxes.cpp
View File

@ -1652,6 +1652,10 @@ GUI::CalibrateFilamentComboBox::~CalibrateFilamentComboBox()
void GUI::CalibrateFilamentComboBox::load_tray(DynamicPrintConfig &config) void GUI::CalibrateFilamentComboBox::load_tray(DynamicPrintConfig &config)
{ {
m_tray_name = config.opt_string("tray_name", 0u); 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_filament_id = config.opt_string("filament_id", 0u);
m_tag_uid = config.opt_string("tag_uid", 0u); m_tag_uid = config.opt_string("tag_uid", 0u);
m_filament_type = config.opt_string("filament_type", 0u); m_filament_type = config.opt_string("filament_type", 0u);