From 8af1cc886ff90bea6ae348e3c1bb64f214ffe4a9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 30 May 2017 12:49:10 +0200 Subject: [PATCH] Use .definition to access DefinitionContainer in qml CURA-3810 --- cura/Settings/CuraContainerStack.py | 4 ++-- cura/Settings/MachineManager.py | 8 +------- resources/qml/SidebarHeader.qml | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index d14f2d04c9..fc90e3b239 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -5,7 +5,7 @@ import os.path from typing import Any, Optional -from PyQt5.QtCore import pyqtProperty, pyqtSignal +from PyQt5.QtCore import pyqtProperty, pyqtSignal, QObject from UM.FlameProfiler import pyqtSlot from UM.Decorators import override @@ -250,7 +250,7 @@ class CuraContainerStack(ContainerStack): ## Get the definition container. # # \return The definition container. Should always be a valid container, but can be equal to the empty InstanceContainer. - @pyqtProperty(DefinitionContainer, fset = setDefinition, notify = pyqtContainersChanged) + @pyqtProperty(QObject, fset = setDefinition, notify = pyqtContainersChanged) def definition(self) -> DefinitionContainer: return self._containers[_ContainerIndexes.Definition] diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index dc05e4fa4d..8738b044fb 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -470,16 +470,10 @@ class MachineManager(QObject): return "" - @pyqtProperty("QObject", notify = globalContainerChanged) + @pyqtProperty(QObject, notify = globalContainerChanged) def activeMachine(self) -> "GlobalStack": return self._global_container_stack - @pyqtProperty(str, notify = globalContainerChanged) - def activeMachineDefinitionId(self) -> str: - if self._global_container_stack and self._global_container_stack.definition: - return self._global_container_stack.definition.getId() - return "" - @pyqtProperty(str, notify = activeStackChanged) def activeStackId(self) -> str: if self._active_container_stack: diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 9c46062743..32e1db607a 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -221,7 +221,7 @@ Column { // open the material URL with web browser var version = UM.Application.version; - var machineName = Cura.MachineManager.activeMachineDefinitionId; + var machineName = Cura.MachineManager.activeMachine.definition.id; var url = "https://ultimaker.com/materialcompatibility/" + version + "/" + machineName; Qt.openUrlExternally(url);