From e7609fadf406efa4a4a42172df117d27cc8e0ebb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 21 Aug 2019 17:08:35 +0200 Subject: [PATCH] Deprecated the allActiveMaterialIds and replaced the single location where it was used CURA-6600 --- cura/Settings/MachineManager.py | 1 + resources/qml/Menus/MaterialMenu.qml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index aaf9500eba..b560d5ec5e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -602,6 +602,7 @@ class MachineManager(QObject): # # \return The material ids in all stacks @pyqtProperty("QVariantMap", notify = activeMaterialChanged) + @deprecated("use Cura.MachineManager.activeStack.extruders instead.", "4.3") def allActiveMaterialIds(self) -> Dict[str, str]: result = {} diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index ba35a160ba..1f85fa33ff 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -14,7 +14,8 @@ Menu property int extruderIndex: 0 property string currentRootMaterialId: Cura.MachineManager.currentRootMaterialId[extruderIndex] - property string activeMaterialId: Cura.MachineManager.allActiveMaterialIds[Cura.ExtruderManager.extruderIds[extruderIndex]] + + property string activeMaterialId: Cura.MachineManager.activeMachine.extruders[extruderIndex].material.id property bool updateModels: true Cura.FavoriteMaterialsModel {