From 9297890d78ec78d522f88e2b65480870a1e6576f Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 27 Aug 2019 17:21:05 +0200 Subject: [PATCH] Fix typing of approximate diameter and add typing to function for it Seems I forgot to add typing and that's biting my bum right now. Contributes to issue CURA-6600. --- cura/Machines/Models/MaterialManagementModel.py | 2 +- cura/Machines/VariantNode.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py index 6ff836cef2..90e63e6240 100644 --- a/cura/Machines/Models/MaterialManagementModel.py +++ b/cura/Machines/Models/MaterialManagementModel.py @@ -151,7 +151,7 @@ class MaterialManagementModel(QObject): # Find the preferred material. extruder_stack = application.getMachineManager().activeStack 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()] preferred_material_node = machine_node.variants[active_variant_name].preferredMaterial(approximate_diameter) diff --git a/cura/Machines/VariantNode.py b/cura/Machines/VariantNode.py index f5a1e3006e..abcd588c4a 100644 --- a/cura/Machines/VariantNode.py +++ b/cura/Machines/VariantNode.py @@ -79,7 +79,7 @@ class VariantNode(ContainerNode): # material. # \return The node for the preferred material, or any arbitrary material # 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(): if self.machine.preferred_material in base_material and approximate_diameter == int(material_node.getMetaDataEntry("approximate_diameter")): return material_node