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

job_status: fix not fitting on 480 wide screens

Browse Source
This commit is contained in:
alfrix 2023-06-13 13:37:18 -03:00
parent 8a29b6e125
commit 35498d39c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panels/job_status.py
View File

@ -557,7 +557,7 @@ class JobStatusPanel(ScreenPanel):
self.req_speed = round(float(data["gcode_move"]["speed"]) / 60 * self.speed_factor) self.req_speed = round(float(data["gcode_move"]["speed"]) / 60 * self.speed_factor)
self.labels['req_speed'].set_label( self.labels['req_speed'].set_label(
f"{self.speed}% {self.vel:3.0f}/{self.req_speed:3.0f} " f"{self.speed}% {self.vel:3.0f}/{self.req_speed:3.0f} "
f"{f'{self.mms}' if self.vel < 1000 and self.req_speed < 1000 and self._screen.width > 480 else ''}" f"{f'{self.mms}' if self.vel < 1000 and self.req_speed < 1000 and self._screen.width > 500 else ''}"
) )
self.buttons['speed'].set_label(self.labels['req_speed'].get_label()) self.buttons['speed'].set_label(self.labels['req_speed'].get_label())
with contextlib.suppress(KeyError): with contextlib.suppress(KeyError):
@ -580,7 +580,7 @@ class JobStatusPanel(ScreenPanel):
self.vel = float(data["motion_report"]["live_velocity"]) self.vel = float(data["motion_report"]["live_velocity"])
self.labels['req_speed'].set_label( self.labels['req_speed'].set_label(
f"{self.speed}% {self.vel:3.0f}/{self.req_speed:3.0f} " f"{self.speed}% {self.vel:3.0f}/{self.req_speed:3.0f} "
f"{f'{self.mms}' if self.vel < 1000 and self.req_speed < 1000 and self._screen.width > 480 else ''}" f"{f'{self.mms}' if self.vel < 1000 and self.req_speed < 1000 and self._screen.width > 500 else ''}"
) )
self.buttons['speed'].set_label(self.labels['req_speed'].get_label()) self.buttons['speed'].set_label(self.labels['req_speed'].get_label())
with contextlib.suppress(KeyError): with contextlib.suppress(KeyError):