WIP: Simplify global stack and extruder stack activation and fixes

This commit is contained in:
Lipu Fei 2018-02-20 11:16:32 +01:00
parent 21c4753443
commit c432d4ffbb
6 changed files with 14 additions and 21 deletions

View file

@ -13,7 +13,8 @@ Menu
title: "Nozzle"
property int extruderIndex: 0
property var extruderStack: Cura.MachineManager.getExtruder(menu.extruderIndex)
property QtObject extruderStack: Cura.MachineManager.getExtruder(menu.extruderIndex)
property bool hasExtruderStack: extruderStack != null
Cura.NozzleModel
{
@ -24,7 +25,7 @@ Menu
{
target: Cura.MachineManager
onGlobalContainerChanged: {
menu.extruderStack = Cura.MachineManager.getExtruder(extruderIndex);
menu.extruderStack = Cura.MachineManager.getExtruder(menu.extruderIndex);
}
}
@ -36,7 +37,7 @@ Menu
{
text: model.hotend_name
checkable: true
checked: extruderStack.variant.name == model.hotend_name
checked: menu.hasExtruderStack && extruderStack.variant.name == model.hotend_name
exclusiveGroup: group
onTriggered: {
Cura.MachineManager.setVariantGroup(extruderIndex, model.container_node);