Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -reefe8acbe5b10deb379c5e4ceabeaa95d429410e -ra25dee6ed9a8cd343056d92bc3a78617eed66a6f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision a25dee6ed9a8cd343056d92bc3a78617eed66a6f) @@ -31,6 +31,7 @@ import "qrc:/globals" import "qrc:/components" import "qrc:/pages/treatment/adjustments" +import "qrc:/pages/pretreatment/create" /*! * \brief TreatmentStack is the screen @@ -112,24 +113,24 @@ } } - TreatmentCreate { id: _treatmentCreate + PreTreatmentCreate { id: _pretreatmentCreate onBackClicked : {vTreatmentCreate.doCancelSelectingParameters() } onContinueClicked : {vTreatmentCreate.doFinishedCreate(); } } - TreatmentConfirm { id: _treatmentConfirm + PreTreatmentConfirm { id: _pretreatmentConfirm onBackClicked : {vTreatmentCreate.doCancelConfirmParameters() } onConfirmClicked : {vTreatmentCreate.doFinishedConfirm(); } } - TreatmentPrime { id: _treatmentPrime + PreTreatmentPrime { id: _pretreatmentPrime onBackClicked : {vTreatmentCreate.doRequestPop() } onContinueClicked : {vTreatmentCreate.doFinishedPrime(); } } - TreatmentBegin { id: _treatmentBegin + PreTreatmentUltrafiltration { id: _pretreatmentUltrafiltration onBackClicked : {vTreatmentCreate.doRequestPop() } - onStartClicked : {vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_treatmentBegin.ufVolume) } + onStartClicked : {vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentUltrafiltration.ufVolume) } } //// Treatment Adjustment Dialogs @@ -237,13 +238,13 @@ onAdjustmentTriggered : { // the maximum ultrafiltration volume has to be set/revert regardless vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationInit.volume - _treatmentBegin.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume + _pretreatmentUltrafiltration.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume // but only if it has been accepted it will navigate if (vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted) { vTreatmentCreate.doStartTreatment() } else { - _treatmentBegin.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text() + _pretreatmentUltrafiltration.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text() } } } @@ -317,10 +318,10 @@ } Connections { target: vTreatmentCreate - onShowCreate : { push(_treatmentCreate) } - onShowConfirm : { push(_treatmentConfirm) } - onShowPrime : { push(_treatmentPrime) } - onShowBegin : { push(_treatmentBegin) } + onShowCreate : { push(_pretreatmentCreate) } + onShowConfirm : { push(_pretreatmentConfirm) } + onShowPrime : { push(_pretreatmentPrime) } + onShowBegin : { push(_pretreatmentUltrafiltration) } onPop : { pop() } onShowTreatmentStart : { push(_treatmentStart) } }