From 9409ec35a3b2730029c3618fa0103658c9c5a3c6 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Mon, 26 Aug 2024 15:16:15 +0800 Subject: [PATCH] FIX: modify for virtual slot when multi_extruder jira: none Change-Id: Ic7284018ecb44e24536788b05dba572b96460e66 (cherry picked from commit 52e890fba1584bf9687a24ee46890c00f531e383) --- src/slic3r/GUI/CalibrationWizardPresetPage.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 3c0ad6decb..148568c5af 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -740,12 +740,20 @@ void CalibrationPresetPage::create_filament_list_panel(wxWindow* parent) NozzleVolumeType CalibrationPresetPage::get_nozzle_volume_type(int extruder_id) const { - return NozzleVolumeType(m_comboBox_nozzle_volume_types[extruder_id]->GetSelection()); + if (m_comboBox_nozzle_volume_types.size() > extruder_id) + return NozzleVolumeType(m_comboBox_nozzle_volume_types[extruder_id]->GetSelection()); + else { + return NozzleVolumeType::nvtNormal; + } } ExtruderType CalibrationPresetPage::get_extruder_type(int extruder_id) const { - return ExtruderType(m_extrder_types[extruder_id]); + if (m_extrder_types.size() > extruder_id) + return ExtruderType(m_extrder_types[extruder_id]); + else { + return ExtruderType::etDirectDrive; + } } void CalibrationPresetPage::create_multi_extruder_filament_list_panel(wxWindow *parent) @@ -2289,14 +2297,14 @@ void CalibrationPresetPage::update_filament_combobox(std::string ams_id) // update virtual tray combo box m_virtual_tray_comboBox->update_from_preset(); auto it = std::find_if(filament_ams_list.begin(), filament_ams_list.end(), [](auto& entry) { - return entry.first == VIRTUAL_TRAY_DEPUTY_ID; + return entry.first == VIRTUAL_TRAY_MAIN_ID; }); if (it != filament_ams_list.end()) { - m_virtual_tray_comboBox->load_tray_from_ams(VIRTUAL_TRAY_DEPUTY_ID, it->second); + m_virtual_tray_comboBox->load_tray_from_ams(VIRTUAL_TRAY_MAIN_ID, it->second); } else { - m_virtual_tray_comboBox->load_tray_from_ams(VIRTUAL_TRAY_DEPUTY_ID, empty_config); + m_virtual_tray_comboBox->load_tray_from_ams(VIRTUAL_TRAY_MAIN_ID, empty_config); } if (filament_ams_list.empty())