Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -rb9d5efd980be633f5d0bd92cc76295f3a0669db4 -rb18b4c06d80bdd767590e679e30d98ac8b59ede7 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision b9d5efd980be633f5d0bd92cc76295f3a0669db4) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision b18b4c06d80bdd767590e679e30d98ac8b59ede7) @@ -107,21 +107,21 @@ } Connections { target: vPreTreatmentStates - function onSelfTestDryChanged ( vValue ) { page( _preTreatmentDrySelfTest , vValue )} - function onSelfTestDry_startChanged ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(0, true )} - function onSelfTestDry_waitDoorCloseChanged ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(0, vValue )} - function onSelfTestDry_usedCartridgeEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(1, true )} - function onSelfTestDry_cartridgeLoadedEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(1, vValue )} - function onSelfTestDry_pressureSensorsNormalSetupEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(2, true )} + function onSelfTestDryChanged ( vValue ) { page( _preTreatmentDrySelfTest , vValue )} + function onSelfTestDry_startChanged ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(0, true )} + function onSelfTestDry_waitDoorCloseChanged ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(0, vValue )} + function onSelfTestDry_usedCartridgeEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(1, true )} + function onSelfTestDry_cartridgeLoadedEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(1, vValue )} + function onSelfTestDry_pressureSensorsNormalSetupEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(2, true )} function onSelfTestDry_pressureSensorsVenousSetupEntered ( vValue ) {} function onSelfTestDry_pressureSensorsVenousEntered ( vValue ) {} function onSelfTestDry_pressureSensorsArterialSetupEntered ( vValue ) {} function onSelfTestDry_pressureSensorsArterialEntered ( vValue ) {} function onSelfTestDry_pressureSensorsDecayEntered ( vValue ) {} function onSelfTestDry_pressureSensorsStabilityEntered ( vValue ) {} - function onSelfTestDry_pressureSensorsNormalEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(2, vValue )} - function onSelfTestDry_syringePumpEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(3, vValue )} - function onSelfTestDry_syringePumpOcclusionDetectionEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItem(4, vValue )} + function onSelfTestDry_pressureSensorsNormalEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(2, vValue )} + function onSelfTestDry_syringePumpEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(3, vValue )} + function onSelfTestDry_syringePumpOcclusionDetectionEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(4, vValue )} function onSelfTestDry_stoppedEntered ( vValue ) {} function onSelfTestDry_completeEntered ( vValue ) {} } @@ -157,9 +157,9 @@ // - the only misbehavior is if the FW changes the FW state in the middle (in one of in-states), // since UI budles the FW states, it assumes it is done and checks the state which may not be ideal. // as an example if during the Dyalysate FW changes th state to the pause, UI may not show the Dialysaate done (probably!). - function onPrime__BloodCircuitEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt(0, vValue )} - function onPrime__DialysateCircuitEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt(1, vValue )} - function onPrime__WetSelfTestsEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt(2, vValue )} + function onPrime__BloodCircuitEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt2(0, vValue )} + function onPrime__DialysateCircuitEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt2(1, vValue )} + function onPrime__WetSelfTestsEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt2(2, vValue )} } Connections { target: vPreTreatmentAdjustmentDisposablesPrime