From a85e817e15b205820e3d20219c1d26026082c422 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Wed, 12 Jul 2023 15:13:49 +0800 Subject: [PATCH] FIX: selected preset is not correct when switch printer Change-Id: I82d5155a279e36e02f439475839f79cdb738063c --- src/slic3r/GUI/CalibrationWizard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index 2c4b1caba..46b7d72fc 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -568,7 +568,7 @@ void PressureAdvanceWizard::on_cali_save() BedType plate_type = BedType::btDefault; CalibrationPresetPage* preset_page = (static_cast(preset_step->page)); preset_page->get_preset_info(nozzle_dia, plate_type); - std::map selected_filaments = preset_page->get_selected_filaments(); + std::map selected_filaments = get_cached_selected_filament(curr_obj); if (selected_filaments.empty()) { BOOST_LOG_TRIVIAL(error) << "CaliPreset: get selected filaments error"; return; @@ -900,7 +900,7 @@ void FlowRateWizard::on_cali_save() std::string old_preset_name; CalibrationPresetPage* preset_page = (static_cast(preset_step->page)); - std::map selected_filaments = preset_page->get_selected_filaments(); + std::map selected_filaments = get_cached_selected_filament(curr_obj); if (!selected_filaments.empty()) { old_preset_name = selected_filaments.begin()->second->name; } @@ -947,7 +947,7 @@ void FlowRateWizard::on_cali_save() std::string old_preset_name; CalibrationPresetPage* preset_page = (static_cast(preset_step->page)); - std::map selected_filaments = preset_page->get_selected_filaments(); + std::map selected_filaments = get_cached_selected_filament(curr_obj); if (!selected_filaments.empty()) { old_preset_name = selected_filaments.begin()->second->name; } @@ -1212,7 +1212,7 @@ void MaxVolumetricSpeedWizard::on_cali_save() std::string new_preset_name; CalibrationPresetPage *preset_page = (static_cast(preset_step->page)); - std::map selected_filaments = preset_page->get_selected_filaments(); + std::map selected_filaments = get_cached_selected_filament(curr_obj); if (!selected_filaments.empty()) { old_preset_name = selected_filaments.begin()->second->name; }