Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r583d1953c783940c93f22c37b23daadb1ff3a09c -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 583d1953c783940c93f22c37b23daadb1ff3a09c) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.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 TreatmentSaline.qml - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NematiPour - * \date (original) 10-Aug-2020 + * \file TreatmentSaline.qml + * \author (last) Vy + * \date (last) 18-May-2023 + * \author (original) Behrouz NematiPour + * \date (original) 10-Aug-2020 * */ @@ -49,12 +49,16 @@ buttonText : ( _root.isDisabled || _root.isWaitPump ) ? _private.textStart : _root.isStarted ? _private.textStop : _private.textStart + + fluidProgressBarColor: _root.isStarted ? Colors.sliderHighlightColor : Colors.highlightProgressBar + title : qsTr("SALINE BOLUS") unit : Variables.unitTextSaline - valueTarget : vTreatmentSaline.target || vTreatmentAdjustmentSaline.target - valueCumulative: vTreatmentSaline.cumulative .toFixed(0) - valueDelivered : vTreatmentSaline.delivered .toFixed(0) + valueDecimal : Variables.salinePrecision + valueTarget : vTreatmentSaline.target || vTreatmentAdjustmentSaline.target + valueCumulative : vTreatmentSaline.cumulative + valueDelivered : vTreatmentSaline.delivered VTreatmentSaline { id: vTreatmentSaline } @@ -65,10 +69,8 @@ notification { visible : true - text : isIdle ? "" : - isDisabled ? _private.mesgDisabled : - isWaitPump ? _private.mesgWaitForPump : - isStarted ? _private.mesgRejectReason : - "" + text : isDisabled ? _private.mesgDisabled : + isWaitPump ? _private.mesgWaitForPump : + _private.mesgRejectReason } }