From d18f64922127df1c2012ffe84e7e8e6a8933da6d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Feb 2025 14:22:23 +0100 Subject: [PATCH 1/3] Add missing Sketch printers extruders name mapping CURA-12401 --- cura/PrinterOutput/FormatMaps.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/PrinterOutput/FormatMaps.py b/cura/PrinterOutput/FormatMaps.py index 3bb6263a289..1974f4c08c5 100644 --- a/cura/PrinterOutput/FormatMaps.py +++ b/cura/PrinterOutput/FormatMaps.py @@ -25,7 +25,10 @@ class FormatMaps: "mk14_c": "1C", "mk14": "1A", "mk14_s": "2A", - "mk14_e": "LABS" + "mk14_e": "LABS", + "sketch_extruder": "0.4mm", + "sketch_l_extruder": "0.4mm", + "sketch_sprint_extruder": "0.4mm", } # A map from the material-name in their native file-formats to some info, including the internal name we use. From dbb994b6c1dfd8fc56156a4cddbd8b8a83482efe Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Feb 2025 08:35:56 +0100 Subject: [PATCH 2/3] Use the material alternative GUID if not found CURA-12401 --- .../src/Models/Http/ClusterPrinterConfigurationMaterial.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py index 6f2992a03bb..4c6d4a15b9a 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py @@ -40,6 +40,9 @@ def createOutputModel(self) -> MaterialOutputModel: container_registry = ContainerRegistry.getInstance() same_guid = container_registry.findInstanceContainersMetadata(GUID = self.guid) + if not same_guid: + same_guid = container_registry.findInstanceContainersMetadata(alternative_GUID = self.guid) + if same_guid: read_only = sorted(filter(lambda metadata: container_registry.isReadOnly(metadata["id"]), same_guid), key = lambda metadata: metadata["name"]) if read_only: @@ -48,10 +51,11 @@ def createOutputModel(self) -> MaterialOutputModel: material_metadata = min(same_guid, key = lambda metadata: metadata["name"]) else: material_metadata = { + "GUID": self.guid, "color_code": self.color, "brand": self.brand, "material": self.material, "name": "Empty" if self.material == "empty" else "Unknown" } - return MaterialOutputModel(guid = self.guid, type = material_metadata["material"], brand = material_metadata["brand"], color = material_metadata.get("color_code", "#ffc924"), name = material_metadata["name"]) + return MaterialOutputModel(guid = material_metadata["GUID"], type = material_metadata["material"], brand = material_metadata["brand"], color = material_metadata.get("color_code", "#ffc924"), name = material_metadata["name"]) From 25c2e75f345306a5e4fd72c03ec3fb1cc58e03cb Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Feb 2025 15:53:22 +0100 Subject: [PATCH 3/3] Revert "Use the material alternative GUID if not found" This reverts commit dbb994b6c1dfd8fc56156a4cddbd8b8a83482efe. --- .../src/Models/Http/ClusterPrinterConfigurationMaterial.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py index 4c6d4a15b9a..6f2992a03bb 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py @@ -40,9 +40,6 @@ def createOutputModel(self) -> MaterialOutputModel: container_registry = ContainerRegistry.getInstance() same_guid = container_registry.findInstanceContainersMetadata(GUID = self.guid) - if not same_guid: - same_guid = container_registry.findInstanceContainersMetadata(alternative_GUID = self.guid) - if same_guid: read_only = sorted(filter(lambda metadata: container_registry.isReadOnly(metadata["id"]), same_guid), key = lambda metadata: metadata["name"]) if read_only: @@ -51,11 +48,10 @@ def createOutputModel(self) -> MaterialOutputModel: material_metadata = min(same_guid, key = lambda metadata: metadata["name"]) else: material_metadata = { - "GUID": self.guid, "color_code": self.color, "brand": self.brand, "material": self.material, "name": "Empty" if self.material == "empty" else "Unknown" } - return MaterialOutputModel(guid = material_metadata["GUID"], type = material_metadata["material"], brand = material_metadata["brand"], color = material_metadata.get("color_code", "#ffc924"), name = material_metadata["name"]) + return MaterialOutputModel(guid = self.guid, type = material_metadata["material"], brand = material_metadata["brand"], color = material_metadata.get("color_code", "#ffc924"), name = material_metadata["name"])