Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r90caf5bac91c4df84845e223d0c538e39698dbf1 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 90caf5bac91c4df84845e223d0c538e39698dbf1) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2022 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 TreatmentHome.qml * \author (last) Behrouz NematiPour - * \date (last) 11-Sep-2022 + * \date (last) 10-Jan-2024 * \author (original) Behrouz NematiPour * \date (original) 27-Jan-2020 * @@ -41,10 +41,6 @@ // ---------- COLUMN LEFT TreatmentFlows { id: _flowsTouchArea -// x : Variables.screenGridLeftColumnX -// y : Variables.screenGridRow1Y -// width : Variables.screenGridAreaWidth -// height : Variables.screenGridAreaHeightRow1 x : Variables.screenGridLeftColumnX y : Variables.screenGridRow3Y width : Variables.screenGridAreaWidth @@ -63,34 +59,33 @@ sectionVitalsClicked() } notification.text: qsTr("Interval:" ) - + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("off")) + + " " + (vTreatmentVitals.interval ? (vTreatmentVitals.interval + qsTr("min")) : qsTr("OFF")) + " , " + qsTr("Last Read:") + " " + vTreatmentVitals.lastRead + Text { id: _vitalCountdown + color : "gray" + anchors { + top : parent.top + right : parent.right + rightMargin : 50 + } + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + height : 15 + width : 100 + text : vTreatmentVitals.interval ? ( vTreatmentVitals.countdown ) : "" + font.pixelSize: 16 + } } + Line { x: 0; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength } - TreatmentPressures { id: _pressuresTouchArea - arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin - arterialLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow || vTreatmentRanges.arterialPressureLimitLowMin - arterialUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh || vTreatmentRanges.arterialPressureLimitHighMax - arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax - venousMinimum : vTreatmentRanges.venousPressureMonitorMin - venousLowerBound : vTreatmentAdjustmentPressuresLimits. venousLimitLow || vTreatmentRanges.venousPressureLimitLowMin - venousUpperBound : vTreatmentAdjustmentPressuresLimits. venousLimitHigh || vTreatmentRanges.venousPressureLimitHighMax - venousMaximum : vTreatmentRanges.venousPressureMonitorMax - arterialPressure : vTreatmentPressureOcclusion.arterialPressure - venousPressure : vTreatmentPressureOcclusion.venousPressure - + TreatmentPressures { id: _pressuresTouchArea x : Variables.screenGridLeftColumnX y : Variables.screenGridRow1Y width : Variables.screenGridAreaWidth height : Variables.screenGridAreaHeightRow1 -// x : Variables.screenGridLeftColumnX -// y : Variables.screenGridRow3Y -// width : Variables.screenGridAreaWidth -// height : Variables.screenGridAreaHeightRow3 - onClicked: { sectionPressuresClicked() }