Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml =================================================================== diff -u -r8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7 -r1132f049e169cc87a059261f72fca0ceb7d739f1 --- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7) +++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 1132f049e169cc87a059261f72fca0ceb7d739f1) @@ -18,6 +18,7 @@ BloodSetTubing , BloodLines , PressureLinesAndDialyzer, + Saline , Count } @@ -37,6 +38,9 @@ page ( _preTreatmentPressureLinesAndDialyzer ) break case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: + page ( _pretreatmentSaline ) + break + case PreTreatmentInstallStack.Step.Saline: goToNextStep () break default: @@ -55,6 +59,9 @@ case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: page ( _preTreatmentBloodLines ) break + case PreTreatmentInstallStack.Step.Saline: + page ( _preTreatmentPressureLinesAndDialyzer ) + break default: break } @@ -65,7 +72,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.Saline: // fall through default: return qsTr("Next") } @@ -78,22 +86,30 @@ // ----- 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: _pretreatmentSaline + instructionBased : true + onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.Saline; updateModel() } + subStepName : qsTr("Saline") + + } + // blood tubing set auto-load Connections { target: vPreTreatmentAdjustmentDisposablesConfirm function onAdjustmentTriggered ( vValue ) {