Index: leahi.qrc
===================================================================
diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -rd948f4557217f1f0258e027a81e0b939a72fcae6
--- leahi.qrc (.../leahi.qrc) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
+++ leahi.qrc (.../leahi.qrc) (revision d948f4557217f1f0258e027a81e0b939a72fcae6)
@@ -174,6 +174,7 @@
sources/gui/qml/compounds/BPHREntry.qml
sources/gui/qml/compounds/NumPad.qml
sources/gui/qml/compounds/LabelUnitContainer.qml
+ sources/gui/qml/compounds/LabelUnitText.qml
sources/gui/qml/compounds/ValueAdjuster.qml
sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml
sources/gui/qml/compounds/LabelUnitValueAdjuster.qml
Index: sources/gui/qml/compounds/LabelUnitText.qml
===================================================================
diff -u
--- sources/gui/qml/compounds/LabelUnitText.qml (revision 0)
+++ sources/gui/qml/compounds/LabelUnitText.qml (revision d948f4557217f1f0258e027a81e0b939a72fcae6)
@@ -0,0 +1,86 @@
+/*!
+ *
+ * Copyright (c) 2020-2026 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 LabelUnitText.qml
+ * \author (last) Stephen Quong
+ * \date (last) 06-Jan-2026
+ * \author (original) Stephen Quong
+ * \date (original) 06-Jan-2026
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Qml
+import "qrc:/globals"
+
+Rectangle { id: _root
+ objectName : "_labelUnitText"
+
+ property alias label : _label.text
+ property alias labelColor : _label.color
+ property string unit : ""
+ property alias value : _value.text
+ property alias valueColor : _value.color
+ property alias valueWidth : _value.width
+
+ width : Variables.adjustmentLabelUnitContainerWidth
+ height : Variables.adjustmentLabelUnitContainerHeight
+ radius : 8.5
+ color : Colors.panelBackgroundColor
+ border {
+ width : Variables.panelBorderWidth
+ color : Colors.panelBorderColor
+ }
+
+ Item { id: _contentItem
+ anchors.centerIn: parent
+ width : childrenRect.width
+ height : parent.height
+
+ Text { id: _label
+ anchors {
+ left : parent.left
+ verticalCenter : parent.verticalCenter
+ }
+ width : contentWidth
+ color : Colors.offWhite
+ font.pixelSize : Fonts.fontPixelContainerTitleSmall
+ }
+
+ Text { id: _unit
+ anchors {
+ left : _label.right
+ leftMargin : 5
+ baseline : _label.baseline
+ }
+ width : contentWidth
+ text : _root.unit.length > 0 ? ("(%1)").arg(_root.unit) : ""
+ color : _label.color
+ font {
+ pixelSize : Fonts.fontPixelContainerUnitSmall
+ weight : Font.Thin
+ }
+ }
+
+ Text { id: _value
+ anchors{
+ left : _unit.right
+ leftMargin : Variables.defaultMargin
+ baseline : _label.baseline
+ }
+ width : 60
+ horizontalAlignment : Text.AlignRight
+ color : Colors.offWhite
+ font {
+ pixelSize : Fonts.fontPixelContainerTitle
+ weight : Font.DemiBold
+ }
+ }
+ }
+}
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml
===================================================================
diff -u -rb439b3c189b98fbe944c924ef3ff0943b83edc42 -rd948f4557217f1f0258e027a81e0b939a72fcae6
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision b439b3c189b98fbe944c924ef3ff0943b83edc42)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml (.../TreatmentAdjustmentDurationConfirm.qml) (revision d948f4557217f1f0258e027a81e0b939a72fcae6)
@@ -36,67 +36,6 @@
signal confirmClicked(int vNewTreatmentDuration)
- component LabelUnitValue: Rectangle { id: _labelUnitValue
- property alias label : _label.text
- property string unit : ""
- property alias value : _value.text
- property color textColor : Colors.offWhite
- width : (_infoArea.width - (_infoRow.spacing * 2)) / 3
- height : Variables.adjustmentLabelUnitContainerHeight
- radius : 8.5
- color : Colors.panelBackgroundColor
- border {
- width : Variables.panelBorderWidth
- color : Colors.panelBorderColor
- }
-
- Item { id: _contentItem
- anchors.centerIn: parent
- width : childrenRect.width
- height : parent.height
-
- Text { id: _label
- anchors {
- left : parent.left
- verticalCenter : parent.verticalCenter
- }
- width : contentWidth
- color : _labelUnitValue.textColor
- font.pixelSize : Fonts.fontPixelContainerTitleSmall
- }
-
- Text { id: _unit
- anchors {
- left : _label.right
- leftMargin : 5
- baseline : _label.baseline
- }
- width : contentWidth
- text : _labelUnitValue.unit.length > 0 ? ("(%1)").arg(_labelUnitValue.unit) : ""
- color : _labelUnitValue.textColor
- font {
- pixelSize : Fonts.fontPixelContainerUnitSmall
- weight : Font.Thin
- }
- }
-
- Text { id: _value
- anchors{
- left : _unit.right
- leftMargin : Variables.defaultMargin
- baseline : _label.baseline
- }
- width : 60
- horizontalAlignment : Text.AlignLeft
- color : Colors.ufVolumeGoalText
- font {
- pixelSize : Fonts.fontPixelContainerTitle
- weight : Font.DemiBold
- }
- }
- }
- }
-
Item { id: _infoArea
objectName: "_infoArea"
anchors {
@@ -110,25 +49,41 @@
Row { id: _infoRow
objectName: "_infoRow"
- anchors.centerIn: parent
+
+ readonly property int cellWidth: (_infoRow.width - (_infoRow.spacing * 2)) / 3
+
+ anchors {
+ left : parent.left
+ right : parent.right
+ verticalCenter : parent.verticalCenter
+ }
spacing: Variables.defaultMargin * 2
- LabelUnitValue { id: _ufVolumeGoal
- label : qsTr("UF Volume Goal")
- unit : Variables.unitVolume
- value : _root.ufVolumeGoal.toFixed(Variables.ultrafiltrationPrecision)
+ LabelUnitText { id: _ufVolumeGoal
+ objectName : "_ufVolumeGoal"
+ width : _infoRow.cellWidth
+ label : qsTr("UF Volume Goal")
+ unit : Variables.unitVolume
+ value : _root.ufVolumeGoal.toFixed(Variables.ultrafiltrationPrecision)
+ valueColor : Colors.ufVolumeGoalText
}
- LabelUnitValue { id: _ufRate
- label : qsTr("New UF Rate")
- unit : Variables.unitTextRate
- value : _root.ufRate.toFixed(Variables.ultrafiltrationPrecision)
+ LabelUnitText { id: _ufRate
+ objectName : "_ufRate"
+ width : _infoRow.cellWidth
+ label : qsTr("New UF Rate")
+ unit : Variables.unitTextRate
+ value : _root.ufRate.toFixed(Variables.ultrafiltrationPrecision)
+ valueColor : Colors.ufVolumeGoalText
}
- LabelUnitValue { id: _newTreatmentDuration
- label : qsTr("New Treatment Duration")
- unit : Variables.unitTextDuration
- value : _root.newTreatmentDuration
+ LabelUnitText { id: _newTreatmentDuration
+ objectName: "_newTreatmentDuration"
+ width : _infoRow.cellWidth
+ label : qsTr("New Treatment Duration")
+ unit : Variables.unitTextDuration
+ value : _root.newTreatmentDuration
+ valueColor : Colors.ufVolumeGoalText
}
}
}
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml
===================================================================
diff -u -r073d19de245f1b740c84251bd6bdd91ab01dd73d -rd948f4557217f1f0258e027a81e0b939a72fcae6
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml (.../TreatmentAdjustmentDurationEdit.qml) (revision 073d19de245f1b740c84251bd6bdd91ab01dd73d)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml (.../TreatmentAdjustmentDurationEdit.qml) (revision d948f4557217f1f0258e027a81e0b939a72fcae6)
@@ -49,29 +49,11 @@
_newTreatmentDuration.value = _private.treatmentTimeTotal
}
- component LabelUnitText: LabelUnitContainer { id: _labelUnitText
- objectName : "_labelUnitText"
-
- property alias valueText: _labelUnitContainerText.text
-
- width : (_infoRow.width - (_infoRow.spacing * 2)) / 3
- height : Variables.adjustmentLabelUnitContainerHeight
- titleFontPixelSize : Fonts.fontPixelContainerTitleSmall
- unitText : Variables.unitTextDialCond
- unitFontPixelSize : Fonts.fontPixelContainerUnitSmall
-
- contentItem: Text { id: _labelUnitContainerText
- objectName : "_labelUnitContainerText"
- anchors.centerIn : parent
- width : contentWidth
- height : contentHeight
- color : Colors.offWhite
- font.pixelSize : Fonts.fontPixelValueControl
- }
- }
-
Row { id: _infoRow
objectName: "_infoRow"
+
+ readonly property int cellWidth: (_infoRow.width - (_infoRow.spacing * 2)) / 3
+
anchors {
top: parent.top
topMargin: Variables.defaultMargin * 2
@@ -84,23 +66,26 @@
LabelUnitText { id: _ufVolumeRemoved
objectName : "_ufVolumeRemoved"
- text : qsTr("UF Volume Removed")
- unitText : Variables.unitVolume
- valueText : _private.ufVolumeRemoved
+ width : _infoRow.cellWidth
+ label : qsTr("UF Volume Removed")
+ unit : Variables.unitVolume
+ value : _private.ufVolumeRemoved
}
LabelUnitText { id: _ufVolumeGoal
objectName : "_ufVolumeGoal"
- text : qsTr("UF Volume Goal")
- unitText : Variables.unitVolume
- valueText : _private.ufSetVolume
+ width : _infoRow.cellWidth
+ label : qsTr("UF Volume Goal")
+ unit : Variables.unitVolume
+ value : _private.ufSetVolume
}
LabelUnitText { id: _timeElapsed
objectName : "_timeElapsed"
- text : qsTr("Treatment Time Elapsed")
- unitText : Variables.unitTextDuration
- valueText : vTreatmentTime.time_Elapsed
+ width : _infoRow.cellWidth
+ label : qsTr("Treatment Time Elapsed")
+ unit : Variables.unitTextDuration
+ value : vTreatmentTime.time_Elapsed
}
}