3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-17 11:47:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: selected preset is not correct when switch printer

Browse source 
Change-Id: I82d5155a279e36e02f439475839f79cdb738063c
This commit is contained in:
zhimin.zeng 2023-07-12 15:13:49 +08:00 • committed by Lane.Wei
parent e555b404e5
commit a85e817e15
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/CalibrationWizard.cpp
View file

@ -568,7 +568,7 @@ void PressureAdvanceWizard::on_cali_save()
BedType plate_type = BedType::btDefault; BedType plate_type = BedType::btDefault;
CalibrationPresetPage* preset_page = (static_cast<CalibrationPresetPage*>(preset_step->page)); CalibrationPresetPage* preset_page = (static_cast<CalibrationPresetPage*>(preset_step->page));
preset_page->get_preset_info(nozzle_dia, plate_type); preset_page->get_preset_info(nozzle_dia, plate_type);
std::map<int, Preset*> selected_filaments = preset_page->get_selected_filaments(); std::map<int, Preset*> selected_filaments = get_cached_selected_filament(curr_obj);
if (selected_filaments.empty()) { if (selected_filaments.empty()) {
BOOST_LOG_TRIVIAL(error) << "CaliPreset: get selected filaments error"; BOOST_LOG_TRIVIAL(error) << "CaliPreset: get selected filaments error";
return; return;
@ -900,7 +900,7 @@ void FlowRateWizard::on_cali_save()
std::string old_preset_name; std::string old_preset_name;
CalibrationPresetPage* preset_page = (static_cast<CalibrationPresetPage*>(preset_step->page)); CalibrationPresetPage* preset_page = (static_cast<CalibrationPresetPage*>(preset_step->page));
std::map<int, Preset*> selected_filaments = preset_page->get_selected_filaments(); std::map<int, Preset*> selected_filaments = get_cached_selected_filament(curr_obj);
if (!selected_filaments.empty()) { if (!selected_filaments.empty()) {
old_preset_name = selected_filaments.begin()->second->name; old_preset_name = selected_filaments.begin()->second->name;
} }
@ -947,7 +947,7 @@ void FlowRateWizard::on_cali_save()
std::string old_preset_name; std::string old_preset_name;
CalibrationPresetPage* preset_page = (static_cast<CalibrationPresetPage*>(preset_step->page)); CalibrationPresetPage* preset_page = (static_cast<CalibrationPresetPage*>(preset_step->page));
std::map<int, Preset*> selected_filaments = preset_page->get_selected_filaments(); std::map<int, Preset*> selected_filaments = get_cached_selected_filament(curr_obj);
if (!selected_filaments.empty()) { if (!selected_filaments.empty()) {
old_preset_name = selected_filaments.begin()->second->name; old_preset_name = selected_filaments.begin()->second->name;
} }
@ -1212,7 +1212,7 @@ void MaxVolumetricSpeedWizard::on_cali_save()
std::string new_preset_name; std::string new_preset_name;
CalibrationPresetPage *preset_page = (static_cast<CalibrationPresetPage *>(preset_step->page)); CalibrationPresetPage *preset_page = (static_cast<CalibrationPresetPage *>(preset_step->page));
std::map<int, Preset *> selected_filaments = preset_page->get_selected_filaments(); std::map<int, Preset *> selected_filaments = get_cached_selected_filament(curr_obj);
if (!selected_filaments.empty()) { if (!selected_filaments.empty()) {
old_preset_name = selected_filaments.begin()->second->name; old_preset_name = selected_filaments.begin()->second->name;
} }