Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml =================================================================== diff -u -r0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29 -r0975a67dd4e4673b9a7b226bfea02cbfa489c418 --- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 0bc5c7e5752e76707f92b9ef1ecfe54b0c5ead29) +++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 0975a67dd4e4673b9a7b226bfea02cbfa489c418) @@ -18,6 +18,7 @@ BloodSetTubing , BloodLines , PressureLinesAndDialyzer, + SalineSubStitution , Count } @@ -43,8 +44,11 @@ page ( _preTreatmentPressureLinesAndDialyzer ) break case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: - goToNextStep() + page ( _pretreatmentSalineSubstitution ) break + case PreTreatmentInstallStack.Step.SalineSubStitution: + goToNextStep () + break default: break } @@ -61,6 +65,9 @@ case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: page ( _preTreatmentBloodLines ) break + case PreTreatmentInstallStack.Step.SalineSubStitution: + page ( _preTreatmentPressureLinesAndDialyzer ) + break default: break } @@ -73,7 +80,8 @@ case PreTreatmentInstallStack.Step.BloodSetTubing: return qsTr("Auto Load") case PreTreatmentInstallStack.Step.BloodLines: - case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: // fall through + case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: + case PreTreatmentInstallStack.Step.SalineSubStitution: // fall through default: return qsTr("Next") } @@ -82,22 +90,29 @@ // ----- Screens definitions PreTreatmentBase { id: _preTreatmentBloodSetTubing instructionBased : true - onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodSetTubing ; updateModel() } + onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodSetTubing; updateModel() } subStepName : qsTr("Blood Tubing Set") } PreTreatmentBase { id: _preTreatmentBloodLines instructionBased : true - onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodLines ; updateModel() } + onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodLines ; updateModel() } subStepName : qsTr("Bloodlines") } PreTreatmentBase { id: _preTreatmentPressureLinesAndDialyzer instructionBased : true - onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.PressureLinesAndDialyzer ; updateModel()} + onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.PressureLinesAndDialyzer; updateModel() } subStepName : qsTr("Pressure Lines and Dialyzer") } + PreTreatmentBase { id: _pretreatmentSalineSubstitution + instructionBased : true + onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.SalineSubStitution; updateModel() } + subStepName : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF ? qsTr("Substitution") : + qsTr("Saline") + } + // blood tubing set auto-load Connections { target: vPreTreatmentAdjustmentDisposablesConfirm function onAdjustmentTriggered ( vValue ) {