diff --git a/plugins/SimulationView/LayerSlider.qml b/plugins/SimulationView/LayerSlider.qml index ce0810b21f..121bd0ce7d 100644 --- a/plugins/SimulationView/LayerSlider.qml +++ b/plugins/SimulationView/LayerSlider.qml @@ -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 } } } \ No newline at end of file diff --git a/plugins/SimulationView/PathSlider.qml b/plugins/SimulationView/PathSlider.qml index 7eb56cc0b8..f89b762a60 100644 --- a/plugins/SimulationView/PathSlider.qml +++ b/plugins/SimulationView/PathSlider.qml @@ -36,16 +36,16 @@ Item { property bool pathsVisible: true property bool manuallyChanged: true // Indicates whether the value was changed manually or during simulation - function getHandleValueFromSliderHandle () { + function getHandleValueFromSliderHandle() { return handle.getValue() } - function setHandleValue (value) { + function setHandleValue(value) { handle.setValue(value) updateRangeHandle() } - function updateRangeHandle () { + function updateRangeHandle() { rangeHandle.width = handle.x - sliderRoot.handleSize } @@ -97,7 +97,7 @@ Item { color: handleLabel.activeFocus ? sliderRoot.handleActiveColor : sliderRoot.handleColor visible: sliderRoot.pathsVisible - function onHandleDragged () { + function onHandleDragged() { sliderRoot.manuallyChanged = true // update the range handle @@ -108,15 +108,21 @@ Item { } // get the value based on the slider position - function getValue () { + function getValue() { var result = x / (sliderRoot.width - sliderRoot.handleSize) result = result * sliderRoot.maximumValue result = sliderRoot.roundValues ? Math.round(result) : result return result } + function setValueManually(value) + { + sliderRoot.manuallyChanged = true + handle.setValue(value) + } + // set the slider position based on the value - function setValue (value) { + function setValue(value) { // Normalize values between range, since using arrow keys will create out-of-the-range values value = sliderRoot.normalizeValue(value) @@ -130,16 +136,8 @@ Item { sliderRoot.updateRangeHandle() } - Keys.onRightPressed: - { - sliderRoot.manuallyChanged = true - handleLabel.setValue(handleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1)) - } - Keys.onLeftPressed: - { - sliderRoot.manuallyChanged = true - handleLabel.setValue(handleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1)) - } + Keys.onRightPressed: handleLabel.setValue(handleLabel.value + ((event.modifiers & Qt.ShiftModifier) ? 10 : 1)) + Keys.onLeftPressed: handleLabel.setValue(handleLabel.value - ((event.modifiers & Qt.ShiftModifier) ? 10 : 1)) // dragging MouseArea { @@ -172,7 +170,7 @@ Item { maximumValue: sliderRoot.maximumValue value: sliderRoot.handleValue busy: UM.SimulationView.busy - setValue: handle.setValue // connect callback functions + setValue: handle.setValueManually // connect callback functions } } }