Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.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 TreatmentAdjustmentUltrafiltrationPaused.qml - * \author (last) Behrouz NematiPour - * \date (last) 30-Jul-2020 - * \author (original) Behrouz NematiPour - * \date (original) 14-May-2020 + * \file TreatmentAdjustmentUltrafiltrationPaused.qml + * \author (last) Vy + * \date (last) 16-Mar-2023 + * \author (original) Behrouz NematiPour + * \date (original) 14-May-2020 * */ @@ -29,7 +29,6 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationPaused" //SquishQt testability QtObject { id: _private - property int decimal: vTreatmentUltrafiltration.precision property real minimum: vTreatmentUltrafiltration.minimum property real maximum: vTreatmentUltrafiltration.maximum property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol @@ -50,13 +49,13 @@ ProgressBarEx { id: _progressbarex width : Variables.ultrafiltrationProgressbarWidth - height : Variables.progressbarHeight + height : Variables.ultraFiltrationProgressBarHeight anchors { top: parent.top topMargin: 250 horizontalCenter: parent.horizontalCenter } - decimal : _private.decimal + decimal : Variables.ultrafiltrationPrecision minimum : _private.minimum maximum : _private.maximum value : _private.value @@ -71,9 +70,7 @@ topMargin: 350 horizontalCenter: parent.horizontalCenter } - - backgroundColor: Colors.backgroundButtonSelect - + isDefault: true text { text: qsTr("EDIT ULTRAFILTRATION VOLUME") font.weight: Font.DemiBold @@ -83,7 +80,7 @@ } TouchRect { id: _resumeButton - visible: ! ( isUFOff || isUFCompleted ) + visible: isUFPaused width: 530 height: 95 anchors { @@ -92,8 +89,6 @@ horizontalCenter: parent.horizontalCenter } - borderColor: Colors.borderDisableButton - Image { id: _image anchors { verticalCenter: _resumeButton.verticalCenter