From 94ef0b92fe8642ef3b4f4e795340a82b0b205f26 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Tue, 23 Oct 2018 10:25:13 +0200
Subject: [PATCH] Fix typo in the getCompatibleMaterialDiameter function.

Contributes to CURA-5834.
---
 cura/Settings/ExtruderStack.py                         |  8 ++++----
 cura/Settings/MachineManager.py                        |  2 +-
 plugins/3MFReader/ThreeMFWorkspaceReader.py            |  2 +-
 .../MachineSettingsAction/MachineSettingsAction.qml    | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py
index 02e8824a9d..d7faedb71c 100644
--- a/cura/Settings/ExtruderStack.py
+++ b/cura/Settings/ExtruderStack.py
@@ -71,7 +71,7 @@ class ExtruderStack(CuraContainerStack):
     #
     #   If the machine has no requirement for the diameter, -1 is returned.
     #   \return The filament diameter for the printer
-    def getComptabileMaterialDiameter(self) -> float:
+    def getCompatibleMaterialDiameter(self) -> float:
         context = PropertyEvaluationContext(self)
         context.context["evaluate_from_container_index"] = _ContainerIndexes.Variant
 
@@ -79,7 +79,7 @@ class ExtruderStack(CuraContainerStack):
 
     def setCompatibleMaterialDiameter(self, value: float) -> None:
         old_approximate_diameter = self.getApproximateMaterialDiameter()
-        if self.getComptabileMaterialDiameter() != value:
+        if self.getCompatibleMaterialDiameter() != value:
             self.definitionChanges.setProperty("material_diameter", "value", value)
             self.compatibleMaterialDiameterChanged.emit()
 
@@ -88,7 +88,7 @@ class ExtruderStack(CuraContainerStack):
                 self.approximateMaterialDiameterChanged.emit()
 
     compatibleMaterialDiameter = pyqtProperty(float, fset = setCompatibleMaterialDiameter,
-                                              fget = getComptabileMaterialDiameter,
+                                              fget = getCompatibleMaterialDiameter,
                                               notify = compatibleMaterialDiameterChanged)
 
     approximateMaterialDiameterChanged = pyqtSignal()
@@ -102,7 +102,7 @@ class ExtruderStack(CuraContainerStack):
     #
     #   \return The approximate filament diameter for the printer
     def getApproximateMaterialDiameter(self) -> float:
-        return round(self.getComptabileMaterialDiameter())
+        return round(self.getCompatibleMaterialDiameter())
 
     approximateMaterialDiameter = pyqtProperty(float, fget = getApproximateMaterialDiameter,
                                                notify = approximateMaterialDiameterChanged)
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index c27e95bbf0..e728ae433b 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -1276,7 +1276,7 @@ class MachineManager(QObject):
             if extruder.variant.getId() != self._empty_variant_container.getId():
                 current_nozzle_name = extruder.variant.getMetaDataEntry("name")
 
-            material_diameter = extruder.getComptabileMaterialDiameter()
+            material_diameter = extruder.getCompatibleMaterialDiameter()
             candidate_materials = self._material_manager.getAvailableMaterials(
                 self._global_container_stack.definition,
                 current_nozzle_name,
diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py
index e56e4c0f13..e994e1a817 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.comptabileMaterialDiameter
+            machine_material_diameter = extruder_stack.getCompatibleMaterialDiameter()
             material_node = material_manager.getMaterialNode(global_stack.definition.getId(),
                                                              extruder_stack.variant.getName(),
                                                              build_plate_id,
diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index be2b1d337a..5109aa05cb 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -410,7 +410,7 @@ Cura.MachineAction
                             }
                             function setValueFunction(value)
                             {
-                                Cura.MachineManager.activeStack.compatibleMaterialDiameter = value;
+                                Cura.MachineManager.activeStack.compatibleMaterialDiameter = value
                             }
                             property bool isExtruderSetting: true
                         }
@@ -634,19 +634,19 @@ Cura.MachineAction
                                 // are available.
                                 if (_setValueFunction !== undefined)
                                 {
-                                    _setValueFunction(text);
+                                    _setValueFunction(text)
                                 }
                                 else
                                 {
-                                    propertyProvider.setPropertyValue("value", text);
+                                    propertyProvider.setPropertyValue("value", text)
                                 }
                                 if(_forceUpdateOnChange)
                                 {
-                                    manager.forceUpdate();
+                                    manager.forceUpdate()
                                 }
                                 if(_afterOnEditingFinished)
                                 {
-                                    _afterOnEditingFinished();
+                                    _afterOnEditingFinished()
                                 }
                             }
                         }