3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 23:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert "Use the material alternative GUID if not found"

Browse source 
This reverts commit dbb994b6c1.
This commit is contained in:
Erwan MATHIEU 2025-02-06 15:53:22 +01:00
parent dbb994b6c1
commit 25c2e75f34
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py
View file

@ -40,9 +40,6 @@ class ClusterPrinterConfigurationMaterial(BaseModel):
container_registry = ContainerRegistry.getInstance() container_registry = ContainerRegistry.getInstance()
same_guid = container_registry.findInstanceContainersMetadata(GUID = self.guid) same_guid = container_registry.findInstanceContainersMetadata(GUID = self.guid)
if not same_guid:
same_guid = container_registry.findInstanceContainersMetadata(alternative_GUID = self.guid)
if same_guid: if same_guid:
read_only = sorted(filter(lambda metadata: container_registry.isReadOnly(metadata["id"]), same_guid), key = lambda metadata: metadata["name"]) read_only = sorted(filter(lambda metadata: container_registry.isReadOnly(metadata["id"]), same_guid), key = lambda metadata: metadata["name"])
if read_only: if read_only:
@ -51,11 +48,10 @@ class ClusterPrinterConfigurationMaterial(BaseModel):
material_metadata = min(same_guid, key = lambda metadata: metadata["name"]) material_metadata = min(same_guid, key = lambda metadata: metadata["name"])
else: else:
material_metadata = { material_metadata = {
"GUID": self.guid,
"color_code": self.color, "color_code": self.color,
"brand": self.brand, "brand": self.brand,
"material": self.material, "material": self.material,
"name": "Empty" if self.material == "empty" else "Unknown" "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"])