From 6fd7b49937cc4a19ad2a0b214a6a97e4841dc70a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 25 Oct 2018 15:11:02 +0200 Subject: [PATCH 1/2] Fix setting extruder material diameter in Machine Settings dialog CURA-5857 It should update the value of the selected Extruder TAB, not the active extruder on the printer. --- plugins/MachineSettingsAction/MachineSettingsAction.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index 5109aa05cb..ffd3a8cb47 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -410,7 +410,11 @@ Cura.MachineAction } function setValueFunction(value) { - Cura.MachineManager.activeStack.compatibleMaterialDiameter = value + if (settingsTabs.currentIndex > 0) + { + var extruderIndex = (settingsTabs.currentIndex - 1).toString(); + Cura.MachineManager.extruders[extruderIndex].compatibleMaterialDiameter = value; + } } property bool isExtruderSetting: true } From f1d94d921c4457988999eab16ae942ea316e93b1 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 25 Oct 2018 16:27:16 +0200 Subject: [PATCH 2/2] The MachineManager doesn't have the extruder stacks but the active machine does, so use it when setting the compatible material diameter to the current extruder. Contributes to CURA-5857. --- plugins/MachineSettingsAction/MachineSettingsAction.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index ffd3a8cb47..e16ecf5492 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -405,15 +405,15 @@ Cura.MachineAction { if (settingsTabs.currentIndex > 0) { - manager.updateMaterialForDiameter(settingsTabs.currentIndex - 1); + manager.updateMaterialForDiameter(settingsTabs.currentIndex - 1) } } function setValueFunction(value) { if (settingsTabs.currentIndex > 0) { - var extruderIndex = (settingsTabs.currentIndex - 1).toString(); - Cura.MachineManager.extruders[extruderIndex].compatibleMaterialDiameter = value; + var extruderIndex = (settingsTabs.currentIndex - 1).toString() + Cura.MachineManager.activeMachine.extruders[extruderIndex].compatibleMaterialDiameter = value } } property bool isExtruderSetting: true