Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -r5a505f86c26c8e1fd6d584cd53a3765c25120781 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781) @@ -15,6 +15,7 @@ // Qt import QtQuick 2.12 +import QtQuick.Controls 2.12 // StackView // Qml imports import "qrc:/components" @@ -73,9 +74,25 @@ } // Components - TreatmentBloodPrime { id: _treatmentBloodPrime } - TreatmentHome { id: _treatmentHome } + TreatmentBloodPrime { id: _treatmentBloodPrime + StackView.onActivating : { _headerBar.titleText = qsTr("Blood Priming") } + StackView.onDeactivated : { _headerBar.titleText = "" } + onDecreaseClicked : { vTreatmentAdjustmentBloodPrime.doDecrease () } + onIncreaseClicked : { vTreatmentAdjustmentBloodPrime.doIncrease () } + onPauseClicked : { vTreatmentAdjustmentBloodPrime.doPause () } + } + Connections { target: vTreatmentAdjustmentBloodPrime + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentBloodPrime.adjustment_Accepted) { + _treatmentBloodPrime.notification.text = "" + } + else { + _treatmentBloodPrime.notification.text = vTreatmentAdjustmentBloodPrime.text() + } + } + } + TreatmentHome { id: _treatmentHome } Connections { target: _treatmentHome function onSectionFlowClicked ( vValue ) { _treatmentAdjustmentSetPoints.open() @@ -108,10 +125,10 @@ ScreenItem { id: _treatmentHDF } // TODO: make me! //// Treatment Adjustment Dialogs - TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } - TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } - TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } - TreatmentAdjustmentUltrafiltration { id: _treatmentAdjustmentUltrafiltration } + TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } + TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } + TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } + TreatmentAdjustmentUltrafiltrationStack { id: _treatmentAdjustmentUltrafiltration } Connections { target: _treatmentAdjustmentSetPoints function onConfirmClicked ( vValue ) { @@ -140,7 +157,7 @@ } } - TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration } + TreatmentAdjustmentDurationStack { id: _treatmentAdjustmentDuration } TreatmentAdjustmentVitalsInterval { id: _treatmentAdjustmentVitalsInterval }