Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -re4a6f98d9a3eefb5226f85d62dfe103867189a4c -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision e4a6f98d9a3eefb5226f85d62dfe103867189a4c) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 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 TreatmentPressuresLimits.qml - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NematiPour - * \date (original) 27-Jan-2020 + * \file TreatmentPressures.qml + * \author (last) Behrouz NematiPour + * \date (last) 31-May-2023 + * \author (original) Behrouz NematiPour + * \date (original) 01-Nov-2020 * */ @@ -26,19 +26,21 @@ * \brief Treatment Screen Pressure section */ TouchArea { id: _root - property int arterialMinimum : 0 - property int arterialLowerBound : 0 - property int arterialUpperBound : 0 - property int arterialMaximum : 0 - property int venousMinimum : 0 - property int venousLowerBound : 0 - property int venousUpperBound : 0 - property int venousMaximum : 0 + property int arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin + property int arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax + property int venousMinimum : vTreatmentRanges.venousPressureMonitorMin + property int venousMaximum : vTreatmentRanges.venousPressureMonitorMax - property int arterilPressure : 0 - property int venousPressure : 0 + property int arterialLowerBound : vTreatmentPressureOcclusion.arterialPressureLimitLowerBound + property int arterialUpperBound : vTreatmentPressureOcclusion.arterialPressureLimitUpperBound + property int venousLowerBound : vTreatmentPressureOcclusion.venousPressureLimitLowerBound + property int venousUpperBound : vTreatmentPressureOcclusion.venousPressureLimitUpperBound + property int arterialPressure : vTreatmentPressureOcclusion.arterialPressure + property int venousPressure : vTreatmentPressureOcclusion.venousPressure + property bool valueOutRangeNotify : true + clip: false x : 0 y : 0 @@ -47,33 +49,20 @@ isTouchable: true title: qsTr("PRESSURE") + " " + qsTr("(mmHg)") - /* - Since this Component cannot be bound to the properties since it has to make sure the request has been accepted. - Because the pressure response regardless of the accepted/rejected the FW Software message will pass what is preferred. - */ - function setBounds(vArterialLimitLow , - vArterialLimitHigh , - vVenousLimitLow , - vVenousLimitHigh ) { - _root.arterialLowerBound = vArterialLimitLow - _root.arterialUpperBound = vArterialLimitHigh - _root.venousLowerBound = vVenousLimitLow - _root.venousUpperBound = vVenousLimitHigh - } - RangeBar { id: _arterialRangeBar x: 0 y: 80 width : 175 height : 15 rangebar.color: Colors.pressuresArterialBar - markerOutRangeNotify: true + markerOutRangeNotify: _root.valueOutRangeNotify minimum : _root.arterialMinimum lowerBound : _root.arterialLowerBound upperBound : _root.arterialUpperBound maximum : _root.arterialMaximum - value : _root.arterilPressure + value : _root.arterialPressure + color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color Text { id: _arterialText anchors { @@ -89,18 +78,19 @@ } RangeBar { id: _venousRangeBar - x: 200 + x: 210 y: 80 width : 175 height : 15 rangebar.color: Colors.pressuresVenousBar - markerOutRangeNotify: true + markerOutRangeNotify: _root.valueOutRangeNotify minimum : _root.venousMinimum lowerBound : _root.venousLowerBound upperBound : _root.venousUpperBound maximum : _root.venousMaximum value : _root.venousPressure + color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color Text { id: _venousText anchors {