add: added more features

Author: Roberto Martins

BlocksScreen/lib/panels/filamentTab.py

@@ -92,7 +92,6 @@ def __init__(self, parent: QtWidgets.QWidget, printer: Printer, ws, /) -> None:
             lambda: self.request_change_tab.emit(0)
         )
         self.run_gcode.connect(self.ws.api.run_gcode)
-        self.printer.extruder_update.connect(self.on_extruder_update)
         self.printer.unload_filament_update.connect(self.on_unload_filament)
         self.printer.load_filament_update.connect(self.on_load_filament)
         self.printer.filament_switch_sensor_update.connect(
@@ -103,10 +102,9 @@ def __init__(self, parent: QtWidgets.QWidget, printer: Printer, ws, /) -> None:
         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.loadignore = True
-        self.unloadignore = True
 
         self.printer.save_variables_update.connect(self.on_save_variables_update)
+        self.state = "standby"
 
     def on_save_variables_update(self, save_variables: dict):
         """Handle query response"""
@@ -125,6 +123,7 @@ def on_print_stats_update(self, field: str, value: dict | float | str) -> None:
         """Handle print stats object update"""
         if isinstance(value, str):
             if "state" in field:
+                self.state = value
                 if value in ("printing", "pausing", "paused", "resuming"):
                     self.panel.main_back_button.show()
                     self.panel.spacerItem1.changeSize(
@@ -134,8 +133,6 @@ def on_print_stats_update(self, field: str, value: dict | float | str) -> None:
                         QtWidgets.QSizePolicy.Policy.Minimum,
                     )
                 if value in ("standby"):
-                    self.loadignore = True
-                    self.unloadignore = True
                     self.panel.main_back_button.hide()
                     self.panel.spacerItem1.changeSize(
                         0,
@@ -160,63 +157,29 @@ def on_filament_sensor_update(self, sensor_name: str, parameter: str, value: boo
                 return
         self.handle_filament_state()
 
-    @QtCore.pyqtSlot(str, str, float, name="on_extruder_update")
-    def on_extruder_update(
-        self, extruder_name: str, field: str, new_value: float
-    ) -> None:
-        """Handle extruder update"""
-        if not self.isVisible:
-            return
-        if not self.loadignore or not self.unloadignore:
-            if self.target_temp != 0:
-                if self.current_temp == self.target_temp:
-                    if self.isVisible:
-                        self.call_load_panel.emit(
-                            True, "Extruder heated up \n Please wait"
-                        )
-                    return
-                if field == "temperature":
-                    self.current_temp = round(new_value, 0)
-                    if self.isVisible:
-                        self.call_load_panel.emit(
-                            True,
-                            f"Heating up ({new_value}/{self.target_temp}) \n Please wait",
-                        )
-            if field == "target":
-                self.target_temp = round(new_value, 0)
-                if self.isVisible:
-                    self.call_load_panel.emit(True, "Heating up \n Please wait")
-
-    @QtCore.pyqtSlot(bool, name="on_load_filament")
-    def on_load_filament(self, status: bool):
+
+    @QtCore.pyqtSlot(dict, name="on_load_filament")
+    def on_load_filament(self, status: dict):
         """Handle load filament object updated"""
-        if not self.isVisible:
-            return
-        if self.loadignore:
-            return
-        if status:
-            self.call_load_panel.emit(True, "Loading Filament")
-        else:
-            self.loadignore = True
-            self.target_temp = 0
-            self.call_load_panel.emit(False, "")
-            self._filament_state = self.FilamentStates.LOADED
+        if "state" in status.keys():
+            if not status["state"]:
+                self.target_temp = 0
+                self.call_load_panel.emit(False, "")
+                if self.state == "printing":
+                    self.request_change_tab.emit(0)
+                return
+        self.call_load_panel.emit(True, f"Loading Filament\n{status['step'].capitalize()}")
         self.handle_filament_state()
 
-    @QtCore.pyqtSlot(bool, name="on_unload_filament")
-    def on_unload_filament(self, status: bool):
+    @QtCore.pyqtSlot(dict, name="on_unload_filament")
+    def on_unload_filament(self, status: dict):
         """Handle unload filament object updated"""
-        if not self.isVisible:
-            return
-        if self.unloadignore:
-            return
-        if status:
-            self.call_load_panel.emit(True, "Unloading Filament")
-        else:
-            self.unloadignore = True
-            self.call_load_panel.emit(False, "")
-            self.target_temp = 0
-            self._filament_state = self.FilamentStates.UNLOADED
+        if "state" in status.keys():
+            if not status["state"]:
+                self.target_temp = 0
+                self.call_load_panel.emit(False, "")
+                return
+        self.call_load_panel.emit(True, f"Unloading Filament\n{status['step'].capitalize()}")
         self.handle_filament_state()
 
     @QtCore.pyqtSlot(int, int, name="load_filament")
@@ -239,7 +202,6 @@ def load_filament(
                 message="Filament is already loaded.",
             )
             return
-        self.loadignore = False
         self.call_load_panel.emit(True, "Loading Filament")
         self.run_gcode.emit(
             f"""SAVE_VARIABLE VARIABLE=filament_type VALUE='"{filament.value.name}"'"""
@@ -268,7 +230,6 @@ def unload_filament(self, toolhead: int = 0, temp: int = 220) -> None:
             return
 
         self.find_routine_objects()
-        self.unloadignore = False
         self.call_load_panel.emit(True, "Unloading Filament")
         self.run_gcode.emit(
             f"""SAVE_VARIABLE VARIABLE=filament_type VALUE='"{FilamentTypes.UNKNOWN.value.name}"'"""

BlocksScreen/lib/panels/mainWindow.py

@@ -175,7 +175,7 @@ def __init__(self):
         self.ui.filament_type_icon.clicked.connect(
             lambda: self.global_change_page(
                 self.ui.main_content_widget.indexOf(self.ui.filamentTab),
-                self.filamentPanel.indexOf(self.filamentPanel.panel.load_page),
+                self.filamentPanel.indexOf(self.filamentPanel),
             )
         )
         self.ui.filament_type_icon.setText("PLA")
@@ -294,10 +294,6 @@ def handle_cancel_print(self, show: bool = True):
     def show_LoadScreen(self, show: bool = True, msg: str = ""):
         """Show or hide the loading overlay, guarded by the calling panel's visibility."""
         _sender = self.sender()
-
-        if _sender == self.filamentPanel:
-            if not self.filamentPanel.isVisible():
-                return
         if _sender == self.controlPanel:
             if not self.controlPanel.isVisible():
                 return
@@ -307,7 +303,6 @@ def show_LoadScreen(self, show: bool = True, msg: str = ""):
         if _sender == self.utilitiesPanel:
             if not self.utilitiesPanel.isVisible():
                 return
-
         self.loadwidget.set_status_message(msg)
         if show:
             self.loadscreen.show()
@@ -341,8 +336,6 @@ def on_cancel_print(self):
         self.enable_tab_bar()
         self.ui.extruder_temp_display.clicked.disconnect()
         self.ui.bed_temp_display.clicked.disconnect()
-        self.ui.filament_type_icon.setDisabled(False)
-        self.ui.nozzle_size_icon.setDisabled(False)
         self.ui.extruder_temp_display.clicked.connect(
             lambda: self.global_change_page(
                 self.ui.main_content_widget.indexOf(self.ui.controlTab),
@@ -430,14 +423,18 @@ def reset_tab_indexes(self):
         Used to grantee all tabs reset to their
         first page once the user leaves the tab
         """
+        self.filamentPanel.setCurrentIndex(0)
+
         if self.print_status == "printing":
+            self.printPanel.setCurrentIndex(self.printPanel.indexOf(self.printPanel.jobStatusPage_widget))
             return
-        self.update_page.hide()
         self.printPanel.setCurrentIndex(0)
-        self.filamentPanel.setCurrentIndex(0)
         self.controlPanel.setCurrentIndex(0)
         self.utilitiesPanel.setCurrentIndex(0)
-        self.networkPanel.setCurrentIndex(0)
+        self.networkPanel.setCurrentIndex(0)     
+        self.update_page.hide()
+        
+
 
     def current_panel_index(self) -> int:
         """Helper function to get the index of the current page in the current tab
@@ -840,8 +837,6 @@ def event(self, event: QtCore.QEvent) -> bool:
             self.disable_tab_bar()
             self.ui.extruder_temp_display.clicked.disconnect()
             self.ui.bed_temp_display.clicked.disconnect()
-            self.ui.filament_type_icon.setDisabled(True)
-            self.ui.nozzle_size_icon.setDisabled(True)
             self.ui.extruder_temp_display.clicked.connect(
                 lambda: self.global_change_page(
                     self.ui.main_content_widget.indexOf(self.ui.printTab),
@@ -867,8 +862,6 @@ def event(self, event: QtCore.QEvent) -> bool:
             self.enable_tab_bar()
             self.ui.extruder_temp_display.clicked.disconnect()
             self.ui.bed_temp_display.clicked.disconnect()
-            self.ui.filament_type_icon.setDisabled(False)
-            self.ui.nozzle_size_icon.setDisabled(False)
             self.ui.extruder_temp_display.clicked.connect(
                 lambda: self.global_change_page(
                     self.ui.main_content_widget.indexOf(self.ui.controlTab),

BlocksScreen/lib/printer.py

@@ -64,8 +64,8 @@ class Printer(QtCore.QObject):
     gcode_macro_update = QtCore.pyqtSignal(str, dict, name="gcode_macro_update")
     webhooks_update = QtCore.pyqtSignal(str, str, name="webhooks_update")
 
-    load_filament_update = QtCore.pyqtSignal(bool, name="load_filament_update")
-    unload_filament_update = QtCore.pyqtSignal(bool, name="unload_filament_update")
+    load_filament_update = QtCore.pyqtSignal(dict, name="load_filament_update")
+    unload_filament_update = QtCore.pyqtSignal(dict, name="unload_filament_update")
 
     query_printer_object = QtCore.pyqtSignal(dict, name="query_printer_object")
     save_config_pending: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
@@ -741,9 +741,7 @@ def _temperature_probe_object_updated(self, values: dict, name: str) -> None:
 
     # TODO: testing needed here idk if does work
     def _unload_filament_object_updated(self, values: dict, name: str) -> None:
-        if "state" in values.keys():
-            self.unload_filament_update[bool].emit(values["state"])
+        self.unload_filament_update[dict].emit(values)
 
     def _load_filament_object_updated(self, values: dict, name: str) -> None:
-        if "state" in values.keys():
-            self.load_filament_update[bool].emit(values["state"])
+        self.load_filament_update[dict].emit(values)