3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Simplify dependencies on activeStack

Browse source 
The properties, being formulas, were not properly updated when the active stack changed.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-11-30 15:44:15 +01:00
parent 18bb403413
commit ede50ef3ca
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -135,7 +135,7 @@ Item
OldControls.CheckBox OldControls.CheckBox
{ {
checked: selectors.model != null ? Cura.MachineManager.getExtruder(selectors.model.index).isEnabled: false checked: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.isEnabled : false
onClicked: Cura.MachineManager.setExtruderEnabled(selectors.model.index, checked) onClicked: Cura.MachineManager.setExtruderEnabled(selectors.model.index, checked)
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
style: UM.Theme.styles.checkbox style: UM.Theme.styles.checkbox
@ -160,14 +160,11 @@ Item
{ {
id: materialSelection id: materialSelection
property var activeExtruder: Cura.MachineManager.activeStack property var valueError: Cura.MachineManager.activeStack != null ? Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeStack.material.id, "compatible", "") != "True" : true
property var hasActiveExtruder: activeExtruder != null
property var currentRootMaterialName: hasActiveExtruder ? activeExtruder.material.name : ""
property var valueError: hasActiveExtruder ? Cura.ContainerManager.getContainerMetaDataEntry(activeExtruder.material.id, "compatible", "") != "True" : true
property var valueWarning: !Cura.MachineManager.isActiveQualitySupported property var valueWarning: !Cura.MachineManager.isActiveQualitySupported
text: currentRootMaterialName text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.material.name : ""
tooltip: currentRootMaterialName tooltip: text
visible: Cura.MachineManager.hasMaterials visible: Cura.MachineManager.hasMaterials
enabled: Cura.ExtruderManager.activeExtruderIndex > -1 enabled: Cura.ExtruderManager.activeExtruderIndex > -1