3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Stop the simulation also when the range slider is used. Reuse some code.

Browse source 
Contributes to CURA-5725.
This commit is contained in:
Diego Prado Gesto 2018-09-18 16:30:15 +02:00
parent 1b1ca8a53b
commit f965b66c87
2 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
plugins/SimulationView/LayerSlider.qml
View file

@ -111,6 +111,12 @@ Item {
UM.SimulationView.setMinimumLayer(lowerValue)
}
function setValueManually(value)
{
sliderRoot.manuallyChanged = true
upperHandle.setValue(value)
}
function setValue(value) {
var range = sliderRoot.upperValue - sliderRoot.lowerValue
value = Math.min(value, sliderRoot.maximumValue)
@ -154,7 +160,7 @@ Item {
maximumValue: sliderRoot.maximumValue
value: sliderRoot.upperValue
busy: UM.SimulationView.busy
setValue: rangeHandle.setValue // connect callback functions
setValue: rangeHandle.setValueManually // connect callback functions
}
}
@ -193,7 +199,7 @@ Item {
return result
}
function setValueAndStopSimulation(value)
function setValueManually(value)
{
sliderRoot.manuallyChanged = true
upperHandle.setValue(value)
@ -214,16 +220,8 @@ Item {
sliderRoot.updateRangeHandle()
}
Keys.onUpPressed:
{
sliderRoot.manuallyChanged = true
upperHandleLabel.setValue(upperHandleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
}
Keys.onDownPressed:
{
sliderRoot.manuallyChanged = true
upperHandleLabel.setValue(upperHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
}
Keys.onUpPressed: upperHandleLabel.setValue(upperHandleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
Keys.onDownPressed: upperHandleLabel.setValue(upperHandleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1))
// dragging
MouseArea {
@ -256,7 +254,7 @@ Item {
maximumValue: sliderRoot.maximumValue
value: sliderRoot.upperValue
busy: UM.SimulationView.busy
setValue: upperHandle.setValueAndStopSimulation // connect callback functions
setValue: upperHandle.setValueManually // connect callback functions
}
}
@ -296,7 +294,7 @@ Item {
return result
}
function setValueAndStopSimulation(value)
function setValueManually(value)
{
sliderRoot.manuallyChanged = true
lowerHandle.setValue(value)
@ -352,7 +350,7 @@ Item {
maximumValue: sliderRoot.maximumValue
value: sliderRoot.lowerValue
busy: UM.SimulationView.busy
setValue: lowerHandle.setValueAndStopSimulation // connect callback functions
setValue: lowerHandle.setValueManually // connect callback functions
}
}
}