From ea10d5e6087135609b3d0b3fa87ff5af9cdc3940 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 19 Oct 2018 11:36:11 +0200 Subject: [PATCH] Rename to comptabileMaterialDiameter CURA-5834 This property returns the material diameter an extruder is compatible with, so this makes it more clear. --- cura/Settings/ExtruderStack.py | 4 ++-- plugins/3MFReader/ThreeMFWorkspaceReader.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py index ca687e358b..ae0c2a7893 100644 --- a/cura/Settings/ExtruderStack.py +++ b/cura/Settings/ExtruderStack.py @@ -70,7 +70,7 @@ class ExtruderStack(CuraContainerStack): # If the machine has no requirement for the diameter, -1 is returned. # \return The filament diameter for the printer @property - def materialDiameter(self) -> float: + def comptabileMaterialDiameter(self) -> float: context = PropertyEvaluationContext(self) context.context["evaluate_from_container_index"] = _ContainerIndexes.Variant @@ -86,7 +86,7 @@ class ExtruderStack(CuraContainerStack): # \return The approximate filament diameter for the printer @pyqtProperty(float) def approximateMaterialDiameter(self) -> float: - return round(float(self.materialDiameter)) + return round(float(self.comptabileMaterialDiameter)) ## Overridden from ContainerStack # diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 429d4ab7d4..e56e4c0f13 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -926,7 +926,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): build_plate_id = global_stack.variant.getId() # get material diameter of this extruder - machine_material_diameter = extruder_stack.materialDiameter + machine_material_diameter = extruder_stack.comptabileMaterialDiameter material_node = material_manager.getMaterialNode(global_stack.definition.getId(), extruder_stack.variant.getName(), build_plate_id,