amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: update calibration status

Browse source 
Change-Id: I38a4340bf744b5aab29b95986ff0424250a179c5
This commit is contained in:
Stone Li 2022-10-19 12:04:36 +08:00 committed by Lane.Wei
parent 095243eff3
commit 23339c94ec
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/Calibration.cpp
View file

@ -158,7 +158,7 @@ void CalibrationDialog::on_dpi_changed(const wxRect &suggested_rect) {}
void CalibrationDialog::update_cali(MachineObject *obj)
{
if (!obj) return;
if (obj->is_in_calibration() || obj->is_calibration_done()) {
if (obj->is_calibration_running() || obj->is_calibration_done()) {
if (obj->is_calibration_done()) {
m_calibration_btn->Enable();
m_calibration_btn->SetLabel(_L("Completed"));

5
src/slic3r/GUI/StatusPanel.cpp
View file

@ -1775,7 +1775,7 @@ void StatusPanel::update_cali(MachineObject *obj)
{
if (!obj) return;
if (obj->is_in_calibration()) {
if (obj->is_calibration_running()) {
m_calibration_btn->SetLabel(_L("Calibrating"));
if (calibration_dlg && calibration_dlg->IsShown()) {
m_calibration_btn->Disable();
@ -1851,7 +1851,8 @@ void StatusPanel::update_subtask(MachineObject *obj)
{
if (!obj) return;
if (obj->is_system_printing()) {
if (obj->is_system_printing()
|| obj->is_in_calibration()) {
reset_printing_values();
} else if (obj->is_in_printing() || obj->print_status == "FINISH") {
if (obj->is_in_prepare()) {