Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml =================================================================== diff -u -rd14136d218b5dbc0734f7949b30541d242bcd350 -r3b09007701d2da7cced59daa8093094df12590cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision d14136d218b5dbc0734f7949b30541d242bcd350) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision 3b09007701d2da7cced59daa8093094df12590cd) @@ -88,7 +88,6 @@ topMargin: _divider.anchors.topMargin horizontalCenter: parent.horizontalCenter } -// width : _infoRow.cellWidth text : qsTr("A new UF rate will be applied to achieve the ultrafiltration volume goal.") color : Colors.offWhite font.pixelSize : Fonts.fontPixelContainerTitleSmall Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r3b09007701d2da7cced59daa8093094df12590cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 3b09007701d2da7cced59daa8093094df12590cd) @@ -46,16 +46,75 @@ TreatmentAdjustmentUltrafiltrationMetrics { id: _newValues objectName : "_newValues" - anchors.centerIn : parent - leftLabel : qsTr("New UF Volume") + anchors { + top : parent.top + topMargin : Variables.defaultMargin * 2 + horizontalCenter: parent.horizontalCenter + } + + leftLabel : qsTr("UF Volume Removed") leftUnit : Variables.unitVolume - leftValue : _root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision) - leftColor : Colors.ufVolumeGoalText - rightLabel : qsTr("New UF Rate") + leftValue : vTreatmentUltrafiltration.volumeRemoved.toFixed(Variables.ultrafiltrationPrecision) + rightLabel : qsTr("UF Volume Goal") rightUnit : Variables.unitTextRate - rightValue : _root.ultrafiltrationRate.toFixed(Variables.ultrafiltrationPrecision) + rightValue : _root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision) rightColor : Colors.ufVolumeGoalText } + +// TreatmentAdjustmentUltrafiltrationMetrics { id: _newValues +// objectName : "_newValues" +// anchors.centerIn : parent +// leftLabel : qsTr("New UF Volume") +// leftUnit : Variables.unitVolume +// leftValue : _root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision) +// leftColor : Colors.ufVolumeGoalText +// rightLabel : qsTr("New UF Rate") +// rightUnit : Variables.unitTextRate +// rightValue : _root.ultrafiltrationRate.toFixed(Variables.ultrafiltrationPrecision) +// rightColor : Colors.ufVolumeGoalText +// } + + Rectangle { id: _divider + objectName: "_divider" + anchors { + top: _newValues.bottom + topMargin : Variables.defaultMargin * 3 + left : parent.left + leftMargin : 50 + right : parent.right + rightMargin : anchors.leftMargin + } + height : 2 + color : Colors.panelBorderColor + } + + Text { id: _description + objectName : "_description" + anchors { + top : _divider.bottom + topMargin : _divider.anchors.topMargin + horizontalCenter: parent.horizontalCenter + } + text : qsTr("A new UF rate will be applied to achieve the ultrafiltration volume goal.") + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelContainerTitleSmall + } + + + LabelUnitText { id: _newUfRate + objectName : "_newUfRate" + anchors { + top : _description.bottom + topMargin : _description.anchors.topMargin + horizontalCenter: parent.horizontalCenter + } + width : 420 + label : qsTr("UF Rate") + unit : Variables.unitTextRate + value : _root.ultrafiltrationRate.toFixed(Variables.ultrafiltrationPrecision) + valueColor : Colors.ufVolumeGoalText + } + } TouchRect { id: _confirmButton