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

job_status: change progress percentage to time-based instead of file-based

Browse Source
This commit is contained in:
alfrix 2023-07-18 17:26:43 -03:00 committed by Alfredo Monclus
parent 3c69bcb4c4
commit 72c6bdfe33
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
panels/job_status.py
View File

@ -592,8 +592,6 @@ class JobStatusPanel(ScreenPanel):
fan_label += f" {self.fans[fan]['name']}{self.fans[fan]['speed']}" fan_label += f" {self.fans[fan]['name']}{self.fans[fan]['speed']}"
if fan_label: if fan_label:
self.buttons['fan'].set_label(fan_label[:12]) self.buttons['fan'].set_label(fan_label[:12])
if "virtual_sdcard" in data and "progress" in data["virtual_sdcard"]:
self.update_progress(data["virtual_sdcard"]["progress"])
if "print_stats" in data: if "print_stats" in data:
with suppress(KeyError): with suppress(KeyError):
self.set_state( self.set_state(
@ -608,11 +606,6 @@ class JobStatusPanel(ScreenPanel):
self.labels['filament_used'].set_label( self.labels['filament_used'].set_label(
f"{float(data['print_stats']['filament_used']) / 1000:.1f} m" f"{float(data['print_stats']['filament_used']) / 1000:.1f} m"
) )
self.update_time_left(
data['print_stats']['total_duration'],
data['print_stats']['print_duration'],
f"{data['print_stats']['filament_used'] if 'filament_used' in 'print_stats' else 0}"
)
if 'info' in data["print_stats"]: if 'info' in data["print_stats"]:
with suppress(KeyError): with suppress(KeyError):
if data["print_stats"]['info']['total_layer'] is not None: if data["print_stats"]['info']['total_layer'] is not None:
@ -628,6 +621,8 @@ class JobStatusPanel(ScreenPanel):
f"{1 + round((self.pos_z - self.f_layer_h) / self.layer_h)} / " f"{1 + round((self.pos_z - self.f_layer_h) / self.layer_h)} / "
f"{self.labels['total_layers'].get_text()}" f"{self.labels['total_layers'].get_text()}"
) )
if self.state in ["printing", "paused"]:
self.update_time_left()
def update_flow(self): def update_flow(self):
if not self.flowstore: if not self.flowstore:
@ -638,8 +633,10 @@ class JobStatusPanel(ScreenPanel):
self.buttons['extrusion'].set_label(f"{self.extrusion:3}% {self.flowrate:5.1f} {self.mms3}") self.buttons['extrusion'].set_label(f"{self.extrusion:3}% {self.flowrate:5.1f} {self.mms3}")
return True return True
def update_time_left(self, total_duration:int, print_duration:int, fila_used='0'): def update_time_left(self):
fila_used = float(fila_used) total_duration = float(self._printer.get_stat('print_stats', 'total_duration'))
print_duration = float(self._printer.get_stat('print_stats', 'print_duration'))
fila_used = float(self._printer.get_stat('print_stats', 'filament_used'))
self.labels["duration"].set_label(self.format_time(total_duration)) self.labels["duration"].set_label(self.format_time(total_duration))
elapsed_label = f"{self.labels['elapsed'].get_text()} {self.labels['duration'].get_text()}" elapsed_label = f"{self.labels['elapsed'].get_text()} {self.labels['duration'].get_text()}"
self.buttons['elapsed'].set_label(elapsed_label) self.buttons['elapsed'].set_label(elapsed_label)
@ -657,10 +654,10 @@ class JobStatusPanel(ScreenPanel):
with suppress(Exception): with 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 = (print_duration / (fila_used / self.file_metadata['filament_total'])) + non_printing
self.labels["filament_time"].set_label(self.format_time(filament_time)) self.labels["filament_time"].set_label(self.format_time(filament_time))
with suppress(ZeroDivisionError): with suppress(ZeroDivisionError):
file_time = (total_duration / self.progress) + non_printing file_time = (print_duration / self._printer.get_stat("virtual_sdcard", "progress")) + non_printing
self.labels["file_time"].set_label(self.format_time(file_time)) self.labels["file_time"].set_label(self.format_time(file_time))
if timeleft_type == "file": if timeleft_type == "file":
@ -685,6 +682,12 @@ class JobStatusPanel(ScreenPanel):
self.labels["time_left"].set_label(self.format_eta(estimated, total_duration)) self.labels["time_left"].set_label(self.format_eta(estimated, total_duration))
remaining_label = f"{self.labels['left'].get_text()} {self.labels['time_left'].get_text()}" remaining_label = f"{self.labels['left'].get_text()} {self.labels['time_left'].get_text()}"
self.buttons['left'].set_label(remaining_label) self.buttons['left'].set_label(remaining_label)
self.update_progress(min(max(total_duration / estimated, 0), 1))
def update_progress(self, progress: float):
self.progress = progress
self.labels['progress_text'].set_label(f"{progress * 100:.0f}%")
self.labels['darea'].queue_draw()
def set_state(self, state, msg=""): def set_state(self, state, msg=""):
if state == "printing": if state == "printing":
@ -825,8 +828,3 @@ class JobStatusPanel(ScreenPanel):
logging.debug("Cannot find file metadata. Listening for updated metadata") logging.debug("Cannot find file metadata. Listening for updated metadata")
self._screen.files.add_file_callback(self._callback_metadata) self._screen.files.add_file_callback(self._callback_metadata)
self.show_file_thumbnail() self.show_file_thumbnail()
def update_progress(self, progress:float):
self.labels['progress_text'].set_label(f"{progress * 100:.0f}%")
self.progress = progress
self.labels['darea'].queue_draw()