FIX: sync some differences from master

and cherry pick I6d6b337176bb1dd9e99b51b67065e103d054201d
jira: none

Change-Id: I0902ab2986ec1b604eeb67062e886f9fe2151b6a
(cherry picked from commit 90291d550b96de31c9c50814b19d88a453c57290)
This commit is contained in:
zhimin.zeng
2025-09-10 14:28:45 +08:00
committed by Noisyfox
parent a941895fe7
commit 14716da0c3
4 changed files with 92 additions and 66 deletions

View File

@@ -970,6 +970,7 @@ void PressureAdvanceWizard::on_cali_save()
if (save_page->is_all_failed()) {
MessageDialog msg_dlg(nullptr, _L("The failed test result has been dropped."), wxEmptyString, wxOK);
msg_dlg.ShowModal();
back_preset_info(curr_obj, true);
show_step(start_step);
return;
}
@@ -1383,6 +1384,7 @@ void FlowRateWizard::on_cali_save()
if (save_page->is_all_failed()) {
MessageDialog msg_dlg(nullptr, _L("The failed test result has been dropped."), wxEmptyString, wxOK);
msg_dlg.ShowModal();
back_preset_info(curr_obj, true);
show_step(start_step);
return;
}
@@ -1762,6 +1764,7 @@ void MaxVolumetricSpeedWizard::on_cali_save()
MessageDialog msg_dlg(nullptr, _L("Max volumetric speed calibration result has been saved to preset."), wxEmptyString, wxOK);
msg_dlg.ShowModal();
back_preset_info(curr_obj, true);
show_step(start_step);
}