Index: sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml =================================================================== diff -u -r22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 --- sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml (.../PreTreatmentMainStack.qml) (revision 22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb) +++ sources/gui/qml/pages/pretreatment/PreTreatmentMainStack.qml (.../PreTreatmentMainStack.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) @@ -20,9 +20,6 @@ // Qml imports import "qrc:/globals" import "qrc:/components" -import "qrc:/pages/pretreatment/sample" // Water Sample -import "qrc:/pages/pretreatment/consumables" -import "qrc:/pages/pretreatment/disposables" // No Cartridge SelfTest import "qrc:/pages/pretreatment/prime" /*! * \brief the pre treatment prime stack screen @@ -32,7 +29,19 @@ stackView.initialItem : null - PreTreatmentSampleStack { id: _preTreatmentSampleStack } + // these are two test step definitions later will be read from file and will be available from a model + property var testStepNames: [ + ". Unlock pump track . Lock pump track", + "Insert cartridge using alignment pins", + "HD machine door open / HD machine door closed", + ] + property var testStepImages: [ + "file:/home/denali/Projects/application/resources/NotAttachedTestImages/1.png", + "file:/home/denali/Projects/application/resources/NotAttachedTestImages/2.png", + "file:/home/denali/Projects/application/resources/NotAttachedTestImages/3.png", + ] + + PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack } PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack } PreTreatmentDisposablesStack{ id: _preTreatmentDisposablesStack } PreTreatmentPrimeStack { id: _pretreatmentPrimeStack } @@ -54,8 +63,8 @@ } Connections { target: vPreTreatmentStates - onStartChanged : { if ( vstart ) { console.debug("vstart ")}} - onWaterSampleChanged : { if ( vwaterSample ) { page( _preTreatmentSampleStack )}} + onStartChanged : {} + onWaterSampleChanged : { if ( vwaterSample ) { page( _preTreatmentWaterSampleStack )}} onSelfTestConsumablesChanged: { if ( vselfTestConsumables ) { page( _preTreatmentConsumablesStack )}} onSelfTestNoCartridgeChanged: { if ( vselfTestNoCartridge ) { page( _preTreatmentDisposablesStack )}} onInstallationChanged : { if ( vinstallation ) { console.debug("vinstallation ")}}