FIX: the k value of slot is set to default value
when enter "merge result" in cali page jira: STUDIO-10409 Change-Id: I03c49306342cda9b9c305b188201ec6f5b6ab1f1
This commit is contained in:
parent
6c5b63db24
commit
75ab432b12
|
@ -183,8 +183,22 @@ void HistoryWindow::sync_history_result(MachineObject* obj)
|
||||||
BOOST_LOG_TRIVIAL(info) << "sync_history_result";
|
BOOST_LOG_TRIVIAL(info) << "sync_history_result";
|
||||||
|
|
||||||
m_calib_results_history.clear();
|
m_calib_results_history.clear();
|
||||||
if (obj)
|
if (obj) {
|
||||||
|
if (obj->is_multi_extruders()) {
|
||||||
|
for (const PACalibResult &pa_result : obj->pa_calib_tab) {
|
||||||
|
if (pa_result.extruder_id == 0 && m_extruder_switch_btn->GetValue()) {
|
||||||
|
// left extruder
|
||||||
|
m_calib_results_history.emplace_back(pa_result);
|
||||||
|
} else if (pa_result.extruder_id == 1 && !m_extruder_switch_btn->GetValue()) {
|
||||||
|
// right extruder
|
||||||
|
m_calib_results_history.emplace_back(pa_result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
m_calib_results_history = obj->pa_calib_tab;
|
m_calib_results_history = obj->pa_calib_tab;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (m_calib_results_history.empty()) {
|
if (m_calib_results_history.empty()) {
|
||||||
m_tips->SetLabel(_L("No History Result"));
|
m_tips->SetLabel(_L("No History Result"));
|
||||||
|
@ -274,6 +288,7 @@ void HistoryWindow::reqeust_history_result(MachineObject* obj)
|
||||||
cali_info.nozzle_diameter = nozzle_value;
|
cali_info.nozzle_diameter = nozzle_value;
|
||||||
cali_info.extruder_id = extruder_id;
|
cali_info.extruder_id = extruder_id;
|
||||||
cali_info.use_nozzle_volume_type = false;
|
cali_info.use_nozzle_volume_type = false;
|
||||||
|
cali_info.use_extruder_id = false;
|
||||||
CalibUtils::emit_get_PA_calib_infos(cali_info);
|
CalibUtils::emit_get_PA_calib_infos(cali_info);
|
||||||
m_tips->SetLabel(_L("Refreshing the historical Flow Dynamics Calibration records"));
|
m_tips->SetLabel(_L("Refreshing the historical Flow Dynamics Calibration records"));
|
||||||
BOOST_LOG_TRIVIAL(info) << "request calib history";
|
BOOST_LOG_TRIVIAL(info) << "request calib history";
|
||||||
|
|
Loading…
Reference in New Issue