Merge branch 'master' into feature_intent_container_tree

plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterMaterialStationSlot.py

@@ -1,5 +1,7 @@
 # Copyright (c) 2019 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
+from typing import Optional
+
 from .ClusterPrintCoreConfiguration import ClusterPrintCoreConfiguration
 
 
@@ -10,8 +12,11 @@ class ClusterPrinterMaterialStationSlot(ClusterPrintCoreConfiguration):
     #  \param slot_index: The index of the slot in the material station (ranging 0 to 5).
     #  \param compatible: Whether the configuration is compatible with the print core.
     #  \param material_remaining: How much material is remaining on the spool (between 0 and 1, or -1 for missing data).
-    def __init__(self, slot_index: int, compatible: bool, material_remaining: float, **kwargs):
+    #  \param material_empty: Whether the material spool is too empty to be used.
+    def __init__(self, slot_index: int, compatible: bool, material_remaining: float,
+                 material_empty: Optional[bool] = False, **kwargs):
         self.slot_index = slot_index
         self.compatible = compatible
         self.material_remaining = material_remaining
+        self.material_empty = material_empty
         super().__init__(**kwargs)

plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py

@@ -66,7 +66,11 @@ class ClusterPrinterStatus(BaseModel):
     ## Creates a new output model.
     #  \param controller - The controller of the model.
     def createOutputModel(self, controller: PrinterOutputController) -> PrinterOutputModel:
-        model = PrinterOutputModel(controller, len(self.configuration), firmware_version = self.firmware_version)
+        # FIXME
+        # Note that we're using '2' here as extruder count. We have hardcoded this for now to prevent issues where the
+        # amount of extruders coming back from the API is actually lower (which it can be if a printer was just added
+        # to a cluster). This should be fixed in the future, probably also on the cluster API side.
+        model = PrinterOutputModel(controller, 2, firmware_version = self.firmware_version)
         self.updateOutputModel(model)
         return model
 
@@ -80,6 +84,11 @@ class ClusterPrinterStatus(BaseModel):
         model.updateBuildplate(self.build_plate.type if self.build_plate else "glass")
         model.setCameraUrl(QUrl("http://{}:8080/?action=stream".format(self.ip_address)))
 
+        if not model.printerConfiguration:
+            # Prevent accessing printer configuration when not available.
+            # This sometimes happens when a printer was just added to a group and Cura is connected to that group.
+            return
+
         # Set the possible configurations based on whether a Material Station is present or not.
         if self.material_station and self.material_station.material_slots:
             self._updateAvailableConfigurations(model)
@@ -115,7 +124,7 @@ class ClusterPrinterStatus(BaseModel):
     #  We filter out any slot that is not supported by the extruder index, print core type or if the material is empty.
     @staticmethod
     def _isSupportedConfiguration(slot: ClusterPrinterMaterialStationSlot, extruder_index: int) -> bool:
-        return slot.extruder_index == extruder_index and slot.compatible
+        return slot.extruder_index == extruder_index and slot.compatible and not slot.material_empty
 
     ## Create an empty material slot with a fake empty material.
     @staticmethod