FIX: cannot calibrate when printer is offline [STUDIO-3387]
Change-Id: I93cf532363bc41feee0deb9782906bd3e79ee127
This commit is contained in:
parent
7b6b4bd958
commit
59b6b59a9a
|
@ -556,6 +556,13 @@ void PressureAdvanceWizard::on_cali_start()
|
||||||
void PressureAdvanceWizard::on_cali_save()
|
void PressureAdvanceWizard::on_cali_save()
|
||||||
{
|
{
|
||||||
if (curr_obj) {
|
if (curr_obj) {
|
||||||
|
if (curr_obj->is_connecting() || !curr_obj->is_connected())
|
||||||
|
{
|
||||||
|
MessageDialog msg_dlg(nullptr, _L("Connecting to printer..."), wxEmptyString, wxOK);
|
||||||
|
msg_dlg.ShowModal();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (curr_obj->get_printer_series() == PrinterSeries::SERIES_X1) {
|
if (curr_obj->get_printer_series() == PrinterSeries::SERIES_X1) {
|
||||||
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
|
||||||
std::vector<PACalibResult> new_pa_cali_results;
|
std::vector<PACalibResult> new_pa_cali_results;
|
||||||
|
|
|
@ -144,7 +144,7 @@ void CalibrationCaliPage::update(MachineObject* obj)
|
||||||
|
|
||||||
if (obj->print_status == "RUNNING")
|
if (obj->print_status == "RUNNING")
|
||||||
m_is_between_start_and_running = false;
|
m_is_between_start_and_running = false;
|
||||||
if (m_is_between_start_and_running) {
|
if (obj->is_connecting() || !obj->is_connected() || m_is_between_start_and_running) {
|
||||||
reset_printing_values();
|
reset_printing_values();
|
||||||
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, false);
|
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, false);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1159,6 +1159,10 @@ void CalibrationPresetPage::update_show_status()
|
||||||
show_status(CaliPresetPageStatus::CaliPresetStatusUnsupportedPrinter);
|
show_status(CaliPresetPageStatus::CaliPresetStatusUnsupportedPrinter);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (obj_->is_connecting() || !obj_->is_connected()) {
|
||||||
|
show_status(CaliPresetPageStatus::CaliPresetStatusInConnecting);
|
||||||
|
return;
|
||||||
|
}
|
||||||
else if (obj_->is_in_upgrading()) {
|
else if (obj_->is_in_upgrading()) {
|
||||||
show_status(CaliPresetPageStatus::CaliPresetStatusInUpgrading);
|
show_status(CaliPresetPageStatus::CaliPresetStatusInUpgrading);
|
||||||
return;
|
return;
|
||||||
|
@ -1310,6 +1314,11 @@ void CalibrationPresetPage::show_status(CaliPresetPageStatus status)
|
||||||
update_print_status_msg(wxEmptyString, false);
|
update_print_status_msg(wxEmptyString, false);
|
||||||
Enable_Send_Button(false);
|
Enable_Send_Button(false);
|
||||||
}
|
}
|
||||||
|
else if (status == CaliPresetPageStatus::CaliPresetStatusInConnecting) {
|
||||||
|
wxString msg_text = _L("Connecting to printer");
|
||||||
|
update_print_status_msg(msg_text, true);
|
||||||
|
Enable_Send_Button(false);
|
||||||
|
}
|
||||||
|
|
||||||
Layout();
|
Layout();
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,6 +118,7 @@ enum CaliPresetPageStatus
|
||||||
CaliPresetStatusNeedForceUpgrading,
|
CaliPresetStatusNeedForceUpgrading,
|
||||||
CaliPresetStatusNeedConsistencyUpgrading,
|
CaliPresetStatusNeedConsistencyUpgrading,
|
||||||
CaliPresetStatusUnsupportedPrinter,
|
CaliPresetStatusUnsupportedPrinter,
|
||||||
|
CaliPresetStatusInConnecting,
|
||||||
CaliPresetStatusFilamentIncompatible,
|
CaliPresetStatusFilamentIncompatible,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue