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

job_status: fix percentage above 100; fix no timeout for job complete

Browse Source
This commit is contained in:
Jordan 2020-12-28 15:53:20 -05:00
parent 9aa4389eaf
commit 389eceaf06
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panels/job_status.py
View File

@ -397,7 +397,8 @@ class JobStatusPanel(ScreenPanel):
self.set_state("complete")
self.show_buttons_for_state()
timeout = self._config.get_main_config().getint("job_complete_timeout", 30)
GLib.timeout_add(timeout * 1000, self.close_panel)
if timeout != 0:
GLib.timeout_add(timeout * 1000, self.close_panel)
elif ps['state'] == "error" and self.state != "error":
logger.debug("Error!")
self.set_state("error")
@ -510,7 +511,7 @@ class JobStatusPanel(ScreenPanel):
self.labels[label].set_text(text)
def update_progress (self):
self.labels['progress_text'].set_text("%s%%" % (str(int(self.progress*100))))
self.labels['progress_text'].set_text("%s%%" % (str( min(int(self.progress*100),100) )))
#def update_temp(self, dev, temp, target):
# if dev in self.labels: