3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-27 09:59:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: Third-party filament show Incompatible in cali

Browse source 
jira: STUDIO-11306
Change-Id: Id63f935a478cef92d720cd602ff19dbe87ca1c8e
(cherry picked from commit 7ef9a211233db7f1d0f50a074074eff2e43dccd6)
This commit is contained in:
zhimin.zeng 2025-04-07 21:27:25 +08:00 • committed by Noisyfox
parent 836cfc5383
commit d5f11037fa
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/PresetComboBoxes.cpp
View file

@ -1633,6 +1633,16 @@ void GUI::CalibrateFilamentComboBox::load_tray(DynamicPrintConfig &config)
bool is_compatible = m_preset_bundle->calibrate_filaments.find(&f) != m_preset_bundle->calibrate_filaments.end();
return is_compatible && f.filament_id == m_filament_id;
});
// Prioritize matching system presets. If there are no system presets, match all presets.
if (iter == filaments.end()) {
iter = std::find_if(filaments.begin(), filaments.end(), [this](auto &f) {
if (f.is_system) // Only match system preset
return false;
bool is_compatible = m_preset_bundle->calibrate_filaments.find(&f) != m_preset_bundle->calibrate_filaments.end();
return is_compatible && f.filament_id == m_filament_id;
});
}
//if (iter == filaments.end() && !m_filament_type.empty()) {
// auto filament_type = "Generic " + m_filament_type;
// iter = std::find_if(filaments.begin(), filaments.end(),