From 227b76d6f0db7d419523254184fa7fc301929829 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Tue, 22 Oct 2019 13:51:02 +0200
Subject: [PATCH] Remove deprecated currentExtruderPositions

CURA-6858
---
 cura/Settings/ExtruderStack.py                   |  4 ++++
 cura/Settings/MachineManager.py                  |  7 -------
 resources/qml/Dialogs/WorkspaceSummaryDialog.qml | 10 +++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py
index 9983ab6c98..5d4b3e38b1 100644
--- a/cura/Settings/ExtruderStack.py
+++ b/cura/Settings/ExtruderStack.py
@@ -51,6 +51,10 @@ class ExtruderStack(CuraContainerStack):
     def getNextStack(self) -> Optional["GlobalStack"]:
         return super().getNextStack()
 
+    @pyqtProperty(int, constant = True)
+    def position(self) -> int:
+        return int(self.getMetaDataEntry("position"))
+
     def setEnabled(self, enabled: bool) -> None:
         if self.getMetaDataEntry("enabled", True) == enabled: # No change.
             return # Don't emit a signal then.
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index d1f8cad4b3..6ffcf51b6e 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -1078,13 +1078,6 @@ class MachineManager(QObject):
             container = extruder.userChanges
             container.removeInstance(setting_name)
 
-    @pyqtProperty("QVariantList", notify = globalContainerChanged)
-    @deprecated("use Cura.MachineManager.activeMachine.extruders instead", "4.2")
-    def currentExtruderPositions(self) -> List[str]:
-        if self._global_container_stack is None:
-            return []
-        return sorted(list(self._global_container_stack.extruders.keys()))
-
     ##  Update _current_root_material_id when the current root material was changed.
     def _onRootMaterialChanged(self) -> None:
         self._current_root_material_id = {}
diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
index d698c0d3af..dfc6e3a9ca 100644
--- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
+++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml
@@ -143,27 +143,27 @@ UM.Dialog
                 {
                     width: parent.width
                     height: childrenRect.height
-                    model: Cura.MachineManager.currentExtruderPositions
+                    model: Cura.MachineManager.activeMachine.extruderList
                     delegate: Column
                     {
                         height: childrenRect.height
                         width: parent.width
                         property string variantName:
                         {
-                            var extruder = Cura.MachineManager.activeMachine.extruderList[modelData]
+                            var extruder = modelData
                             var variant_name = extruder.variant.name
                             return (variant_name !== undefined) ? variant_name : ""
                         }
                         property string materialName:
                         {
-                            var extruder = Cura.MachineManager.activeMachine.extruderList[modelData]
+                            var extruder = modelData
                             var material_name = extruder.material.name
                             return (material_name !== undefined) ? material_name : ""
                         }
                         Label
                         {
                             text: {
-                                var extruder = Number(modelData)
+                                var extruder = Number(modelData.position)
                                 var extruder_id = ""
                                 if(!isNaN(extruder))
                                 {
@@ -171,7 +171,7 @@ UM.Dialog
                                 }
                                 else
                                 {
-                                    extruder_id = modelData
+                                    extruder_id = modelData.position
                                 }
 
                                 return catalog.i18nc("@action:label", "Extruder %1").arg(extruder_id)