GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-04 10:45:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix maximum value range handle drag movement - CURA-4412

Browse Source
This commit is contained in:
ChrisTerBeke 2017-10-10 14:13:32 +02:00
parent 0b5fac28b9
commit a2520b6b56
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/LayerView/LayerSlider.qml
View File

@ -87,14 +87,14 @@ Item {
// set the new value when dragging // set the new value when dragging
// the range slider is only dragged when the upper and lower sliders collide // the range slider is only dragged when the upper and lower sliders collide
function onHandleDragged () { function onHandleDragged () {
upperHandle.y = y - upperHandle.height upperHandle.y = y - upperHandle.height
lowerHandle.y = y + height lowerHandle.y = y + height
var upperValue = sliderRoot.getUpperValueFromSliderHandle() var upperValue = sliderRoot.getUpperValueFromSliderHandle()
var lowerValue = upperValue - (sliderRoot.upperValue - sliderRoot.lowerValue) var lowerValue = sliderRoot.getLowerValueFromSliderHandle()
// update the Python values // set both values after moving the handle position
// TODO: improve this?
UM.LayerView.setCurrentLayer(upperValue) UM.LayerView.setCurrentLayer(upperValue)
UM.LayerView.setMinimumLayer(lowerValue) UM.LayerView.setMinimumLayer(lowerValue)
} }
@ -113,7 +113,7 @@ Item {
target: parent target: parent
axis: Drag.YAxis axis: Drag.YAxis
minimumY: upperHandle.height minimumY: upperHandle.height
maximumY: sliderRoot.height - (parent.heigth + lowerHandle.height) maximumY: sliderRoot.height - (rangeHandle.height + lowerHandle.height)
} }
onPositionChanged: parent.onHandleDragged() onPositionChanged: parent.onHandleDragged()
@ -139,10 +139,10 @@ Item {
lowerHandle.y = y + height + sliderRoot.minimumRangeHandleSize lowerHandle.y = y + height + sliderRoot.minimumRangeHandleSize
} }
// update the rangle handle // update the range handle
sliderRoot.updateRangeHandle() sliderRoot.updateRangeHandle()
// TODO: improve this? // set the new value after moving the handle position
UM.LayerView.setCurrentLayer(getValue()) UM.LayerView.setCurrentLayer(getValue())
} }
@ -157,14 +157,13 @@ Item {
// set the slider position based on the upper value // set the slider position based on the upper value
function setValue (value) { function setValue (value) {
// TODO: improve this?
UM.LayerView.setCurrentLayer(value) UM.LayerView.setCurrentLayer(value)
var diff = (value - sliderRoot.maximumValue) / (sliderRoot.minimumValue - sliderRoot.maximumValue) var diff = (value - sliderRoot.maximumValue) / (sliderRoot.minimumValue - sliderRoot.maximumValue)
var newUpperYPosition = Math.round(diff * (sliderRoot.height - (2 * sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize))) var newUpperYPosition = Math.round(diff * (sliderRoot.height - (2 * sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize)))
y = newUpperYPosition y = newUpperYPosition
// update the rangle handle // update the range handle
sliderRoot.updateRangeHandle() sliderRoot.updateRangeHandle()
} }
@ -219,10 +218,10 @@ Item {
upperHandle.y = y - (upperHandle.heigth + sliderRoot.minimumRangeHandleSize) upperHandle.y = y - (upperHandle.heigth + sliderRoot.minimumRangeHandleSize)
} }
// update the rangle handle // update the range handle
sliderRoot.updateRangeHandle() sliderRoot.updateRangeHandle()
// TODO: improve this? // set the new value after moving the handle position
UM.LayerView.setMinimumLayer(getValue()) UM.LayerView.setMinimumLayer(getValue())
} }
@ -244,7 +243,7 @@ Item {
var newLowerYPosition = Math.round((sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize) + diff * (sliderRoot.height - (2 * sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize))) var newLowerYPosition = Math.round((sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize) + diff * (sliderRoot.height - (2 * sliderRoot.handleSize + sliderRoot.minimumRangeHandleSize)))
y = newLowerYPosition y = newLowerYPosition
// update the rangle handle // update the range handle
sliderRoot.updateRangeHandle() sliderRoot.updateRangeHandle()
} }