3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-25 03:41:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove unnecessary activeQualityName property

Browse source 
CURA-6846
This commit is contained in:
Lipu Fei 2019-10-04 10:27:35 +02:00
parent 0d554c4938
commit 61a1b61756
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/Settings/MachineManager.py
View file

@ -656,7 +656,6 @@ class MachineManager(QObject):
return result return result
## Returns whether there is anything unsupported in the current set-up. ## Returns whether there is anything unsupported in the current set-up.
# #
# The current set-up signifies the global stack and all extruder stacks, # The current set-up signifies the global stack and all extruder stacks,
@ -1673,13 +1672,6 @@ class MachineManager(QObject):
return global_container_stack.qualityChanges.getName() return global_container_stack.qualityChanges.getName()
return global_container_stack.quality.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) @pyqtProperty(bool, notify = activeQualityGroupChanged)
def hasNotSupportedQuality(self) -> bool: def hasNotSupportedQuality(self) -> bool:
global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()

2
resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml
View file

@ -97,7 +97,7 @@ Item
{ {
result += " - " + Cura.MachineManager.activeIntentName result += " - " + Cura.MachineManager.activeIntentName
} }
result += " - " + Cura.MachineManager.activeQualityName result += " - " + Cura.MachineManager.activeQualityGroup.getName()
} }
if (Cura.MachineManager.isActiveQualityExperimental) if (Cura.MachineManager.isActiveQualityExperimental)

2
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -29,7 +29,7 @@ RowLayout
{ {
text += " - " + Cura.MachineManager.activeIntentName text += " - " + Cura.MachineManager.activeIntentName
} }
text += " - " + Cura.MachineManager.activeQualityName text += " - " + Cura.MachineManager.activeQualityGroup.getName()
} }
if (!Cura.MachineManager.hasNotSupportedQuality) if (!Cura.MachineManager.hasNotSupportedQuality)