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

FIX: only sort system filaments 

Change-Id: I3a111d3b001b9764432ee5fc18af78e459b9105d
Github: 5318
This commit is contained in:
chunmao.guo 2025-01-06 15:01:30 +08:00 committed by lane.wei
parent 9c81c2cf5e
commit cb1138f66f
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1155,6 +1155,7 @@ void PlaterPresetComboBox::update()
if (m_type == Preset::TYPE_FILAMENT) { if (m_type == Preset::TYPE_FILAMENT) {
std::vector<std::map<wxString, wxBitmap *>::value_type const*> list(presets.size(), nullptr); std::vector<std::map<wxString, wxBitmap *>::value_type const*> list(presets.size(), nullptr);
std::transform(presets.begin(), presets.end(), list.begin(), [](auto & pair) { return &pair; }); std::transform(presets.begin(), presets.end(), list.begin(), [](auto & pair) { return &pair; });
if (group == "System presets")
std::sort(list.begin(), list.end(), [&filament_orders, &preset_filament_vendors, &first_vendors, &preset_filament_types, &first_types](auto *l, auto *r) { std::sort(list.begin(), list.end(), [&filament_orders, &preset_filament_vendors, &first_vendors, &preset_filament_types, &first_types](auto *l, auto *r) {
{ // Compare order { // Compare order
auto iter1 = std::find(filament_orders.begin(), filament_orders.end(), l->first); auto iter1 = std::find(filament_orders.begin(), filament_orders.end(), l->first);