juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 00:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix/wipe-tower-outside-boundary-on-first-slice

Browse Source
This commit is contained in:
SoftFever
2026-03-15 17:40:56 +08:00
committed by GitHub
parent ad0cce4c38 d28e964e04
commit 65d4be8cea
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/UnsavedChangesDialog.cpp
View File

@@ -2220,6 +2220,10 @@ void DiffPresetDialog::update_tree()
m_tree->model->AddPreset(type, "\"" + from_u8(left_preset->name) + "\" vs \"" + from_u8(right_preset->name) + "\"", left_pt);
const std::map<wxString, std::string>& category_icon_map = wxGetApp().get_tab(type)->get_category_icon_map();
auto get_category_icon = [&category_icon_map](const wxString& key) {
auto it = category_icon_map.find(key);
return it != category_icon_map.end() ? it->second : std::string();
};
// process changes of extruders count
if (type == Preset::TYPE_PRINTER && left_pt == ptFFF &&
@@ -2228,7 +2232,8 @@ void DiffPresetDialog::update_tree()
wxString left_val = from_u8((boost::format("%1%") % left_config.opt<ConfigOptionStrings>("extruder_colour")->values.size()).str());
wxString right_val = from_u8((boost::format("%1%") % right_congig.opt<ConfigOptionStrings>("extruder_colour")->values.size()).str());
m_tree->Append("extruders_count", type, "General", "Capabilities", local_label, left_val, right_val, category_icon_map.at("Basic information"));
m_tree->Append("extruders_count", type, "General", "Capabilities", local_label, left_val, right_val,
get_category_icon("Basic information"));
}
for (const std::string& opt_key : dirty_options) {
@@ -2247,7 +2252,7 @@ void DiffPresetDialog::update_tree()
continue;
}
m_tree->Append(opt_key, type, option.category_local, option.group_local, option.label_local,
left_val, right_val, category_icon_map.at(option.category));
left_val, right_val, get_category_icon(option.category));
}
}