Index: resources/settings/instructions/instructions.conf =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf5498e2cd91de9d120b591a36f871db2e2b80fa7 --- resources/settings/instructions/instructions.conf (.../instructions.conf) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ resources/settings/instructions/instructions.conf (.../instructions.conf) (revision f5498e2cd91de9d120b591a36f871db2e2b80fa7) @@ -1,10 +1,56 @@ +[Sample^Water Sample] +. Unlock pump track . Lock pump track Water Sample Instruction =1.png +Insert cartridge using alignment pins Water Sample Instruction =2.png +HD machine door open / HD machine door closed Water Sample Instruction =3.png + +[Sample^Water Sample Result] +. Unlock pump track . Lock pump track Sample^Water Sample Result =1.png +Insert cartridge using alignment pins Sample^Water Sample Result =2.png +HD machine door open / HD machine door closed Sample^Water Sample Result =3.png + [Disposables^Cartridge Installation] -. Unlock pump track . Lock pump track =1.png -Insert cartridge using alignment pins =2.png -HD machine door open / HD machine door closed =3.png +. Unlock pump track . Lock pump track Disposables^Cartridge Installation=1.png +Insert cartridge using alignment pins Disposables^Cartridge Installation=2.png +HD machine door open / HD machine door closed Disposables^Cartridge Installation=3.png -[A^B] -2=5.png -0/1=4.png -3=6.png +[Connection^Start Treatment] +. Unlock pump track . Lock pump track Connection^Start Treatment=1.png +Insert cartridge using alignment pins Connection^Start Treatment=2.png +HD machine door open / HD machine door closed Connection^Start Treatment=3.png +[Connection^Patient Connection] +. Unlock pump track . Lock pump track Connection^Patient Connection=1.png +Insert cartridge using alignment pins Connection^Patient Connection=2.png +HD machine door open / HD machine door closed Connection^Patient Connection=3.png + +[Disposables^Saline Bag] +. Unlock pump track . Lock pump track Disposables^Saline Bag=1.png +Insert cartridge using alignment pins Disposables^Saline Bag=2.png +HD machine door open / HD machine door closed Disposables^Saline Bag=3.png + +[Disposables^Heparin Syringe] +. Unlock pump track . Lock pump track Disposables^Heparin Syringe=1.png +Insert cartridge using alignment pins Disposables^Heparin Syringe=2.png +HD machine door open / HD machine door closed Disposables^Heparin Syringe=3.png + +[Disposables^Cartridge Connection] +. Unlock pump track . Lock pump track Disposables^Cartridge Connection=1.png +Insert cartridge using alignment pins Disposables^Cartridge Connection=2.png +HD machine door open / HD machine door closed Disposables^Cartridge Connection=3.png + +[Disposables^Cartridge Installation] +. Unlock pump track . Lock pump track Disposables^Cartridge Installation=1.png +Insert cartridge using alignment pins Disposables^Cartridge Installation=2.png +HD machine door open / HD machine door closed Disposables^Cartridge Installation=3.png + +[Consumables^Consumables Installation] +. Unlock pump track . Lock pump track Consumables^Consumables Installation=1.png +Insert cartridge using alignment pins Consumables^Consumables Installation=2.png +HD machine door open / HD machine door closed Consumables^Consumables Installation=3.png + +[Sample^Water Sample Result Failed] +. Unlock pump track . Lock pump track Sample^Water Sample Result Failed=1.png +Insert cartridge using alignment pins Sample^Water Sample Result Failed=2.png +HD machine door open / HD machine door closed Sample^Water Sample Result Failed=3.png + + Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rf5498e2cd91de9d120b591a36f871db2e2b80fa7 --- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision f5498e2cd91de9d120b591a36f871db2e2b80fa7) @@ -28,7 +28,7 @@ StackItem { id: _root objectName: "_PreTreatmentSampleStack" - stackView.initialItem : _preTreatmentFilterFlush + stackView.initialItem : null property int stackStepIndex : 1 @@ -130,7 +130,7 @@ _mainMenu.hidden = true } else { - reset() + stackView.initialItem = null } } }