From 2d5f65a954fd44fc2d4e63e3ab114a20fa5d34b3 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 19 Feb 2018 14:23:05 +0100 Subject: [PATCH] WIP: Fix NozzleMenu QObject result type --- cura/Settings/MachineManager.py | 2 +- resources/qml/Menus/NozzleMenu.qml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 28a36b7e87..3c35aaad64 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1115,7 +1115,7 @@ class MachineManager(QObject): def createMachineManager(): return MachineManager() - @pyqtSlot(int, result = "QVariant") + @pyqtSlot(int, result = QObject) def getExtruder(self, position: int): if self._global_container_stack: return self._global_container_stack.extruders.get(str(position)) diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index 96b21f285c..ea1c0000f4 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -13,19 +13,18 @@ Menu title: "Nozzle" property int extruderIndex: 0 + property var extruderStack: Cura.MachineManager.getExtruder(menu.extruderIndex) Cura.NozzleModel { id: nozzleModel } - property var extruderStack: Cura.MachineManager.getExtruder(extruderIndex) - Connections { target: Cura.MachineManager onGlobalContainerChanged: { - menu.extruderStack = Cura.MachineManager.getExtruder(extruderIndex) + menu.extruderStack = Cura.MachineManager.getExtruder(extruderIndex); } }