FIX: modify for get pa cali result

jira: none
Change-Id: I3c57ccaac3b7e73e0b2eb0e26678635478480298
(cherry picked from commit 6bf39690517f9e25de895bf52673d3a4a7b77255)
This commit is contained in:
zhimin.zeng
2024-11-12 09:18:40 +08:00
committed by Noisyfox
parent b4f1ef06a2
commit 92972879f5
7 changed files with 20 additions and 34 deletions

View File

@@ -544,7 +544,9 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
}
else {
PACalibIndexInfo select_index_info;
select_index_info.tray_id = slot_id;
select_index_info.tray_id = ams_id * 4 + slot_id;
select_index_info.ams_id = ams_id;
select_index_info.slot_id = slot_id;
select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
select_index_info.cali_idx = -1;
select_index_info.filament_id = selected_ams_id;
@@ -676,6 +678,8 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
if (obj->cali_version >= 0) {
PACalibIndexInfo select_index_info;
select_index_info.tray_id = vt_tray;
select_index_info.ams_id = vt_tray;
select_index_info.slot_id = 0;
select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
auto cali_select_id = m_comboBox_cali_result->GetSelection();
@@ -715,6 +719,8 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
if (obj->cali_version >= 0) {
PACalibIndexInfo select_index_info;
select_index_info.tray_id = cali_tray_id;
select_index_info.ams_id = ams_id;
select_index_info.slot_id = slot_id;
select_index_info.nozzle_diameter = obj->m_extder_data.extders[0].diameter;
auto cali_select_id = m_comboBox_cali_result->GetSelection();