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

base_panel: fix titlebar items not showing if ks is started while printing

Browse Source
This commit is contained in:
alfrix 2022-04-12 16:21:35 -03:00
parent 430284b7a1
commit b3268223bb
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
panels/base_panel.py
View File

@ -138,16 +138,17 @@ class BasePanel(ScreenPanel):
for child in self.control['temp_box'].get_children(): for child in self.control['temp_box'].get_children():
self.control['temp_box'].remove(child) self.control['temp_box'].remove(child)
if show is False or self._printer.get_temp_store_devices() is None: if (not show or self._screen.printer.get_temp_store_devices() is None):
return return
for device in self._printer.get_temp_store_devices(): for device in self._screen.printer.get_temp_store_devices():
logging.info(device)
self.labels[device + '_box'] = Gtk.Box(spacing=0) self.labels[device + '_box'] = Gtk.Box(spacing=0)
self.labels[device] = Gtk.Label(label="100º") self.labels[device] = Gtk.Label(label="100º")
self.labels[device].set_ellipsize(True) self.labels[device].set_ellipsize(True)
self.labels[device].set_ellipsize(Pango.EllipsizeMode.START) self.labels[device].set_ellipsize(Pango.EllipsizeMode.START)
if device.startswith("extruder"): if device.startswith("extruder"):
if self._printer.extrudercount > 1: if self._screen.printer.extrudercount > 1:
if device == "extruder": if device == "extruder":
ext_img = self._gtk.Image("extruder-0", .5) ext_img = self._gtk.Image("extruder-0", .5)
else: else:
@ -177,12 +178,12 @@ class BasePanel(ScreenPanel):
nlimit = 5 nlimit = 5
n = 0 n = 0
if self._printer.get_tools(): if self._screen.printer.get_tools():
self.current_extruder = self._printer.get_stat("toolhead", "extruder") self.current_extruder = self._screen.printer.get_stat("toolhead", "extruder")
self.control['temp_box'].pack_start(self.labels["%s_box" % self.current_extruder], True, True, 3) self.control['temp_box'].pack_start(self.labels["%s_box" % self.current_extruder], True, True, 3)
n += 1 n += 1
if self._printer.has_heated_bed(): if self._screen.printer.has_heated_bed():
self.control['temp_box'].pack_start(self.labels['heater_bed_box'], True, True, 3) self.control['temp_box'].pack_start(self.labels['heater_bed_box'], True, True, 3)
n += 1 n += 1
@ -195,7 +196,7 @@ class BasePanel(ScreenPanel):
logging.info("Titlebar items: %s", titlebar_items) logging.info("Titlebar items: %s", titlebar_items)
self.titlebar_name_type = printer_cfg.get("titlebar_name_type", None) self.titlebar_name_type = printer_cfg.get("titlebar_name_type", None)
logging.info("Titlebar name type: %s", self.titlebar_name_type) logging.info("Titlebar name type: %s", self.titlebar_name_type)
for device in self._printer.get_temp_store_devices(): for device in self._screen.printer.get_temp_store_devices():
# Users can fill the bar if they want # Users can fill the bar if they want
if n >= nlimit + 1: if n >= nlimit + 1:
break break
@ -210,12 +211,13 @@ class BasePanel(ScreenPanel):
break break
# If there is enough space fill with heater_generic # If there is enough space fill with heater_generic
for device in self._printer.get_temp_store_devices(): for device in self._screen.printer.get_temp_store_devices():
if n >= nlimit: if n >= nlimit:
break break
if device.startswith("heater_generic"): if device.startswith("heater_generic"):
self.control['temp_box'].pack_start(self.labels["%s_box" % device], True, True, 3) self.control['temp_box'].pack_start(self.labels["%s_box" % device], True, True, 3)
n += 1 n += 1
self.control['temp_box'].show_all()
def activate(self): def activate(self):
if self.time_update is None: if self.time_update is None:
@ -243,10 +245,10 @@ class BasePanel(ScreenPanel):
return self.layout return self.layout
def process_update(self, action, data): def process_update(self, action, data):
if action != "notify_status_update" or self._printer is None: if action != "notify_status_update" or self._screen.printer is None:
return return
devices = self._printer.get_temp_store_devices() devices = self._screen.printer.get_temp_store_devices()
if devices is not None: if devices is not None:
for device in devices: for device in devices:
name = "" name = ""
@ -255,7 +257,7 @@ class BasePanel(ScreenPanel):
name = device.split(" ")[1:][0].capitalize().replace("_", " ") + ": " name = device.split(" ")[1:][0].capitalize().replace("_", " ") + ": "
elif self.titlebar_name_type == "short": elif self.titlebar_name_type == "short":
name = device.split(" ")[1:][0][:1].upper() + ": " name = device.split(" ")[1:][0][:1].upper() + ": "
temp = self._printer.get_dev_stat(device, "temperature") temp = self._screen.printer.get_dev_stat(device, "temperature")
if temp is not None: if temp is not None:
self.labels[device].set_label("%s%d°" % (name, round(temp))) self.labels[device].set_label("%s%d°" % (name, round(temp)))

3
screen.py
View File

@ -773,7 +773,7 @@ class KlipperScreen(Gtk.Window):
if prev_state not in ['paused', 'printing']: if prev_state not in ['paused', 'printing']:
self.init_printer() self.init_printer()
self.base_panel._printer = self.printer self.base_panel._printer = self.printer
self.base_panel.show_heaters() self.base_panel.show_heaters(True)
self.printer_ready() self.printer_ready()
@ -1012,6 +1012,7 @@ class KlipperScreen(Gtk.Window):
def printer_printing(self): def printer_printing(self):
self.close_popup_message() self.close_popup_message()
self.show_panel('job_status', "job_status", "Print Status", 2) self.show_panel('job_status', "job_status", "Print Status", 2)
self.base_panel.show_heaters(True)
def show_keyboard(self, widget=None): def show_keyboard(self, widget=None):
if self.keyboard is not None: if self.keyboard is not None: