3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-24 22:17:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

FIX: show sync ams unknown details

Browse source 
Change-Id: I1febb10b73a87f98a477fea5fbe2583c752ab330
Jira: STUDIO-10969, STUDIO-10973, STUDIO-11011
(cherry picked from commit f1eb5e829288236282e2322a961e012884ad90cf)
This commit is contained in:
chunmao.guo 2025-03-20 14:27:32 +08:00 • committed by Noisyfox
parent a0f38f3cfd
commit 484d70efb5
3 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libslic3r/PresetBundle.cpp
View file

@ -2035,7 +2035,7 @@ void PresetBundle::get_ams_cobox_infos(AMSComboInfo& combox_info)
}
}
unsigned int PresetBundle::sync_ams_list(unsigned int &unknowns, bool use_map, std::map<int, AMSMapInfo> &maps,bool enable_append, MergeFilamentInfo &merge_info)
unsigned int PresetBundle::sync_ams_list(std::vector<std::pair<DynamicPrintConfig *,std::string>> &unknowns, bool use_map, std::map<int, AMSMapInfo> &maps,bool enable_append, MergeFilamentInfo &merge_info)
{
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "use_map:" << use_map << " enable_append:" << enable_append;
std::vector<std::string> ams_filament_presets;
@ -2106,16 +2106,18 @@ unsigned int PresetBundle::sync_ams_list(unsigned int &unknowns, bool use_map, s
ams_filament_presets.push_back(this->filament_presets[ams_filament_presets.size()]);
ams_filament_colors.push_back(filament_color);
ams_multi_color_filment.push_back(filament_multi_color);
++unknowns;
unknowns.emplace_back(&ams, L("The filament model is unknown. Still using the previous filament preset."));
continue;
}
iter = std::find_if(filaments.begin(), filaments.end(), [&filament_type](auto &f) {
return f.is_compatible && f.is_system;
iter = std::find_if(filaments.begin(), filaments.end(), [](auto &f) {
return f.is_compatible && f.is_system;
});
if (iter == filaments.end())
continue;
}
++unknowns;
unknowns.emplace_back(&ams, boost::algorithm::starts_with(iter->name, filament_type)
? L("The filament may not be compatible with the current machine settings. Generic filament presets will be used.")
: L("The filament model is unknown. A random filament preset will be used."));
filament_id = iter->filament_id;
}
ams_filament_presets.push_back(iter->name);