Index: sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml =================================================================== diff -u -rf8c80661c806c50047e81d581df0dd6e05f1c8ef -r8672e62f205231b08dd7d4a4f6f7f3a60b2c677b --- sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) +++ sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision 8672e62f205231b08dd7d4a4f6f7f3a60b2c677b) @@ -26,48 +26,68 @@ * that display the ultrafiltration volume removed and goal. */ Item { id: _root - property real setVolume : 0 - property real volumeRemoved : 0 + property real setVolume : 0 + property real volumeRemoved : 0 + property color volumeRemovedColor : Colors.fluidText + implicitWidth : (_ufVolumeRemovedItem.width * 2) + Variables.columnSpacing + implicitHeight : _ufVolumeRemovedItem.height + component ValueItem: Rectangle { id: _valueItem property alias label : _label.text property alias value : _value.text - property color textColor : Colors.fluidText + property color textColor : Colors.offWhite anchors.centerIn : parent - width : 350 - height : 60 + width : 425 + height : Variables.adjustmentLabelUnitContainerHeight radius : 5 color : Colors.panelBackgroundColor border { width : Variables.panelBorderWidth color : Colors.panelBorderColor } - Item { id: _textContainer + Item { id: _contentItem anchors.centerIn: parent width : childrenRect.width height : parent.height Text { id: _label - anchors{ + anchors { left : parent.left verticalCenter : parent.verticalCenter } width : contentWidth - color : textColor + color : _valueItem.textColor font { - pixelSize : Fonts.fontPixelButton - weight : Font.Medium + pixelSize : 23 + weight : Font.Medium } } + Text { id: _unit + anchors { + left : _label.right + leftMargin : 5 + baseline : _label.baseline + } + width : contentWidth + text : ("(%1) :").arg(Variables.unitVolume) + color : _valueItem.textColor + font { + pixelSize : 20 + } + } + Text { id: _value anchors{ - left : _label.right - verticalCenter : parent.verticalCenter + left : _unit.right + leftMargin : 5 + baseline : _label.baseline } - width : contentWidth - color : textColor + width : 60 + horizontalAlignment : Text.AlignLeft + color : _valueItem.textColor font { pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentMetrics weight : Font.DemiBold @@ -77,15 +97,23 @@ } ValueItem { id: _ufVolumeRemovedItem - anchors.horizontalCenterOffset : -(width/2 + 30) - label : qsTr("UF Volume Removed: ") - value : _root.volumeRemoved.toFixed(Variables.ultrafiltrationPrecision) + anchors { + horizontalCenter : parent.horizontalCenter + horizontalCenterOffset : -(width + Variables.columnSpacing)/2 + verticalCenter : parent.verticalCenter + } + label : qsTr("UF Volume Removed") + value : _root.volumeRemoved.toFixed(Variables.ultrafiltrationPrecision) } ValueItem { id: _ufVolumeGoalItem - anchors.horizontalCenterOffset : -(_ufVolumeRemovedItem.anchors.horizontalCenterOffset) - textColor : Colors.ufVolumeGoalText - label : qsTr("UF Volume Goal: ") - value : _root.setVolume.toFixed(Variables.ultrafiltrationPrecision) + anchors { + horizontalCenter : parent.horizontalCenter + horizontalCenterOffset : -(_ufVolumeRemovedItem.anchors.horizontalCenterOffset) + verticalCenter : parent.verticalCenter + } + textColor : _root.volumeRemovedColor + label : qsTr("UF Volume Goal") + value : _root.setVolume.toFixed(Variables.ultrafiltrationPrecision) } }