Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rcf61c7736f11f4b75a4e2df803f29bdc7769db53 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision cf61c7736f11f4b75a4e2df803f29bdc7769db53) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file TreatmentAdjustmentPressuresLimits.qml * \author (last) Vy - * \date (last) 20-Mar-2023 + * \date (last) 07-Sep-2023 * \author (original) Behrouz NematiPour * \date (original) 01-Nov-2020 * @@ -36,16 +36,59 @@ titleText: qsTr("PRESSURES") + // 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 + + // reset the flow values to the current flow values + function currentFlows() { + // if the vTreatmentAdjustmentPressuresLimits.* is not set yet, use the default value + // TODO need to change to use the value used in treatment if these limits are being set in create treatment + _arterialWindow.reset( vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindow || _arterialWindow.defaultValue) + _venousWindow.reset( vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindow || _venousWindow.defaultValue) + _venousAsymmetric.reset( vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc || _venousAsymmetric.defaultValue) + } + + // reset the flow values to the values of the adjustment response + function resetFlows() { + _arterialWindow.reset( vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindow ) + _venousWindow.reset( vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindow ) + _venousAsymmetric.reset( vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc ) + } + + 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 reset(vValue) { + _slider.reset(vValue) + } + height : 150 width : parent.width - hPadding * 2 @@ -101,6 +144,7 @@ maximum : vTreatmentRanges.arterialPressureLimitWindowMax step : vTreatmentRanges.arterialPressureLimitWindowRes value : vTreatmentRanges.arterialPressureLimitWindowDef + defaultValue : vTreatmentRanges.arterialPressureLimitWindowDef } Line { id: _divider @@ -123,6 +167,7 @@ maximum : vTreatmentRanges.venousPressureLimitWindowMax step : vTreatmentRanges.venousPressureLimitWindowRes value : vTreatmentRanges.venousPressureLimitWindowDef + defaultValue : vTreatmentRanges.venousPressureLimitWindowDef } SliderPressure { id: _venousAsymmetric @@ -136,5 +181,6 @@ maximum : vTreatmentRanges.venousPressureLimitAsymtrcMax step : vTreatmentRanges.venousPressureLimitAsymtrcRes value : vTreatmentRanges.venousPressureLimitAsymtrcDef + defaultValue : vTreatmentRanges.venousPressureLimitAsymtrcDef } }