Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -r159f2bb0317c7c3c0336e4cb80c7fef3f87e329a -r08f9fa1efe9bb73b5f3b54e20a76a5d722b60f47 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 159f2bb0317c7c3c0336e4cb80c7fef3f87e329a) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 08f9fa1efe9bb73b5f3b54e20a76a5d722b60f47) @@ -34,18 +34,44 @@ property alias venousPressureLimitWindow : _venousWindow .value property alias venousPressureLimitAsymtrc : _venousAsymmetric .value + property alias arterialPressureLimitWindowLastSet : _arterialWindow .defaultValue + property alias venousPressureLimitWindowLastSet : _venousWindow .defaultValue + property alias venousPressureLimitAsymtrcLastSet : _venousAsymmetric .defaultValue + titleText: qsTr("PRESSURES") + function updateLastSetPressureLimits() { + // update the stored value to the currently confirmed values adjusted + arterialPressureLimitWindowLastSet = arterialPressureLimitWindow + venousPressureLimitWindowLastSet = venousPressureLimitWindow + venousPressureLimitAsymtrcLastSet = venousPressureLimitAsymtrc + + // update the visual of the sliders to reflect + resetPressureLimitSliders() + } + + function resetPressureLimitSliders() { + // this resets the value of the slider to the default and also sets the slider inactive + _arterialWindow .resetSliderPressureValue() + _venousWindow .resetSliderPressureValue() + _venousAsymmetric.resetSliderPressureValue() + } + component SliderPressure : Item { property alias title : _title.text property alias minimum : _slider.minimum property alias maximum : _slider.maximum property alias step : _slider.step property alias value : _slider.value - + property alias defaultValue : _slider.defaultValue property alias sliderWidth : _slider.width property int hPadding : 30 + function resetSliderPressureValue() { + _slider.reset(defaultValue) + _slider.isActive = false + } + height : 150 width : parent.width - hPadding * 2 @@ -78,14 +104,16 @@ touchMargin : Variables.createTreatmentSliderMargin ticks : true onValueChanged : reset( value ) + onSliderSelected : _slider.isActive = true // set activeness of slider when tapped on + isActive : false } SliderArrows{ id : _sliderArrows anchors.left : _slider.right anchors.leftMargin : 30 anchors.verticalCenter : _slider.verticalCenter - onIncrementValue : _slider.incrementValue(true) - onDecrementValue : _slider.decrementValue(true) + onIncrementValue : { _slider.incrementValue(true); _slider.isActive = true } + onDecrementValue : { _slider.decrementValue(true); _slider.isActive = true } } } @@ -101,6 +129,7 @@ maximum : vTreatmentRanges.arterialPressureLimitWindowMax step : vTreatmentRanges.arterialPressureLimitWindowRes value : vTreatmentRanges.arterialPressureLimitWindowDef + defaultValue : vTreatmentRanges.arterialPressureLimitWindowDef } Line { id: _divider @@ -123,6 +152,7 @@ maximum : vTreatmentRanges.venousPressureLimitWindowMax step : vTreatmentRanges.venousPressureLimitWindowRes value : vTreatmentRanges.venousPressureLimitWindowDef + defaultValue : vTreatmentRanges.venousPressureLimitWindowDef } SliderPressure { id: _venousAsymmetric @@ -136,5 +166,6 @@ maximum : vTreatmentRanges.venousPressureLimitAsymtrcMax step : vTreatmentRanges.venousPressureLimitAsymtrcRes value : vTreatmentRanges.venousPressureLimitAsymtrcDef + defaultValue : vTreatmentRanges.venousPressureLimitAsymtrcDef } }