GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-29 07:13:14 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: fix ams mapping issue

Browse Source 
JIRA: STUDIO-8116

Change-Id: I66a75de8e4c2c7ba12e26b4057f9b150c58df31b
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2024-09-12 10:15:31 +08:00 committed by Lane.Wei
parent ba35ed5938
commit 89909211fa
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/SelectMachine.cpp
View File

@ -1897,7 +1897,13 @@ bool SelectMachineDialog::get_ams_mapping_result(std::string &mapping_array_str,
json j = json::array();
json mapping_info_json = json::array();
for (int i = 0; i < wxGetApp().preset_bundle->filament_presets.size(); i++) {
BOOST_LOG_TRIVIAL(info) << "filaments size = " << m_filaments.size();
int mapping_size = wxGetApp().preset_bundle->filament_presets.size();
for (size_t i = 0; i < m_ams_mapping_result.size(); i++) {
mapping_size = std::max(mapping_size, m_ams_mapping_result[i].id);
}
mapping_size = std::min(mapping_size, 16);
for (int i = 0; i <= mapping_size; i++) {
int tray_id = -1;
json mapping_item;
mapping_item["ams"] = tray_id;
@ -3625,7 +3631,7 @@ void SelectMachineDialog::update_show_status()
show_status(PrintDialogStatus::PrintStatusAmsMappingValid);
}
return;
}
}
}
else {
show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid);
@ -4003,6 +4009,8 @@ void SelectMachineDialog::reset_and_sync_ams_list()
m_materialList.clear();
m_filaments.clear();
BOOST_LOG_TRIVIAL(info) << "extruders = " << extruders.size();
for (auto i = 0; i < extruders.size(); i++) {
auto extruder = extruders[i] - 1;
auto colour = wxGetApp().preset_bundle->project_config.opt_string("filament_colour", (unsigned int) extruder);