Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BlocksScreen/lib/panels/filamentTab.py
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
31 changes: 27 additions & 4 deletions BlocksScreen/lib/panels/printTab.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down