Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml =================================================================== diff -u -r04892d957c8f85eba1dc0550c2c9b01eef86efe9 -rde738ed372de968283937468795bdf6318c52e5a --- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision 04892d957c8f85eba1dc0550c2c9b01eef86efe9) +++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision de738ed372de968283937468795bdf6318c52e5a) @@ -48,6 +48,7 @@ readonly property int topTextFontSize : 25 readonly property int bottomTextFontSize : 60 readonly property real estimatedSubstitutionVal : vTreatmentHDF.requestedVolume + readonly property real prescribedSubstitutionVal: vTreatmentCreate.substitutionFluidVolume readonly property real substitutionRate : vTreatmentHDF.currentRate readonly property real minimum : vTreatmentRanges.substitutionVolumeMin @@ -60,6 +61,7 @@ vTreatmentHDF.hdfState === TreatmentHDF.Paused ? qsTr("Pause") : vTreatmentHDF.hdfState === TreatmentHDF.Complete ? qsTr("Complete") : Variables.emptyEntry + readonly property bool volumeDeviation: estimatedSubstitutionVal < prescribedSubstitutionVal // LEAHI-PRS-816 property color statusColor : Colors.transparent @@ -91,6 +93,7 @@ leftAlign : true unitText : Variables.unitVolume bottomTextTopMargin : Variables.defaultMargin + bottomTextColor : _root.volumeDeviation ? Colors.pauseColor : Colors.textTextRectLabel } LabelValue { id: _substitutionRate @@ -113,7 +116,7 @@ bottomTextTopMargin : Variables.defaultMargin } - ProgressBar { id: _progressbar + ProgressBarEx { id: _progressbar anchors { verticalCenter : parent.verticalCenter right : parent.right @@ -122,8 +125,10 @@ height : 20 decimal : Variables.substitutionPrecision minimum : 0 - maximum : _root.estimatedSubstitutionVal.toFixed(Variables.substitutionPrecision) + maximum : _root.prescribedSubstitutionVal.toFixed(Variables.substitutionPrecision) value : _root.substitutionValue.toFixed(Variables.substitutionPrecision) + valueEx : _root.estimatedSubstitutionVal.toFixed(Variables.substitutionPrecision) + unitText : Variables.unitVolume color : vTreatmentHDF.hdfState === TreatmentHDF.Paused ? Colors.pauseColor : Colors.progressBarUltrafiltration bgColor : Colors.heparinSectionHeader