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

base_panel: change how it shows controls and heaters to avoid issues

Browse Source
This commit is contained in:
alfrix 2022-11-04 10:17:51 -03:00
parent 3be65a686a
commit 2fef5660cb
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panels/base_panel.py
View File

@ -24,7 +24,7 @@ class BasePanel(ScreenPanel):
'back': not back, 'back': not back,
'macros_shortcut': False, 'macros_shortcut': False,
'printer_select': False, 'printer_select': False,
'estop': True, 'estop': False,
} }
self.current_extruder = None self.current_extruder = None
# Action bar buttons # Action bar buttons

1
panels/job_status.py
View File

@ -365,6 +365,7 @@ class JobStatusPanel(ScreenPanel):
self.create_status_grid() self.create_status_grid()
if self.vel_timeout is None: if self.vel_timeout is None:
self.vel_timeout = GLib.timeout_add_seconds(1, self.update_velocity) self.vel_timeout = GLib.timeout_add_seconds(1, self.update_velocity)
self._screen.base_panel_show_all()
def deactivate(self): def deactivate(self):
if self.vel_timeout is not None: if self.vel_timeout is not None:

1
panels/main_menu.py
View File

@ -74,6 +74,7 @@ class MainPanel(MenuPanel):
# This has a high impact on load # This has a high impact on load
self.graph_update = GLib.timeout_add_seconds(5, self.update_graph) self.graph_update = GLib.timeout_add_seconds(5, self.update_graph)
self.update_graph_visibility() self.update_graph_visibility()
self._screen.base_panel_show_all()
def deactivate(self): def deactivate(self):
if self.graph_update: if self.graph_update:

16
screen.py
View File

@ -162,8 +162,6 @@ class KlipperScreen(Gtk.Window):
while len(self.printer_select_callbacks) > 0: while len(self.printer_select_callbacks) > 0:
i = self.printer_select_callbacks.pop(0) i = self.printer_select_callbacks.pop(0)
i() i()
if self.printer.get_state() not in ["disconnected", "error", "startup", "shutdown"]:
self.base_panel.show_heaters(True)
self.base_panel.show_printer_select(True) self.base_panel.show_printer_select(True)
return return
@ -784,10 +782,6 @@ class KlipperScreen(Gtk.Window):
self.printer_select_callbacks = [self.state_ready] self.printer_select_callbacks = [self.state_ready]
return return
self.base_panel.show_macro_shortcut(self._config.get_main_config().getboolean('side_macro_shortcut', True))
self.base_panel.show_heaters(True)
self.base_panel.show_estop(True)
# Do not return to main menu if completing a job, timeouts/user input will return # Do not return to main menu if completing a job, timeouts/user input will return
if "job_status" in self._cur_panels or "main_menu" in self._cur_panels: if "job_status" in self._cur_panels or "main_menu" in self._cur_panels:
return return
@ -1037,10 +1031,16 @@ class KlipperScreen(Gtk.Window):
self.panels['splash_screen'].update_text(msg) self.panels['splash_screen'].update_text(msg)
return False return False
def base_panel_show_all(self):
self.base_panel.show_macro_shortcut(self._config.get_main_config().getboolean('side_macro_shortcut', True))
self.base_panel.show_heaters(True)
self.base_panel.show_estop(True)
def printer_ready(self): def printer_ready(self):
self.close_popup_message() self.close_popup_message()
self.show_panel('main_panel', "main_menu", None, 2, self.show_panel('main_panel', "main_menu", None, 2,
items=self._config.get_menu_items("__main"), extrudercount=self.printer.get_extruder_count()) items=self._config.get_menu_items("__main"), extrudercount=self.printer.get_extruder_count())
self.base_panel_show_all()
self.ws_subscribe() self.ws_subscribe()
if "job_status" in self.panels: if "job_status" in self.panels:
self.remove_subscription("job_status") self.remove_subscription("job_status")
@ -1049,9 +1049,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", _("Printing"), 2) self.show_panel('job_status', "job_status", _("Printing"), 2)
self.base_panel.show_heaters(True) self.base_panel_show_all()
self.base_panel.show_macro_shortcut(self._config.get_main_config().getboolean('side_macro_shortcut', True))
self.base_panel.show_estop(True)
for dialog in self.dialogs: for dialog in self.dialogs:
dialog.destroy() dialog.destroy()