Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent

This commit is contained in:
Jaime van Kessel 2019-10-04 10:33:57 +02:00
commit e197fe99fa
No known key found for this signature in database
GPG key ID: 3710727397403C91
7 changed files with 141 additions and 150 deletions

View file

@ -658,7 +658,6 @@ class MachineManager(QObject):
return result
## Returns whether there is anything unsupported in the current set-up.
#
# The current set-up signifies the global stack and all extruder stacks,
@ -1676,13 +1675,6 @@ class MachineManager(QObject):
return global_container_stack.qualityChanges.getName()
return global_container_stack.quality.getName()
@pyqtProperty(str, notify = activeQualityChanged)
def activeQualityName(self) -> str:
global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
if global_stack is None:
return empty_quality_container.getName()
return global_stack.quality.getName()
@pyqtProperty(bool, notify = activeQualityGroupChanged)
def hasNotSupportedQuality(self) -> bool:
global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()