CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

job_status: change slicer-filament-file times to totals

Browse Source
This commit is contained in:
alfrix 2022-11-26 23:21:07 -03:00
parent 26030526a9
commit da164b495e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panels/job_status.py
View File

@ -660,18 +660,15 @@ class JobStatusPanel(ScreenPanel):
# speed_factor compensation based on empirical testing # speed_factor compensation based on empirical testing
spdcomp = sqrt(self.speed_factor) spdcomp = sqrt(self.speed_factor)
slicer_time = ((self.file_metadata['estimated_time'] * usrcomp) / spdcomp) + non_printing slicer_time = ((self.file_metadata['estimated_time'] * usrcomp) / spdcomp) + non_printing
self.labels["slicer_time"].set_label(f"{self.format_time(slicer_time)} | " self.labels["slicer_time"].set_label(self.format_time(slicer_time))
f"{self.format_eta(slicer_time, total_duration)}")
with contextlib.suppress(Exception): with contextlib.suppress(Exception):
if self.file_metadata['filament_total'] > fila_used: if self.file_metadata['filament_total'] > fila_used:
filament_time = (total_duration / (fila_used / self.file_metadata['filament_total'])) + non_printing filament_time = (total_duration / (fila_used / self.file_metadata['filament_total'])) + non_printing
self.labels["filament_time"].set_label(f"{self.format_time(filament_time)} | " self.labels["filament_time"].set_label(self.format_time(filament_time))
f"{self.format_eta(filament_time, total_duration)}")
with contextlib.suppress(ZeroDivisionError): with contextlib.suppress(ZeroDivisionError):
file_time = (total_duration / self.progress) + non_printing file_time = (total_duration / self.progress) + non_printing
self.labels["file_time"].set_label(f"{self.format_time(file_time)} | " self.labels["file_time"].set_label(self.format_time(file_time))
f"{self.format_eta(file_time, total_duration)}")
if timeleft_type == "file": if timeleft_type == "file":
estimated = file_time estimated = file_time