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

gcode_macros: Update to hide macros based on settings

Browse Source
This commit is contained in:
Jordan Ruthe 2021-01-07 01:02:38 -05:00
parent 934acd0ad0
commit ca8abecb55
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
panels/gcode_macros.py
View File

@ -16,6 +16,7 @@ class MacroPanel(ScreenPanel):
def initialize(self, panel_name): def initialize(self, panel_name):
_ = self.lang.gettext _ = self.lang.gettext
self.macros = {} self.macros = {}
self.loaded_macros = []
# Create a scroll window for the macros # Create a scroll window for the macros
scroll = Gtk.ScrolledWindow() scroll = Gtk.ScrolledWindow()
@ -31,10 +32,12 @@ class MacroPanel(ScreenPanel):
box.set_vexpand(True) box.set_vexpand(True)
box.pack_start(scroll, True, True, 0) box.pack_start(scroll, True, True, 0)
self.load_gcode_macros()
self.content.add(box) self.content.add(box)
def activate(self):
self.unload_gcode_macros()
self.load_gcode_macros()
def add_gcode_macro(self, macro): def add_gcode_macro(self, macro):
frame = Gtk.Frame() frame = Gtk.Frame()
@ -73,6 +76,7 @@ class MacroPanel(ScreenPanel):
macros = sorted(self.macros) macros = sorted(self.macros)
pos = macros.index(macro) pos = macros.index(macro)
self.loaded_macros.append(macro)
self.labels['macros'].insert_row(pos) self.labels['macros'].insert_row(pos)
self.labels['macros'].attach(self.macros[macro]['row'], 0, pos, 1, 1) self.labels['macros'].attach(self.macros[macro]['row'], 0, pos, 1, 1)
self.labels['macros'].show_all() self.labels['macros'].show_all()
@ -80,7 +84,23 @@ class MacroPanel(ScreenPanel):
def load_gcode_macros(self): def load_gcode_macros(self):
macros = self._screen.printer.get_gcode_macros() macros = self._screen.printer.get_gcode_macros()
for x in macros: for x in macros:
self.add_gcode_macro(x[12:]) macro = x[12:]
if macro in self.loaded_macros:
continue
if ("displayed_macros" not in self._config.get_config().sections() or
self._config.get_config().getboolean("displayed_macros", macro, fallback=True)):
self.add_gcode_macro(macro)
def run_gcode_macro(self, widget, macro): def run_gcode_macro(self, widget, macro):
self._screen._ws.klippy.gcode_script(macro) self._screen._ws.klippy.gcode_script(macro)
def unload_gcode_macros(self):
for macro in self.loaded_macros:
if ("displayed_macros" in self._config.get_config().sections() and
not self._config.get_config().getboolean("displayed_macros", macro, fallback=True)):
macros = sorted(self.macros)
pos = macros.index(macro)
self.labels['macros'].remove_row(pos)
self.labels['macros'].show_all()