CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

job_status: Tweaks to state changes

Browse Source
This commit is contained in:
Jordan 2021-10-01 19:48:03 -04:00
parent 3053502a32
commit 969b47f425
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panels/job_status.py
View File

@ -450,9 +450,11 @@ class JobStatusPanel(ScreenPanel):
return True
_ = self.lang.gettext
if ps['state'] == "printing" and self.state != "printing" and self.state != "cancelling":
if ps['state'] == "printing":
if self.state == "cancelling":
return True
self.set_state("printing")
elif ps['state'] == "complete" and self.state != "complete":
elif ps['state'] == "complete":
self.progress = 1
self.update_progress()
self.set_state("complete")
@ -461,7 +463,7 @@ class JobStatusPanel(ScreenPanel):
if timeout != 0:
self.close_timeouts.append(GLib.timeout_add(timeout * 1000, self.close_panel))
return False
elif ps['state'] == "error" and self.state != "error":
elif ps['state'] == "error":
logging.debug("Error!")
self.set_state("error")
self.labels['status'].set_text("%s - %s" % (_("Error"), ps['message']))
@ -470,7 +472,7 @@ class JobStatusPanel(ScreenPanel):
if timeout != 0:
self.close_timeouts.append(GLib.timeout_add(timeout * 1000, self.close_panel))
return False
elif ps['state'] == "standby":
elif ps['state'] == "cancelled" or ps['state'] == "standby":
# Print was cancelled
self.set_state("cancelled")
self._screen.wake_screen()