Skip to content

[port] Snap #1052: switch edited filament preset on single-filament sync #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aceRage merged 2 commits into from
Oct 24, 2026
Merged

[port] Snap #1052: switch edited filament preset on single-filament sync #647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c03b803
Switch the edited filament preset on single-filament sync (Snapmaker …
aceRage Oct 23, 2026
eca66d2
Merge remote-tracking branch 'origin/main' into pr647-squash
aceRage Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/slic3r/GUI/Plater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10118,6 +10118,10 @@ void Sidebar::apply_machine_filament_sync(std::vector<FilamentData>& machineFila
ConfigOptionStrings* mco = preset_bundle->project_config.option<ConfigOptionStrings>("filament_multi_colors");
ConfigOptionInts* cmo = preset_bundle->project_config.option<ConfigOptionInts>("filament_colour_mode");

// Snapmaker #1052: slot 0's name is taken only after Edge's own fallback
// (CANVAS Generic @ECC, then vendor/colour resolve). Upstream records a
// single resolve_filament_preset(); that would skip the CANVAS Generic path.
std::string slot0_matched_preset;
for (size_t i = 0; i < effective_size; ++i) {
const std::string synced_colour = into_u8(getMainColor(syncedData[i].m_color).GetAsString(wxC2S_HTML_SYNTAX));
Preset* matched = nullptr;
Expand All @@ -10136,6 +10140,8 @@ void Sidebar::apply_machine_filament_sync(std::vector<FilamentData>& machineFila
syncedData[i].m_vendor, synced_colour);
if (matched) {
preset_bundle->set_filament_preset(i, matched->name);
if (i == 0)
slot0_matched_preset = matched->name;
}

if (co && i < co->values.size()) {
Expand Down Expand Up @@ -10165,6 +10171,33 @@ void Sidebar::apply_machine_filament_sync(std::vector<FilamentData>& machineFila
const size_t num_filaments = effective_size;
wxGetApp().plater()->on_filaments_change(num_filaments);

// Snapmaker #1052: single-filament projects slice from the edited filament
// preset, which set_filament_preset() above does not switch. Deferred via
// CallAfter: running the switch and the config propagation inline inside
// the sync dialog's event context froze the UI.
const bool switch_edited_preset = num_filaments == 1 && !slot0_matched_preset.empty() &&
preset_bundle->filaments.get_edited_preset().name != slot0_matched_preset;
{
const std::string preset_to_select = slot0_matched_preset;
wxGetApp().CallAfter([switch_edited_preset, preset_to_select]() {
// Re-fetch: a captured Plater* could dangle across GUI recreation.
Plater* plater = wxGetApp().plater();
if (plater == nullptr)
return;
if (switch_edited_preset) {
// Edge's normal filament-select path (Plater::priv::on_select_preset):
// Tab::select_preset then on_config_change, so the Tab and the plater
// config both pick up the synced preset.
Tab* filament_tab = wxGetApp().get_tab(Preset::TYPE_FILAMENT);
if (filament_tab != nullptr)
filament_tab->select_preset(preset_to_select);
}
PresetBundle* bundle = wxGetApp().preset_bundle;
if (bundle != nullptr)
plater->on_config_change(bundle->full_config());
});
}

wxGetApp().get_tab(Preset::TYPE_PRINT)->update();
preset_bundle->export_selections(*wxGetApp().app_config);

Expand Down