job_status: fix not fitting on 480 wide screens
This commit is contained in:
parent
8a29b6e125
commit
35498d39c7
@ -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):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user