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

FIX:user preset causes incorrect display of material types in AMS

Browse Source 
Change-Id: I15ae4fc9f5c657b379d1e81b0cff913ea018fea7
This commit is contained in:
hu.wang 2023-10-19 14:55:01 +08:00 committed by Lane.Wei
parent b02699e659
commit 2f4191e958
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/DeviceManager.cpp
View File

@ -2591,12 +2591,11 @@ int MachineObject::local_publish_json(std::string json_str, int qos)
std::string MachineObject::setting_id_to_type(std::string setting_id, std::string tray_type)
{
std::string type;
PresetBundle* preset_bundle = GUI::wxGetApp().preset_bundle;
if (preset_bundle) {
for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) {
if (it->filament_id.compare(setting_id) == 0) {
if (it->filament_id.compare(setting_id) == 0 && it->is_system) {
std::string display_filament_type;
it->config.get_filament_type(display_filament_type);
type = display_filament_type;
@ -2606,8 +2605,8 @@ std::string MachineObject::setting_id_to_type(std::string setting_id, std::strin
}
if (tray_type != type || type.empty()) {
if (type.empty()) {type = tray_type;}
BOOST_LOG_TRIVIAL(info) << "The values of tray_info_idx and tray_type do not match tray_info_idx " << setting_id << " tray_type " << tray_type;
if (type.empty()) { type = tray_type; }
BOOST_LOG_TRIVIAL(info) << "The values of tray_info_idx and tray_type do not match tray_info_idx " << setting_id << " tray_type " << tray_type << " system_type" << type;
}
return type;