juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-31 23:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: treat renamed printer presets as compatible aliases

Browse Source
This commit is contained in:
Ian Chua
2026-07-01 12:58:17 +08:00
parent 3c8c667dbd
commit 1a89c18ff2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libslic3r/Preset.cpp
View File

@@ -802,8 +802,8 @@ bool is_compatible_with_parent_printer(const PresetWithVendorProfile& preset, co
bool has_compatible_printers = compatible_printers != nullptr && ! compatible_printers->values.empty(); bool has_compatible_printers = compatible_printers != nullptr && ! compatible_printers->values.empty();
//BBS: FIXME only check the parent now, but should check grand-parent as well. //BBS: FIXME only check the parent now, but should check grand-parent as well.
return has_compatible_printers && return has_compatible_printers &&
std::find(compatible_printers->values.begin(), compatible_printers->values.end(), active_printer.preset.inherits()) != (contains_printer_name(active_printer.preset.inherits()) ||
compatible_printers->values.end(); std::any_of(active_printer.preset.renamed_from.begin(), active_printer.preset.renamed_from.end(), contains_printer_name));
} }
bool is_compatible_with_printer(const PresetWithVendorProfile &preset, const PresetWithVendorProfile &active_printer, const DynamicPrintConfig *extra_config) bool is_compatible_with_printer(const PresetWithVendorProfile &preset, const PresetWithVendorProfile &active_printer, const DynamicPrintConfig *extra_config)
@@ -834,9 +834,13 @@ bool is_compatible_with_printer(const PresetWithVendorProfile &preset, const Pre
return true; return true;
} }
} }
auto contains_printer_name = [compatible_printers](const std::string &printer_name) {
return std::find(compatible_printers->values.begin(), compatible_printers->values.end(), printer_name) !=
compatible_printers->values.end();
};
return preset.preset.is_default || active_printer.preset.name.empty() || !has_compatible_printers || return preset.preset.is_default || active_printer.preset.name.empty() || !has_compatible_printers ||
std::find(compatible_printers->values.begin(), compatible_printers->values.end(), active_printer.preset.name) != contains_printer_name(active_printer.preset.name) ||
compatible_printers->values.end() || std::any_of(active_printer.preset.renamed_from.begin(), active_printer.preset.renamed_from.end(), contains_printer_name) ||
(!active_printer.preset.is_system && is_compatible_with_parent_printer(preset, active_printer)); (!active_printer.preset.is_system && is_compatible_with_parent_printer(preset, active_printer));
} }