CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

spoolman: fix for spools defined with no material or color fixes #1132

Browse Source
This commit is contained in:
alfrix 2023-09-30 15:52:55 -03:00
parent d06231a6b6
commit edf390fe94
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panels/spoolman.py
View File

@ -108,8 +108,9 @@ class SpoolmanSpool(GObject.GObject):
SpoolmanSpool._spool_icon = pathlib.Path(_spool_icon_path).read_text()
loader = GdkPixbuf.PixbufLoader()
color = self.filament.color_hex if hasattr(self.filament, 'color_hex') else '000000'
loader.write(
SpoolmanSpool._spool_icon.replace('var(--filament-color)', f'#{self.filament.color_hex}').encode()
SpoolmanSpool._spool_icon.replace('var(--filament-color)', f'#{color}').encode()
)
loader.close()
self._icon = loader.get_pixbuf()
@ -396,7 +397,9 @@ class Panel(ScreenPanel):
for spool in spools["result"]:
spoolObject = SpoolmanSpool(**spool)
self._model.append(None, [spoolObject])
if spoolObject.filament.material not in materials:
if not hasattr(spoolObject.filament, 'material'):
spoolObject.filament.material = ''
elif spoolObject.filament.material not in materials:
materials.append(spoolObject.filament.material)
materials.sort()