Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r65bff6538499d8a7592f5b664982b69d90d102c2 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 65bff6538499d8a7592f5b664982b69d90d102c2) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.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 TreatmentStack.qml * \author (last) Vy - * \date (last) 26-Apr-2023 + * \date (last) 14-Jun-2023 * \author (original) Behrouz NematiPour * \date (original) 27-Jan-2020 * @@ -92,7 +92,8 @@ _treatmentAdjustmentPressuresLimits.open() } function onSectionTimeClicked ( vValue ) { - _treatmentAdjustmentDuration.durationValue = vTreatmentTime.time_Total / 60 // minutes => hours + //DEBUG: console.log("time total minutes: " + vTreatmentTime.time_Total / 60 ) + _treatmentAdjustmentDuration.setDurationValue(vTreatmentTime.time_Total / 60) // minutes => hours _treatmentAdjustmentDuration.open() } function onSectionUltrafiltrationClicked ( vValue ) { @@ -103,25 +104,9 @@ ScreenItem { id: _treatmentTrending } //// Treatment Adjustment Dialogs - TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow } - TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits - arterialPressureMinimum : vTreatmentRanges.arterialPressureMonitorMin - arterialPressureMaximum : vTreatmentRanges.arterialPressureMonitorMax - venousPressureMinimum : vTreatmentRanges.venousPressureMonitorMin - venousPressureMaximum : vTreatmentRanges.venousPressureMonitorMax + TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow } + TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } - arterialPressureLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow - arterialPressureUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh - venousPressureLowerBound : vTreatmentAdjustmentPressuresLimits.venousLimitLow - venousPressureUpperBound : vTreatmentAdjustmentPressuresLimits.venousLimitHigh - - arterialPressureStep : vTreatmentRanges.arterialPressureLimitLowRes - arterialPressureValue : vTreatmentPressureOcclusion.arterialPressure - - venousPressureStep : vTreatmentRanges.venousPressureLimitLowRes - venousPressureValue : vTreatmentPressureOcclusion.venousPressure - } - Connections { target: _treatmentAdjustmentFlow function onConfirmClicked ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment( _treatmentAdjustmentFlow.bloodFlowRateValue , @@ -130,10 +115,9 @@ } Connections { target: _treatmentAdjustmentPressuresLimits function onConfirmClicked ( vValue ) { vTreatmentAdjustmentPressuresLimits.doAdjustment( - _treatmentAdjustmentPressuresLimits.arterialPressureLowerBound , - _treatmentAdjustmentPressuresLimits.arterialPressureUpperBound , - _treatmentAdjustmentPressuresLimits.venousPressureLowerBound , - _treatmentAdjustmentPressuresLimits.venousPressureUpperBound ) + _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow , + _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow , + _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc ) } } @@ -166,10 +150,7 @@ vTreatmentVitals.doSkip() // only for logging } - onOpened : { - vTreatmentVitals.doTimerStop() // Can't be moved to C++, and has to be handled here because it can manually being opened by the user - _bphrEntry.setFocus(!_root.isDialogOpened) - } + onOpened : vTreatmentVitals.doTimerStop() // Can't be moved to C++, and has to be handled here because it can manually being opened by the user onClosed : { if ( ! vQuit ) @@ -197,7 +178,7 @@ vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentDuration.ultrafiltration _treatmentAdjustmentDuration.accept() } else { - _treatmentAdjustmentDuration.durationValue = vTreatmentAdjustmentDuration.duration; + _treatmentAdjustmentDuration.setDurationValue(vTreatmentAdjustmentDuration.duration); _treatmentAdjustmentDuration.notification.text = vTreatmentAdjustmentDuration.text(); } } @@ -207,10 +188,9 @@ function onAdjustmentTriggered ( vValue ) { // values have to be update even when rejected HD is reverting back the values. // if accepted will be updated for later [may need refresh later] - _treatmentAdjustmentPressuresLimits.arterialPressureLowerBound = vTreatmentAdjustmentPressuresLimits.arterialLimitLow - _treatmentAdjustmentPressuresLimits.arterialPressureUpperBound = vTreatmentAdjustmentPressuresLimits.arterialLimitHigh - _treatmentAdjustmentPressuresLimits.venousPressureLowerBound = vTreatmentAdjustmentPressuresLimits.venousLimitLow - _treatmentAdjustmentPressuresLimits.venousPressureUpperBound = vTreatmentAdjustmentPressuresLimits.venousLimitHigh + _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow = vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindow + _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow = vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindow + _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc = vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc if (vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) { _treatmentAdjustmentPressuresLimits.close()