Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -r2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43 -r94d069e17fbb5872b66a4926d769634eceb42e82 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 2dd4e9c952d65e68f1c81a1cfc13d1f96b0d7d43) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 94d069e17fbb5872b66a4926d769634eceb42e82) @@ -122,17 +122,21 @@ } function incrementMax(vInStepSegments) { - updateMaxValue(vInStepSegments, true) + if ( ! maxAdjusted ) { setMaxValue(_root.maxValueUpperBound )} + else { updateMaxValue(vInStepSegments, true )} } function decrementMax(vInStepSegments) { - updateMaxValue(vInStepSegments, false) + if ( ! maxAdjusted ) { setMaxValue(_root.maxValueUpperBound )} + else { updateMaxValue(vInStepSegments, false)} } function incrementMin(vInStepSegments) { - updateMinValue(vInStepSegments, true) + if ( ! minAdjusted ) { setMinValue(_root.minValueLowerBound )} + else { updateMinValue(vInStepSegments, true )} } function decrementMin(vInStepSegments) { - updateMinValue(vInStepSegments, false) + if ( ! minAdjusted ) { setMinValue(_root.minValueLowerBound )} + else { updateMinValue(vInStepSegments, false)} } /// /// \brief grays out the rangebar and handler if not adjusted and hasAdjust set to true Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r642f08650a7a88ad6a2305fdea6bd18365aab5c7 -r94d069e17fbb5872b66a4926d769634eceb42e82 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 642f08650a7a88ad6a2305fdea6bd18365aab5c7) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 94d069e17fbb5872b66a4926d769634eceb42e82) @@ -132,6 +132,7 @@ // real-time bound change should effect the current set value onMinimumChanged: { + if ( !isActive && inActiveZero ) { value = 0; return } if (value < minimum ) value = minimum } Index: sources/gui/qml/components/SliderArrows.qml =================================================================== diff -u -r642f08650a7a88ad6a2305fdea6bd18365aab5c7 -r94d069e17fbb5872b66a4926d769634eceb42e82 --- sources/gui/qml/components/SliderArrows.qml (.../SliderArrows.qml) (revision 642f08650a7a88ad6a2305fdea6bd18365aab5c7) +++ sources/gui/qml/components/SliderArrows.qml (.../SliderArrows.qml) (revision 94d069e17fbb5872b66a4926d769634eceb42e82) @@ -49,11 +49,11 @@ } onPressed: decrementValue() - onPressAndHold: { - _sliderAdjustValueTimer.isIncrementing = false - _sliderAdjustValueTimer.restart() - } - onReleased: _sliderAdjustValueTimer.stop() + // onPressAndHold: { + // _sliderAdjustValueTimer.isIncrementing = false + // _sliderAdjustValueTimer.restart() + // } + // onReleased: _sliderAdjustValueTimer.stop() } TouchRect { id: _incrementValueButton @@ -71,25 +71,24 @@ } onPressed: incrementValue() - onPressAndHold: { - _sliderAdjustValueTimer.isIncrementing = true - _sliderAdjustValueTimer.restart() - } - onReleased: _sliderAdjustValueTimer.stop() + // onPressAndHold: { + // _sliderAdjustValueTimer.isIncrementing = true + // _sliderAdjustValueTimer.restart() + // } + // onReleased: _sliderAdjustValueTimer.stop() } - Timer { id: _sliderAdjustValueTimer - property bool isIncrementing : true - interval: Variables.sliderAdjustPressAndHoldRefreshRate //ms - running : false - repeat : true - onTriggered: { - if(isIncrementing) - incrementValue() - else - decrementValue() - - //DEBUG console.log("timer triggered " + _root.value) - } - } + // Timer { id: _sliderAdjustValueTimer + // property bool isIncrementing : true + // interval: Variables.sliderAdjustPressAndHoldRefreshRate //ms + // running : false + // repeat : true + // onTriggered: { + // if(isIncrementing) + // incrementValue() + // else + // decrementValue() + // //DEBUG console.log("timer triggered " + _root.value) + // } + // } } Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u -r642f08650a7a88ad6a2305fdea6bd18365aab5c7 -r94d069e17fbb5872b66a4926d769634eceb42e82 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 642f08650a7a88ad6a2305fdea6bd18365aab5c7) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 94d069e17fbb5872b66a4926d769634eceb42e82) @@ -69,10 +69,10 @@ topMargin: 425 } isActive: false - width : parent.width / 2 + width : Variables.ultrafiltrationProgressbarWidth step : 0.100 stepSnap: true - ticks : false + ticks : true diameter: Variables.sliderCircleDiameter decimal : Variables.ultrafiltrationPrecision minimum : Variables.ultrafiltrationMinDef @@ -82,4 +82,19 @@ onPressed: isActive = true } + SliderArrows{ id:_sliderArrows + anchors.verticalCenter : _volumeSlider.verticalCenter + anchors.left : _volumeSlider.right + anchors.leftMargin : Variables.sliderAdjustButtonLeftMargin + + onIncrementValue : { + _volumeSlider.incrementValue(true) + _volumeSlider.isActive = true + } + onDecrementValue : { + _volumeSlider.decrementValue(true) + _volumeSlider.isActive = true + } + } + }