3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-03 12:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix up a bunch of things with type hints and imports

Browse source
This commit is contained in:
Arjen Hiemstra 2017-03-21 17:45:07 +01:00
parent 88e8138004
commit 411e3a3976
1 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

42
cura/Settings/GlobalStack.py
View file

@ -1,18 +1,24 @@
# Copyright (c) 2017 Ultimaker B.V. # Copyright (c) 2017 Ultimaker B.V.
# Cura is released under the terms of the AGPLv3 or higher. # Cura is released under the terms of the AGPLv3 or higher.
from PyQt5.QtCore import pyqtProperty, pyqtSlot
from UM.Decorators import override
from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase
from UM.Settings.ContainerStack import ContainerStack from UM.Settings.ContainerStack import ContainerStack, InvalidContainerStackError
from UM.Settings.InstanceContainer import InstanceContainer
from UM.Settings.DefinitionContainer import DefinitionContainer
from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.ContainerRegistry import ContainerRegistry
class CannotSetNextStackError(Exception): class CannotSetNextStackError(Exception):
pass pass
class GlobalStack(ContainerStack): class GlobalStack(ContainerStack):
def __init__(self, container_id, *args, **kwargs): def __init__(self, container_id: str, *args, **kwargs):
super().__init__(container_id, *args, **kwargs) super().__init__(container_id, *args, **kwargs)
def getProperty(self, key, property_name): self._empty_instance_container = ContainerRegistry.getInstance().getEmptyInstanceContainer()
@pyqtProperty(InstanceContainer) @pyqtProperty(InstanceContainer)
def userChanges(self) -> InstanceContainer: def userChanges(self) -> InstanceContainer:
@ -42,14 +48,36 @@ class GlobalStack(ContainerStack):
def definition(self) -> DefinitionContainer: def definition(self) -> DefinitionContainer:
return self._containers[_ContainerIndexes.Definition] return self._containers[_ContainerIndexes.Definition]
## Check whether the specified setting has a 'user' value.
#
# A user value here is defined as the setting having a value in either
# the UserChanges or QualityChanges container.
#
# \return True if the setting has a user value, False if not.
@pyqtSlot(str, result = bool)
def hasUserValue(self, key: str) -> bool:
if self._containers[_ContainerIndexes.UserChanges].hasProperty(key, "value"):
return True
if self._containers[_ContainerIndexes.QualityChanges].hasProperty(key, "value"):
return True
return False
## Overridden from ContainerStack
@override(ContainerStack)
def getProperty(self, key: str, property_name: str):
if property_name == "value": if property_name == "value":
resolve = super().getProperty(key, "resolve") if not self.hasUserValue(key):
if resolve: resolve = super().getProperty(key, "resolve")
return resolve if resolve:
return resolve
return super().getProperty(key, property_name) return super().getProperty(key, property_name)
def setNextStack(self, next_stack): ## Overridden from ContainerStack
@override(ContainerStack)
def setNextStack(self, next_stack: ContainerStack) -> None:
raise CannotSetNextStackError("Global stack cannot have a next stack!") raise CannotSetNextStackError("Global stack cannot have a next stack!")
## Overridden from ContainerStack ## Overridden from ContainerStack