GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-22 12:39:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix typing of approximate diameter and add typing to function for it

Browse Source 
Seems I forgot to add typing and that's biting my bum right now.

Contributes to issue CURA-6600.
This commit is contained in:
Ghostkeeper 2019-08-27 17:21:05 +02:00
parent 3952366798
commit 9297890d78
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Machines/Models/MaterialManagementModel.py
View File

@ -151,7 +151,7 @@ class MaterialManagementModel(QObject):
# Find the preferred material. # Find the preferred material.
extruder_stack = application.getMachineManager().activeStack extruder_stack = application.getMachineManager().activeStack
active_variant_name = extruder_stack.variant.getName() active_variant_name = extruder_stack.variant.getName()
approximate_diameter = str(extruder_stack.approximateMaterialDiameter) approximate_diameter = int(extruder_stack.approximateMaterialDiameter)
machine_node = ContainerTree.getInstance().machines[application.getGlobalContainerStack().definition.getId()] machine_node = ContainerTree.getInstance().machines[application.getGlobalContainerStack().definition.getId()]
preferred_material_node = machine_node.variants[active_variant_name].preferredMaterial(approximate_diameter) preferred_material_node = machine_node.variants[active_variant_name].preferredMaterial(approximate_diameter)

2
cura/Machines/VariantNode.py
View File

@ -79,7 +79,7 @@ class VariantNode(ContainerNode):
# material. # material.
# \return The node for the preferred material, or any arbitrary material # \return The node for the preferred material, or any arbitrary material
# if there is no match. # if there is no match.
def preferredMaterial(self, approximate_diameter) -> MaterialNode: def preferredMaterial(self, approximate_diameter: int) -> MaterialNode:
for base_material, material_node in self.materials.items(): for base_material, material_node in self.materials.items():
if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")):
return material_node return material_node