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

main_menu: Show all heaters

Browse Source
This commit is contained in:
Jordan Ruthe 2021-02-19 15:05:12 -05:00
parent da1bdcfb6c
commit 56731e77f6
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
panels/main_menu.py
View File

@ -23,23 +23,32 @@ class MainPanel(MenuPanel):
grid.set_vexpand(True) grid.set_vexpand(True)
# Create Extruders and bed icons # Create Extruders and bed icons
eq_grid = self._gtk.HomogeneousGrid() eq_grid = Gtk.Grid()
eq_grid.set_hexpand(True)
eq_grid.set_vexpand(True)
self.heaters = []
i = 0 i = 0
for x in self._printer.get_tools(): for x in self._printer.get_tools():
if i > 3:
break
self.labels[x] = self._gtk.ButtonImage("extruder-"+str(i), self._gtk.formatTemperatureString(0, 0)) self.labels[x] = self._gtk.ButtonImage("extruder-"+str(i), self._gtk.formatTemperatureString(0, 0))
col = 0 if len(self._printer.get_tools()) == 1 else i%2 self.heaters.append(x)
row = i/2
eq_grid.attach(self.labels[x], col, row, 1, 1)
i += 1 i += 1
if self._printer.has_heated_bed(): add_heaters = self._printer.get_heaters()
self.labels['heater_bed'] = self._gtk.ButtonImage("bed", self._gtk.formatTemperatureString(0, 0)) for h in add_heaters:
if h == "heater_bed":
self.labels[h] = self._gtk.ButtonImage("bed", self._gtk.formatTemperatureString(0, 0))
else:
name = " ".join(h.split(" ")[1:])
self.labels[h] = self._gtk.ButtonImage("heat-up", name)
self.heaters.append(h)
width = 2 if i > 1 else 1 i = 0
eq_grid.attach(self.labels['heater_bed'], 0, i/2+1, width, 1) cols = 3 if len(self.heaters) > 4 else (1 if len(self.heaters) <= 2 else 2)
for h in self.heaters:
eq_grid.attach(self.labels[h], i%cols, int(i/cols), 1, 1)
i += 1
self.items = items self.items = items
self.create_menu_items() self.create_menu_items()
@ -66,21 +75,19 @@ class MainPanel(MenuPanel):
def activate(self): def activate(self):
return return
def update_temp(self, dev, temp, target):
if dev in self.labels:
self.labels[dev].set_label(self._gtk.formatTemperatureString(temp, target))
def process_update(self, action, data): def process_update(self, action, data):
if action != "notify_status_update": if action != "notify_status_update":
return return
self.update_temp("heater_bed",
self._printer.get_dev_stat("heater_bed","temperature"),
self._printer.get_dev_stat("heater_bed","target")
)
for x in self._printer.get_tools(): for x in self._printer.get_tools():
self.update_temp(x, self.update_temp(x,
self._printer.get_dev_stat(x,"temperature"), self._printer.get_dev_stat(x,"temperature"),
self._printer.get_dev_stat(x,"target") self._printer.get_dev_stat(x,"target")
) )
for h in self._printer.get_heaters():
self.update_temp(h,
self._printer.get_dev_stat(h,"temperature"),
self._printer.get_dev_stat(h,"target"),
None if h == "heater_bed" else " ".join(h.split(" ")[1:])
)
return return