Fetch support extruder instead of the default.

The (main) problem here was that the 'active extruder' was queried for the value, which isn't the same as the support-extruder.

CURA-11725
This commit is contained in:
Remco Burema 2024-03-20 13:51:09 +01:00
parent d441130e3b
commit bc64d8fa4e
4 changed files with 19 additions and 3 deletions

View file

@ -34,6 +34,15 @@ RecommendedSettingSection
storeIndex: 0 storeIndex: 0
} }
UM.SettingPropertyProvider
{
id: supportExtruderProvider
key: "support_extruder_nr"
containerStack: Cura.MachineManager.activeMachine
watchedProperties: [ "value" ]
storeIndex: 0
}
contents: [ contents: [
RecommendedSettingItem RecommendedSettingItem
{ {
@ -47,6 +56,8 @@ RecommendedSettingSection
width: parent.width width: parent.width
settingName: "support_structure" settingName: "support_structure"
propertyRemoveUnusedValue: false propertyRemoveUnusedValue: false
updateAllExtruders: true
defaultExtruderIndex: supportExtruderProvider.properties.value
} }
}, },
RecommendedSettingItem RecommendedSettingItem
@ -75,6 +86,8 @@ RecommendedSettingSection
{ {
width: parent.width width: parent.width
settingName: "support_type" settingName: "support_type"
updateAllExtruders: true
defaultExtruderIndex: supportExtruderProvider.properties.value
} }
} }
] ]

View file

@ -28,7 +28,7 @@ Cura.ComboBox {
id: comboboxModel id: comboboxModel
// The propertyProvider has not loaded the setting when this components onComplete triggers. Populating the model // The propertyProvider has not loaded the setting when this components onComplete triggers. Populating the model
// is defered until propertyProvider signals "onIsValueUsedChanged". The defered upate is triggered with this function. // is deferred until propertyProvider signals "onIsValueUsedChanged". The deferred update is triggered with this function.
function updateModel() function updateModel()
{ {
clear() clear()
@ -68,7 +68,8 @@ Cura.ComboBox {
{ {
id: propertyProvider id: propertyProvider
containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
watchedProperties: ["value" , "options"] removeUnusedValue: false
watchedProperties: ["value", "validationState", "resolve", "options"]
} }
Connections Connections

View file

@ -34,7 +34,8 @@ UM.Slider
{ {
id: propertyProvider id: propertyProvider
containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
watchedProperties: ["value"] watchedProperties: ["value", "validationState", "resolve"]
removeUnusedValue: false
storeIndex: 0 storeIndex: 0
} }

View file

@ -53,6 +53,7 @@ UM.TextField
{ {
id: propertyProvider id: propertyProvider
watchedProperties: ["value", "validationState", "resolve"] watchedProperties: ["value", "validationState", "resolve"]
removeUnusedValue: false
containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id containerStackId: updateAllExtruders ? Cura.ExtruderManager.extruderIds[defaultExtruderIndex] : Cura.MachineManager.activeMachine.id
} }