diff --git a/BlocksScreen/lib/panels/filamentTab.py b/BlocksScreen/lib/panels/filamentTab.py index dfeadfea..2abee1cd 100644 --- a/BlocksScreen/lib/panels/filamentTab.py +++ b/BlocksScreen/lib/panels/filamentTab.py @@ -127,7 +127,7 @@ def on_extruder_update( if self.target_temp != 0: if self.current_temp == self.target_temp: - self.loadscreen.set_status_message("Extruder heated up \n please wait") + self.loadscreen.set_status_message("Extruder heated up \n Please wait") return if field == "temperature": diff --git a/BlocksScreen/lib/panels/printTab.py b/BlocksScreen/lib/panels/printTab.py index 788b30f4..d899c5e1 100644 --- a/BlocksScreen/lib/panels/printTab.py +++ b/BlocksScreen/lib/panels/printTab.py @@ -176,6 +176,16 @@ def __init__( self.jobStatusPage_widget.on_print_stats_update ) + self.printer.print_stats_update[str, str].connect( + self.on_print_stats_update + ) + self.printer.print_stats_update[str, dict].connect( + self.on_print_stats_update + ) + self.printer.print_stats_update[str, float].connect( + self.on_print_stats_update + ) + self.printer.gcode_move_update[str, list].connect( self.jobStatusPage_widget.on_gcode_move_update ) @@ -256,11 +266,27 @@ def __init__( self.delete_file ) - self.change_page( self.indexOf(self.print_page) ) # force set the initial page + @QtCore.pyqtSlot(str, dict, name="on_print_stats_update") + @QtCore.pyqtSlot(str, float, name="on_print_stats_update") + @QtCore.pyqtSlot(str, str, name="on_print_stats_update") + def on_print_stats_update( + self, field: str, value: dict | float | str + ) -> None: + """ + unblocks tabs if on standby + """ + if isinstance(value, str): + if "state" in field: + if value in ("standby"): + self.on_cancel_print.emit() + + + + @QtCore.pyqtSlot(str, int, "PyQt_PyObject", name="on_numpad_request") @QtCore.pyqtSlot( str, int, "PyQt_PyObject", int, int, name="on_numpad_request" @@ -317,9 +343,6 @@ def on_dialog_button_clicked(self, button_name: str) -> None: self.dialogPage.hide() - - - def paintEvent(self, a0: QtGui.QPaintEvent) -> None: """ REFACTOR: Instead of using a background svg pixmap just draw the