Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml =================================================================== diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-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 EndTreatmentRinseback.qml * \author (last) Behrouz NematiPour - * \date (last) 29-Jan-2021 + * \date (last) 13-Sep-2023 * \author (original) Behrouz NematiPour - * \date (original) 29-Jan-2021 + * \date (original) 11-Apr-2021 * */ @@ -21,6 +21,7 @@ import "qrc:/globals" import "qrc:/components" import "qrc:/pages/endtreatment" +import "qrc:/pages/treatment/sections" /*! * \brief the end treatment rinseback screen @@ -38,6 +39,9 @@ title.text: qsTr("Rinseback") + hasTimeout : vTreatmentRinseback .timeoutTotal + timeoutValue : vTreatmentRinseback .timeoutCountDown * 60 + ImageText { id: _imageEnd visible: ! vHDTreatmentStates.rbAdditional anchors { @@ -53,6 +57,21 @@ onClicked : endClicked() } + TreatmentPressures { id: _pressuresTouchArea + // maybe now it makes sense for the ranges to be displayed + // arterialLowerBound : 0 // requested to hide the bounds + // arterialUpperBound : 0 // requested to hide the bounds + // venousLowerBound : 0 // requested to hide the bounds + // venousUpperBound : 0 // requested to hide the bounds + + isTouchable : false + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow1Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow1 + } + Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength } + ProgressCircle { id: _circle diameter: 335 anchors { @@ -73,7 +92,6 @@ text: vTreatmentRinseback.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid) font.pixelSize: 76 font.weight: Font.ExtraLight - } Text { id: _labelRate