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

simplify name spliting

Browse Source
This commit is contained in:
alfrix
2022-07-15 19:11:49 -03:00
committed by Alfredo Monclus
parent 317f9df4b5
commit a0cff7ec56
6 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
panels/base_panel.py
View File

@@ -186,8 +186,7 @@ class BasePanel(ScreenPanel):
# Users can fill the bar if they want
if n >= nlimit + 1:
break
name = device if (device.startswith("extruder") or device.startswith("heater_bed")) \
else " ".join(device.split(" ")[1:])
name = device.split()[1] if len(device.split()) > 1 else device
for item in titlebar_items:
if name == item:
self.control['temp_box'].add(self.labels[f"{device}_box"])
@@ -235,9 +234,11 @@ class BasePanel(ScreenPanel):
name = ""
if not (device.startswith("extruder") or device.startswith("heater_bed")):
if self.titlebar_name_type == "full":
name = " ".join(device.split(" ")[1:]).capitalize().replace("_", " ") + ": "
name = device.split()[1] if len(device.split()) > 1 else device
name = f'{name.capitalize().replace("_", " ")}: '
elif self.titlebar_name_type == "short":
name = " ".join(device.split(" ")[1:])[:1].upper() + ": "
name = device.split()[1] if len(device.split()) > 1 else device
name = f"{name[:1].upper()}: "
self.labels[device].set_label(f"{name}{int(temp)}°")
with contextlib.suppress(KeyError):