Index: leahi.qrc
===================================================================
diff -u -r1164ea502e3fabdb55aa41923e0e566505f197ef -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- leahi.qrc (.../leahi.qrc) (revision 1164ea502e3fabdb55aa41923e0e566505f197ef)
+++ leahi.qrc (.../leahi.qrc) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -269,6 +269,7 @@
sources/gui/qml/pages/treatment/TreatmentSection.qml
sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
sources/gui/qml/pages/treatment/TreatmentHeparin.qml
+ sources/gui/qml/pages/treatment/TreatmentHDF.qml
sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
@@ -279,6 +280,7 @@
sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml
sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rf0e262920199d1d5ebdbe3f1bf0c58c58a82d363 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision f0e262920199d1d5ebdbe3f1bf0c58c58a82d363)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -10,7 +10,8 @@
property alias titleText : _title.text
property alias loggedUser : _loggedInUser.text
readonly property int currentScreen : _headerMenu.currentScreen
- property alias statusColor : _headerMenu.statusColor
+ property alias heparinStatusColor : _headerMenu.heparinStatusColor
+ property alias hdfStatusColor : _headerMenu.hdfStatusColor
property bool isCreateRx : false // set in slot in parent
width : Variables.applicationWidth
@@ -145,7 +146,7 @@
ListElement { text: qsTr("Treatment"); visible: true; screen: 0 } // MainMenu.Treatment
ListElement { text: qsTr("Trends"); visible: true; screen: 1 } // MainMenu.Trends
ListElement { text: qsTr("Heparin"); visible: true; screen: 2 } // MainMenu.Heparin
- ListElement { text: qsTr("HDF"); visible: false; screen: 3 } // MainMenu.HDF
+ ListElement { text: qsTr("HDF"); visible: true; screen: 3 } // MainMenu.HDF
}
}
Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -r69c86c57349b7d4a6ba47a801ba27b1c470fade5 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 69c86c57349b7d4a6ba47a801ba27b1c470fade5)
+++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -34,8 +34,9 @@
property color backgroundColor : Colors.backgroundMainMenu
property int highlightHeight : 10
property bool isMainTreatment : false
- readonly property int currentScreen : isMainTreatment ? model.get(index).screen : 0
- property color statusColor : Colors.transparent
+ readonly property int currentScreen : isMainTreatment ? _model.get(index).screen : 0
+ property color heparinStatusColor : Colors.transparent
+ property color hdfStatusColor : Colors.transparent
width : parent.width
height : Variables.mainMenuHeight
@@ -104,7 +105,7 @@
border.width: 0
pixelSize : titlePixelSize
- Rectangle { id: _heparinStatus
+ Rectangle { id: _status
anchors {
left : parent.left
leftMargin : Variables.defaultMargin * 2
@@ -115,8 +116,10 @@
height : 15
width : height
radius : height
- visible : _root.isMainTreatment && model.screen === MainMenu.Heparin
- color : _root.statusColor
+ visible : _root.isMainTreatment && ( model.screen === MainMenu.Heparin ||
+ model.screen === MainMenu.HDF )
+ color : model.screen === MainMenu.Heparin ? _root.heparinStatusColor :
+ model.screen === MainMenu.HDF ? _root.hdfStatusColor : Colors.transparent
}
onPressed: {
Index: sources/gui/qml/compounds/LabelUnitValueAdjuster.qml
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/compounds/LabelUnitValueAdjuster.qml (.../LabelUnitValueAdjuster.qml) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/gui/qml/compounds/LabelUnitValueAdjuster.qml (.../LabelUnitValueAdjuster.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -31,6 +31,7 @@
property alias value : _valueAdjuster.value
property alias canOff : _valueAdjuster.canOff
property alias editable : _valueAdjuster.editable
+ property alias defaultValue : _valueAdjuster.defaultValue
width : Variables.adjustmentLabelUnitContainerWidth
height : Variables.adjustmentLabelUnitContainerHeight
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r1164ea502e3fabdb55aa41923e0e566505f197ef -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 1164ea502e3fabdb55aa41923e0e566505f197ef)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -94,9 +94,9 @@
readonly property color panelInvalidBorderColor : "#FFA500"
readonly property color heparinPanelBorderColor : "#CC42556B"
readonly property color heparinSectionHeader : "#384B60"
- readonly property color heparinActive : "#429C4A"
- readonly property color heparinPaused : "#D9A23D"
- readonly property color heparinComplete : "#276FCD"
+ readonly property color statusActive : "#429C4A"
+ readonly property color statusPaused : "#D9A23D"
+ readonly property color statusComplete : "#276FCD"
readonly property color touchTextAreaTitle : "#a0b6d0"
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5b83234771fac143552fa8106027d0ed8730c4d5)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -128,6 +128,8 @@
readonly property int treatmentFlowsComponentWidth : 150
readonly property int treatmentPressureTitleWidth : 125
readonly property int treatmentPressureValueWidth : 140
+ readonly property int treatmentCellWidth : 264 // screen width / # columns
+ readonly property int treatmentCellHeight : 420 //screen height / # rows - headerbar
readonly property int ultrafiltrationProgressBarWidth : 769
readonly property int ultraFiltrationProgressBarHeight : 25
Index: sources/gui/qml/pages/MainHome.qml
===================================================================
diff -u -r2747ac2a6976f0ef0b2f8fd91a2243f04a817a49 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 2747ac2a6976f0ef0b2f8fd91a2243f04a817a49)
+++ sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -31,7 +31,6 @@
property alias reasonText : _notification.text
- signal startTreatment()
signal createTreatment()
Image {
Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf)
+++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -114,7 +114,6 @@
}
MainHome { id: _mainHome
- onStartTreatment : { page( _treatmentStack )} // TODO: Remove before merging into staging. Only needed for this branch
onCreateTreatment : { vPreTreatmentAdjustmentInitTreatment.doInitiate( )}
onVisibleChanged: {
if (visible) {
Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml
===================================================================
diff -u -rd7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision d7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8)
+++ sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -34,11 +34,6 @@
_headerBar.hdfStatusColor = _root.statusColor // TODO update later
}
-
- Connections { target: vTDOpMode
- function onInTreatmentChanged ( vValue ) { if ( vValue ) { _chart.updateXAxis() } }
- }
-
Column { id: _column
objectName: "column"
@@ -71,19 +66,6 @@
header.color : Colors.heparinSectionHeader
enableDropShadow: false
}
-
- BaseChart { id: _chart
- width : _column.cellWidth
- height : _column.cellHeight
- lineSeries1Value : vTreatmentPressureOcclusion.arterialPressure
- lineSeries1Color : Colors.pressuresArterialBar
-
- lineSeries2Value : vTreatmentPressureOcclusion.venousPressure
- lineSeries2Color : Colors.pressuresVenousBar
-
- lineSeries3Value : vTreatmentPressureOcclusion.tmpPressure
- lineSeries3Color : Colors.pressuresTmpBar
- }
}
TreatmentHDFComponent { id: _treatmentHdfComponent
Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml
===================================================================
diff -u -rc369e34e8864b8b7a7bca07b77f5d3a41701ffbf -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/pages/treatment/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision c369e34e8864b8b7a7bca07b77f5d3a41701ffbf)
+++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -5,7 +5,7 @@
* 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 BaseComboBox.qml
+ * \file TreatmentHeparin.qml
* \author (last) Nico Ramirez
* \date (last) 2-Dec-2025
* \author (original) Nico Ramirez
@@ -39,9 +39,9 @@
readonly property bool isTxRunning : vTDTreatmentStates.txDialysis
readonly property color heparinColor : _root.deliveryOff ? Colors.transparent :
- isDispensing ? Colors.heparinActive :
- isPaused ? Colors.heparinPaused :
- isCompleted ? Colors.heparinComplete : Colors.transparent
+ isDispensing ? Colors.statusActive :
+ isPaused ? Colors.statusPaused :
+ isCompleted ? Colors.statusComplete : Colors.transparent
readonly property bool deliveryOff : vTreatmentCreate.heparinDispensingRate === 0
readonly property string buttonText : isDispensing ? qsTr("Pause") :
isPaused ? qsTr("Resume") : qsTr("Pause")
@@ -60,7 +60,7 @@
signal idleTimeout()
- onHeparinColorChanged : _headerBar.statusColor = heparinColor
+ onHeparinColorChanged : _headerBar.heparinStatusColor = heparinColor
enum HeparinPrescription{
HeparinType,
@@ -246,7 +246,7 @@
left : parent.left
}
text : _root.deliveryOff ? ("%1 : %2").arg(Variables.emptyEntry).arg(Variables.emptyEntry) : _root.timeRemaining
- color : _root.deliveryOff ? Colors.white : _root.isPaused ? Colors.heparinPaused : Colors.white
+ color : _root.deliveryOff ? Colors.white : _root.isPaused ? Colors.statusPaused : Colors.white
font.pixelSize : _root.deliveryOff ? Fonts.fontPixelHeparin : Fonts.fontPixelHeparinTime
font.weight : Font.DemiBold
}
@@ -295,7 +295,7 @@
maximum : _root.deliveryOff ? 0 : _root.target
value : _root.deliveryOff ? 0 : _root.cumulative
unitText : Variables.unitTextFluid
- color : _root.isPaused ? Colors.heparinPaused : Colors.progressBarUltrafiltration
+ color : _root.isPaused ? Colors.statusPaused : Colors.progressBarUltrafiltration
radius : height
showMarker : false
progress.opacity: _root.isPaused ? 0.5 : 1
@@ -320,7 +320,7 @@
}
text : ("%1 %2").arg(_root.deliveryOff ? Variables.emptyEntry :
_root.cumulative.toFixed(Variables.heparinDeliveryPrecision)).arg(qsTr(Variables.unitTextFluid))
- color : _root.deliveryOff ? Colors.white : _root.isPaused ? Colors.heparinPaused : Colors.white
+ color : _root.deliveryOff ? Colors.white : _root.isPaused ? Colors.statusPaused : Colors.white
font.pixelSize : Fonts.fontPixelHeparin
font.weight : Font.DemiBold
}
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -41,8 +41,8 @@
signal sectionTimeClicked()
signal sectionUltrafiltrationClicked()
- readonly property int cellWidth : (_root.width / 7) - 10 // = screen width / # columns
- readonly property int cellHeight: (Variables.screenContentHeight / 2) - Variables.notificationHeight // = screen height / # rows - headerbar
+ readonly property int cellWidth : Variables.treatmentCellWidth
+ readonly property int cellHeight: Variables.treatmentCellHeight
Column { id: _column
objectName: "column"
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -122,7 +122,12 @@
}
}
- ScreenItem { id: _treatmentHDF } // TODO: make me!
+ TreatmentHDF { id: _treatmentHDF }
+ Connections { target: _treatmentHDF
+ function onSectionPressuresClicked ( ) {
+ _treatmentAdjustmentPressuresLimits.open()
+ }
+ }
//// Treatment Adjustment Dialogs
TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints }
@@ -215,8 +220,4 @@
function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )}
function onTxEndChanged ( vValue ) { if ( vValue ) { _endTreatmentDialog.open() }}
}
-
- Connections { target: _mainHome
- function onStartTreatment ( vValue ) { page( _treatmentHome )}
- }
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
===================================================================
diff -u -rd7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision d7cdeb52d868ce60c0fb5b6ac0e279c440ba99a8)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -185,7 +185,7 @@
TouchRect { id : _substitutionFlowButton
width : text.implicitWidth + Variables.defaultMargin * 2
- height : 60
+ height : Variables.contentHeight
text {
text : _root.buttonText
font.pixelSize : Fonts.fontPixelConfirm
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -rb1462640e36df3f567c42aa8c8cbd6dafe865625 -r45ce5cd058a8d0239d486e0ab4b057731f7dba76
--- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625)
+++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
@@ -98,6 +98,7 @@
VALUESET(float , dialysateTemp , 0)
VALUESET(float , heparinDispensingRate , 0)
VALUESET(float , heparinBolusVolume , 0)
+ VALUESET(quint32 , hdfTreatmentMode , 0)
VALUESET(QString , patientID ,"")
VALUESET(bool , parametersValidated , 0)