Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -r08f9fa1efe9bb73b5f3b54e20a76a5d722b60f47 -rb6c4d54ad5469869617de90227c25ca098609b97 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 08f9fa1efe9bb73b5f3b54e20a76a5d722b60f47) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision b6c4d54ad5469869617de90227c25ca098609b97) @@ -34,42 +34,57 @@ 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 + // Note : The slider values are not bound and will be set by user freely + // and will be used to be sent for adjustment + // if accepted will not changed and + // if rejected then will be reset to the values passed by adjustment response - // update the visual of the sliders to reflect - resetPressureLimitSliders() + // reset the flow values to the current flow values + function currentFlows() { + _arterialWindow.reset( vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindow ) + _venousWindow.reset( vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindow ) + _venousAsymmetric.reset( vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc ) } - function resetPressureLimitSliders() { - // this resets the value of the slider to the default and also sets the slider inactive - _arterialWindow .resetSliderPressureValue() - _venousWindow .resetSliderPressureValue() - _venousAsymmetric.resetSliderPressureValue() + // reset the flow values to the values of the adjustment response + function resetFlows() { + _arterialWindow.reset( _arterialWindow.defaultValue) + _venousWindow.reset( _venousWindow.defaultValue) + _venousAsymmetric.reset(_venousAsymmetric.defaultValue) } + onAboutToShow: { + // TODO : When Testing data on Setting screen is removed + // This needs to be moved into the Treatment______.qml + currentFlows() + } + + Connections { target: vTreatmentAdjustmentPressuresLimits + function onAdjustmentTriggered ( vValue ) { + if ( vTreatmentAdjustmentPressuresLimits.adjustment_Accepted ) { + accept() + } else { + resetFlows() + console.debug(vTreatmentAdjustmentPressuresLimits.text()) + notification.text = vTreatmentAdjustmentPressuresLimits.text() + } + } + } 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 + function reset(vValue) { + _slider.reset(vValue) } height : 150 @@ -104,16 +119,14 @@ 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); _slider.isActive = true } - onDecrementValue : { _slider.decrementValue(true); _slider.isActive = true } + onIncrementValue : _slider.incrementValue(true) + onDecrementValue : _slider.decrementValue(true) } }