GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 03:55:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use variant node's preferredMaterial function from MaterialManager too

Browse Source 
We can reuse that code.

Contributes to issue CURA-6600.
This commit is contained in:
Ghostkeeper 2019-08-22 15:46:29 +02:00
parent 0302ae4257
commit 81a33af3aa
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/Machines/MaterialManager.py
View File

@ -242,11 +242,7 @@ class MaterialManager(QObject):
if nozzle_name not in machine_node.variants:
Logger.log("w", "Could not find variant {nozzle_name} for machine with definition {definition_id} in the container tree".format(nozzle_name = nozzle_name, definition_id = definition_id))
return None
available_materials = machine_node.variants[nozzle_name].materials
for base_material, material_node in available_materials.items():
if machine_node.preferred_material in base_material and approximate_material_diameter == int(material_node.getMetaDataEntry("approximate_diameter")):
return material_node
return None
return machine_node.variants[nozzle_name].preferredMaterial(approximate_material_diameter)
def removeMaterialByRootId(self, root_material_id: str):
container_registry = CuraContainerRegistry.getInstance()