Index: leahi.qrc
===================================================================
diff -u -r44b18327125389577b34655dfc0d95331c4b8f14 -r0fc6d1c6c65ba935d7e5f0bc56130e99deada039
--- leahi.qrc (.../leahi.qrc) (revision 44b18327125389577b34655dfc0d95331c4b8f14)
+++ leahi.qrc (.../leahi.qrc) (revision 0fc6d1c6c65ba935d7e5f0bc56130e99deada039)
@@ -270,6 +270,7 @@
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSaline.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r9bd436782039b50ac45eb38f561a36706517271b -r0fc6d1c6c65ba935d7e5f0bc56130e99deada039
--- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 9bd436782039b50ac45eb38f561a36706517271b)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 0fc6d1c6c65ba935d7e5f0bc56130e99deada039)
@@ -37,6 +37,7 @@
signal sectionFlowClicked()
signal sectionVitalsClicked()
signal sectionPressuresClicked()
+ signal sectionSalineClicked()
signal sectionTimeClicked()
signal sectionUltrafiltrationClicked()
@@ -72,6 +73,7 @@
width: cellWidth + Variables.defaultMargin
height: cellHeight
+ onEditClicked: sectionSalineClicked()
}
TreatmentVitals { id: _treatmentVitals
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r975e1964b60365b24c74be139c6b84369a7248ce -r0fc6d1c6c65ba935d7e5f0bc56130e99deada039
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 975e1964b60365b24c74be139c6b84369a7248ce)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 0fc6d1c6c65ba935d7e5f0bc56130e99deada039)
@@ -36,6 +36,7 @@
_treatmentAdjustmentFlow .close()
_treatmentAdjustmentVitals .close()
_treatmentAdjustmentPressuresLimits .close()
+ _treatmentAdjustmentSaline .close()
_treatmentAdjustmentDuration .close()
_treatmentAdjustmentUltrafiltration .close()
@@ -72,6 +73,9 @@
function onSectionPressuresClicked ( vValue ) {
_treatmentAdjustmentPressuresLimits.open()
}
+ function onSectionSalineClicked ( vValue ) {
+ _treatmentAdjustmentSaline.open()
+ }
function onSectionTimeClicked ( vValue ) {
//DEBUG: console.log("time total minutes: " + vTreatmentTime.time_Total / 60 )
_treatmentAdjustmentDuration.setDurationValue(vTreatmentTime.time_Total / 60) // minutes => hours
@@ -86,8 +90,9 @@
ScreenItem { id: _treatmentHeparin } // TODO: make me!
//// Treatment Adjustment Dialogs
- TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow }
- TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits }
+ TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow }
+ TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits }
+ TreatmentAdjustmentSaline { id: _treatmentAdjustmentSaline }
TreatmentAdjustmentUltrafiltration { id: _treatmentAdjustmentUltrafiltration }
Connections { target: _treatmentAdjustmentFlow
@@ -97,12 +102,22 @@
}
}
Connections { target: _treatmentAdjustmentPressuresLimits
- function onConfirmClicked ( vValue ) { vTreatmentAdjustmentPressuresLimits.doAdjustment(
- _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow ,
- _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow ,
- _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc )
+ function onConfirmClicked ( vValue ) {
+ vTreatmentAdjustmentPressuresLimits.doAdjustment(
+ _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow ,
+ _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow ,
+ _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc ,
+ _treatmentAdjustmentPressuresLimits.tmpPressureLimitWindow
+ )
}
}
+ Connections { target: _treatmentAdjustmentSaline
+ function onConfirmClicked ( vValue ) {
+ vTreatmentAdjustmentSaline.doAdjustment(
+ // TODO
+ )
+ }
+ }
TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration }
Connections { target: _treatmentAdjustmentDuration
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml
===================================================================
diff -u -r44b18327125389577b34655dfc0d95331c4b8f14 -r0fc6d1c6c65ba935d7e5f0bc56130e99deada039
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 44b18327125389577b34655dfc0d95331c4b8f14)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 0fc6d1c6c65ba935d7e5f0bc56130e99deada039)
@@ -30,6 +30,11 @@
TreatmentAdjustmentBase { id: _root
objectName: "_TreatmentAdjustmentPressures" //SquishQt testability
+ readonly property alias arterialPressureLimitWindow : _arterialWindow.value
+ readonly property alias venousPressureLimitWindow : _venousWindow.value
+ readonly property alias venousPressureLimitAsymtrc : _venousAsymmetricWindow.value
+ readonly property alias tmpPressureLimitWindow : _tmpWindow.value
+
titleText: qsTr("Pressure Window Limit Settings")
contentItem: Item { id: _contentItem
@@ -39,7 +44,7 @@
objectName: "_contentArea"
anchors {
top: parent.top
- bottom: _continueButton.top
+ bottom: _confirmButton.top
left: parent.left
right: parent.right
}
@@ -55,7 +60,6 @@
titleFontPixelSize : Fonts.fontPixelContainerTitleSmall
unitText : Variables.unitTextPressure
unitFontPixelSize : Fonts.fontPixelContainerUnitSmall
- valueTextColor : Colors.ufVolumeGoalText
minimum : vTreatmentRanges.arterialPressureLimitWindowMin
maximum : vTreatmentRanges.arterialPressureLimitWindowMax
step : vTreatmentRanges.arterialPressureLimitWindowRes
@@ -68,7 +72,6 @@
titleFontPixelSize : _arterialWindow.titleFontPixelSize
unitText : Variables.unitTextPressure
unitFontPixelSize : _arterialWindow.unitFontPixelSize
- valueTextColor : _arterialWindow.valueTextColor
minimum : vTreatmentRanges.venousPressureLimitWindowMin
maximum : vTreatmentRanges.venousPressureLimitWindowMax
step : vTreatmentRanges.venousPressureLimitWindowRes
@@ -81,7 +84,6 @@
titleFontPixelSize : _arterialWindow.titleFontPixelSize
unitText : Variables.unitTextPressure
unitFontPixelSize : _arterialWindow.unitFontPixelSize
- valueTextColor : _arterialWindow.valueTextColor
minimum : vTreatmentRanges.venousPressureLimitAsymtrcMin
maximum : vTreatmentRanges.venousPressureLimitAsymtrcMax
step : vTreatmentRanges.venousPressureLimitAsymtrcRes
@@ -94,7 +96,6 @@
titleFontPixelSize : _arterialWindow.titleFontPixelSize
unitText : Variables.unitTextPressure
unitFontPixelSize : _arterialWindow.unitFontPixelSize
- valueTextColor : _arterialWindow.valueTextColor
minimum : vTreatmentRanges.trancembrncPressureLimitWindowMin
maximum : vTreatmentRanges.trancembrncPressureLimitWindowMax
step : vTreatmentRanges.trancembrncPressureLimitWindowRes
@@ -103,22 +104,22 @@
}
}
- TouchRect { id: _continueButton
- objectName : "_continueButton"
+ TouchRect { id: _confirmButton
+ objectName : "_confirmButton"
anchors {
bottom : parent.bottom
horizontalCenter: parent.horizontalCenter
}
- width : Variables.ultrafiltrationButtonWidth
- height : Variables.ultrafiltrationButtonHeight
+ width : Variables.defaultButtonWidth
+ height : Variables.defaultButtonHeight
text {
- text : qsTr("Continue")
+ text : qsTr("Confirm")
font.weight : Font.Medium
}
isDefault : true
onClicked : {
- console.log("continue.onClicked")
+ _root.onConfirmClicked()
}
}
}
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSaline.qml
===================================================================
diff -u
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSaline.qml (revision 0)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSaline.qml (revision 0fc6d1c6c65ba935d7e5f0bc56130e99deada039)
@@ -0,0 +1,92 @@
+/*!
+ *
+ * Copyright (c) 2020-2025 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 TreatmentAdjustmentSaline.qml
+ * \author (last) Stephen Quong
+ * \date (last) 11-Nov-2025
+ * \author (original) Stephen Quong
+ * \date (original) 11-Nov-2025
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Project
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+
+/*!
+ * \brief TreatmentAdjustmentSaine.qml is the screen
+ * To adjust the treatment saline
+ */
+TreatmentAdjustmentBase { id: _root
+ objectName: "_TreatmentAdjustmentSaline" //SquishQt testability
+
+ readonly property alias fluidBolusVolume: _fluidBolusVolume.value
+
+ titleText: qsTr("Fluid Delivery Settings")
+
+ contentItem: Item { id: _contentItem
+ objectName: "_contentItem"
+
+ Item { id: _contentArea
+ objectName: "_contentArea"
+ anchors {
+ top: parent.top
+ bottom: _confirmButton.top
+ left: parent.left
+ right: parent.right
+ }
+
+ Column { id: _controlColumn
+ objectName: "_controlColumn"
+ anchors.centerIn: parent
+ spacing: Variables.defaultMargin
+
+ LabelUnitValueAdjuster { id: _fluidBolusVolume
+ objectName : "_fluidBolusVolume"
+ text : qsTr("Fluid Bolus Volume")
+ unitText : Variables.unitTextSaline
+ minimum : vTreatmentRanges.salineBolusVolumeMin
+ maximum : vTreatmentRanges.salineBolusVolumeMax
+ step : vTreatmentRanges.salineBolusVolumeRes
+ value : { value = vTreatmentRanges.salineBolusVolumeDef } // set without binding
+ }
+ }
+ }
+
+ TouchRect { id: _confirmButton
+ objectName : "_confirmButton"
+ anchors {
+ bottom : parent.bottom
+ horizontalCenter: parent.horizontalCenter
+ }
+ width : Variables.defaultButtonWidth
+ height : Variables.defaultButtonHeight
+ text {
+ text : qsTr("Confirm")
+ font.weight : Font.Medium
+ }
+ isDefault : true
+
+ onClicked : {
+ _root.confirmClicked()
+ console.log("continue.onClicked")
+ }
+ }
+ }
+
+ footer: Item { id: _footerItem
+ objectName : "_footerItem"
+ width : parent.width
+ height : Variables.notificationHeight
+ }
+}
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r0fc6d1c6c65ba935d7e5f0bc56130e99deada039
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision cb9c48c7c307690dcafcfd16ef412fe660291692)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 0fc6d1c6c65ba935d7e5f0bc56130e99deada039)
@@ -44,7 +44,6 @@
_root.buttonText
header.title : qsTr("Saline" )
- header.showEdit : false
QtObject { id: _private
readonly property string textStart : qsTr("Start Bolus") + "" + textVolumeTarget + "<\b>"