From da164b495ed82e6a3212eba4754b080781fdc495 Mon Sep 17 00:00:00 2001 From: alfrix Date: Sat, 26 Nov 2022 23:21:07 -0300 Subject: [PATCH] job_status: change slicer-filament-file times to totals --- panels/job_status.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/panels/job_status.py b/panels/job_status.py index 6c3a6ee6..08ff255e 100644 --- a/panels/job_status.py +++ b/panels/job_status.py @@ -660,18 +660,15 @@ class JobStatusPanel(ScreenPanel): # speed_factor compensation based on empirical testing spdcomp = sqrt(self.speed_factor) slicer_time = ((self.file_metadata['estimated_time'] * usrcomp) / spdcomp) + non_printing - self.labels["slicer_time"].set_label(f"{self.format_time(slicer_time)} | " - f"{self.format_eta(slicer_time, total_duration)}") + self.labels["slicer_time"].set_label(self.format_time(slicer_time)) with contextlib.suppress(Exception): if self.file_metadata['filament_total'] > fila_used: 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)} | " - f"{self.format_eta(filament_time, total_duration)}") + self.labels["filament_time"].set_label(self.format_time(filament_time)) with contextlib.suppress(ZeroDivisionError): file_time = (total_duration / self.progress) + non_printing - self.labels["file_time"].set_label(f"{self.format_time(file_time)} | " - f"{self.format_eta(file_time, total_duration)}") + self.labels["file_time"].set_label(self.format_time(file_time)) if timeleft_type == "file": estimated = file_time