Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r11cf98a0aae3c01a7e7608b0c9f8a4c2112ca997 -r70d690fd679722b8b1bd8e2872f15b1e11e868d2 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 11cf98a0aae3c01a7e7608b0c9f8a4c2112ca997) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 70d690fd679722b8b1bd8e2872f15b1e11e868d2) @@ -30,16 +30,9 @@ HDF = 3 } - onIsHeparinFeaturedChanged : _model.setProperty(HeaderBar.Heparin, "visible", _root.isHeparinFeatured) - Component.onCompleted : _model.setProperty(HeaderBar.Heparin, "visible", _root.isHeparinFeatured) + onIsHeparinFeaturedChanged : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured) + Component.onCompleted : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured) - ListModel { id: _model - ListElement { text: qsTr("Treatment"); visible: true; screen: 0; statusColor: "Transparent" } // HeaderBar.Treatment - ListElement { text: qsTr("Trends"); visible: true; screen: 1; statusColor: "Transparent" } // HeaderBar.Trends - ListElement { text: qsTr("Heparin"); visible: true; screen: 2; statusColor: "Transparent" } // HeaderBar.Heparin - ListElement { text: qsTr("HDF"); visible: true; screen: 3; statusColor: "Transparent" } // HeaderBar.HDF - } - function vitalsRecorded() { _vitalsButton.pulseAnimation.start() } MouseArea { id: _mouseArea @@ -155,7 +148,7 @@ titlePixelSize : 32 backgroundColor : Colors.transparent highlightHeight : 15 - model : _model + model : vListModel.headerbarModel onHiddenChanged : { if (hidden) { index = 0 } } } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r11cf98a0aae3c01a7e7608b0c9f8a4c2112ca997 -r70d690fd679722b8b1bd8e2872f15b1e11e868d2 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 11cf98a0aae3c01a7e7608b0c9f8a4c2112ca997) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 70d690fd679722b8b1bd8e2872f15b1e11e868d2) @@ -76,11 +76,12 @@ // Components TreatmentBloodPrime { id: _treatmentBloodPrime - StackView.onActivating : { _headerBar.titleText = qsTr("Blood Priming") } - StackView.onDeactivated : { _headerBar.titleText = "" } - onDecreaseClicked : { vTreatmentAdjustmentBloodPrime.doDecrease () } - onIncreaseClicked : { vTreatmentAdjustmentBloodPrime.doIncrease () } - onPauseClicked : { vTreatmentAdjustmentBloodPrime.doPause () } + StackView.onActivating : { _headerBar.titleText = qsTr("Blood Priming") } + StackView.onDeactivated : { _headerBar.titleText = "" } + onIncrementRate : function(newValue) { vTreatmentAdjustmentBloodFlowRate.doAdjustment(newValue) } + onDecrementRate : function(newValue) { vTreatmentAdjustmentBloodFlowRate.doAdjustment(newValue) } + onPause : { vTreatmentAdjustmentBloodPrime.doPause() } + onResume : { vTreatmentAdjustmentBloodPrime.doResume() } } Connections { target: vTreatmentAdjustmentBloodPrime function onAdjustmentTriggered ( vValue ) { @@ -92,6 +93,16 @@ } } } + Connections { target: vTreatmentAdjustmentBloodFlowRate + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentBloodPrime.adjustment_Accepted) { + _treatmentBloodPrime.notification.text = "" + } + else { + _treatmentBloodPrime.notification.text = vTreatmentAdjustmentBloodFlowRate.text() + } + } + } TreatmentHome { id: _treatmentHome } Connections { target: _treatmentHome