Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -r764c4d24f3c9649b51e9e5c172ec765ac3f0c683 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 764c4d24f3c9649b51e9e5c172ec765ac3f0c683) @@ -55,16 +55,16 @@ onHeaderMenuIndexChanged: { switch( _headerBar.currentScreen ) { - case MainMenu.Treatment: + case HeaderBar.Treatment: pop(null) // unwind stack back to main treatment break - case MainMenu.Trends: + case HeaderBar.Trends: page( _treatmentTrends ) break; - case MainMenu.Heparin: + case HeaderBar.Heparin: page( _treatmentHeparin ) break - case MainMenu.HDF: // TODO + case HeaderBar.HDF: // TODO page( _treatmentHDF ) break default: @@ -75,11 +75,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 ) { @@ -91,6 +92,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 @@ -118,7 +129,7 @@ TreatmentHeparin { id: _treatmentHeparin } Connections { target: _treatmentHeparin function onIdleTimeout ( ) { - _headerBar.headerMenuIndex = MainMenu.Treatment // on heparin idle timeout go to main treatment + _headerBar.headerMenuIndex = HeaderBar.Treatment // on heparin idle timeout go to main treatment } } @@ -215,8 +226,4 @@ function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )} function onTxEndChanged ( vValue ) { if ( vValue ) { _endTreatmentDialog.open() }} } - - Connections { target: _mainHome - function onStartTreatment ( vValue ) { page( _treatmentHome )} - } }