Remove MachineManager.activeVariantNames

CURA-6865

cura/Settings/MachineManager.py

@@ -1111,21 +1111,6 @@ class MachineManager(QObject):
     def currentRootMaterialId(self) -> Dict[str, str]:
         return self._current_root_material_id
 
-    ##  Return the variant names in the extruder stack(s).
-    ##  For the variant in the global stack, use activeVariantBuildplateName
-    @pyqtProperty("QVariant", notify = activeVariantChanged)
-    def activeVariantNames(self) -> Dict[str, str]:
-        result = {}
-
-        active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
-        for stack in active_stacks:
-            variant_container = stack.variant
-            position = stack.getMetaDataEntry("position")
-            if variant_container and variant_container != empty_variant_container:
-                result[position] = variant_container.getName()
-
-        return result
-
     # Sets all quality and quality_changes containers to empty_quality and empty_quality_changes containers
     # for all stacks in the currently active machine.
     #

resources/qml/Menus/NozzleMenu.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.7
+import QtQuick 2.10
 import QtQuick.Controls 1.4
 
 import UM 1.2 as UM
@@ -28,7 +28,8 @@ Menu
             text: model.hotend_name
             checkable: true
             checked: {
-                return Cura.MachineManager.activeVariantNames[extruderIndex] == model.hotend_name
+                var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex]
+                return extruder.variant.name == model.hotend_name
             }
             exclusiveGroup: group
 

tests/TestMachineManager.py

@@ -99,18 +99,6 @@ def test_allActiveMaterialIds(machine_manager, extruder_manager):
     assert machine_manager.allActiveMaterialIds == {"extruder_1": "material_1", "extruder_2": "material_2"}
 
 
-def test_activeVariantNames(machine_manager, extruder_manager):
-    extruder_1 = createMockedExtruder("extruder_1")
-    extruder_2 = createMockedExtruder("extruder_2")
-    extruder_1.getMetaDataEntry = MagicMock(return_value = "0")
-    extruder_2.getMetaDataEntry = MagicMock(return_value= "2")
-    extruder_1.variant = createMockedInstanceContainer("variant_1", "variant_name_1")
-    extruder_2.variant = createMockedInstanceContainer("variant_2", "variant_name_2")
-    extruder_manager.getActiveExtruderStacks = MagicMock(return_value=[extruder_1, extruder_2])
-
-    assert machine_manager.activeVariantNames == {"0": "variant_name_1", "2": "variant_name_2"}
-
-
 def test_globalVariantName(machine_manager, application):
     global_stack = application.getGlobalContainerStack()
     global_stack.variant = createMockedInstanceContainer("beep", "zomg")