3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts from master

Browse source
This commit is contained in:
Lipu Fei 2018-02-28 12:52:45 +01:00
commit 6b0095014a
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/qml/SidebarSimple.qml
View file

@ -518,8 +518,7 @@ Item
// Update the slider value to represent the rounded value
infillSlider.value = roundedSliderValue
// Explicitly cast to string to make sure the value passed to Python is an integer.
infillDensity.setPropertyValue("value", String(roundedSliderValue))
Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", roundedSliderValue)
}
style: SliderStyle
@ -649,14 +648,20 @@ Item
onClicked: {
// Set to 90% only when enabling gradual infill
var newInfillDensity;
if (parseInt(infillSteps.properties.value) == 0) {
previousInfillDensity = parseInt(infillDensity.properties.value)
infillDensity.setPropertyValue("value", String(90))
newInfillDensity = 90;
} else {
infillDensity.setPropertyValue("value", String(previousInfillDensity))
newInfillDensity = previousInfillDensity;
}
Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", String(newInfillDensity))
infillSteps.setPropertyValue("value", (parseInt(infillSteps.properties.value) == 0) ? 5 : 0)
var infill_steps_value = 0;
if (parseInt(infillSteps.properties.value) == 0)
infill_steps_value = 5;
Cura.MachineManager.setSettingForAllExtruders("gradual_infill_steps", "value", infill_steps_value)
}
onEntered: {