Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r631dadb4c886d7a68687aeb7451d59a144e47992 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 631dadb4c886d7a68687aeb7451d59a144e47992) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -43,10 +43,11 @@ if (! visible) { _headerBar.menuHidden = true + stackView.initialItem = null } } - stackView.initialItem : null + stackView.initialItem : _treatmentHome readonly property bool isTreatmentPaused : vTDTreatmentStates.txStop readonly property bool isSBInProgress : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump ) @@ -55,16 +56,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: @@ -140,17 +141,28 @@ 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 } } - ScreenItem { id: _treatmentHDF } // TODO: make me! + TreatmentHDF { id: _treatmentHDF } + Connections { target: _treatmentHDF + function onSectionPressuresClicked ( ) { + _treatmentAdjustmentPressuresLimits.open() + } + function onTreatmentHDFEditClicked ( ) { + _treatmentAdjustmentHDF.open() + + } + } + //// Treatment Adjustment Dialogs TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } TreatmentAdjustmentUltrafiltrationStack { id: _treatmentAdjustmentUltrafiltration } + TreatmentAdjustmentHDF { id: _treatmentAdjustmentHDF } Connections { target: _treatmentAdjustmentSetPoints function onConfirmClicked ( vValue ) { @@ -237,8 +249,4 @@ function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )} function onTxEndChanged ( vValue ) { if ( vValue ) { _endTreatmentDialog.open() }} } - - Connections { target: _mainHome - function onStartTreatment ( vValue ) { page( _treatmentHome )} - } }