Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.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 EndTreatmentAdditional.qml * \author (last) Behrouz NematiPour - * \date (last) 09-Feb-2021 + * \date (last) 13-Sep-2023 * \author (original) Behrouz NematiPour - * \date (original) 09-Feb-2021 + * \date (original) 11-Apr-2021 * */ @@ -20,38 +20,20 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages/endtreatment" +import "qrc:/pages/treatment/sections" /*! * \brief the end treatment additional rinseback screen */ -ScreenItem { id: _root +EndTreatmentBase { id: _root objectName: "_EndTreatmentAdditional" - Text { id: _title - anchors { - top: parent.top - topMargin: 65 - horizontalCenter: parent.horizontalCenter - } - color: "white" - text: qsTr("Additional Rinseback") - font.pixelSize: Fonts.fontPixelTitle - } + title.text: qsTr("Saline Bolus") - TimeText { id: timeout - visible : vTreatmentRinseback.timeoutTotal - anchors { - horizontalCenter: parent.horizontalCenter - top : _title.bottom - topMargin : 15 - } - textPixelSize : 30 - textWeight : Font.Normal - // the TimeText component works with hour and minute mainly - // so changing the seconds to minuts was easier than changing the component - secondsVisible : false - seconds : vTreatmentRinseback.timeoutCountDown * 60 - } + // DEN-10163 + // hasTimeout : vTreatmentRinseback.timeoutTotal + // timeoutValue: vTreatmentRinseback.timeoutCountDown * 60 ProgressCircle { id: _circle diameter: 335 @@ -63,7 +45,7 @@ Text { id: _textVolume anchors.centerIn: parent - color: "white" + color: Colors.textMain text: vTreatmentRinseback.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid) font.pixelSize: 76 font.weight: Font.ExtraLight @@ -76,15 +58,25 @@ topMargin: 20 horizontalCenter: parent.horizontalCenter } - color: "white" + color: Colors.textMain text: vTreatmentRinseback.rate.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate) font.pixelSize: 23 } } - onVisibleChanged: { - if (visible) { - _mainMenu.hidden = true - } + 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 } + }