Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 -re0412efcf85964a18ec52ad80f233c45998eb45a --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) @@ -40,9 +40,9 @@ hasTimeCircle : true timeCircleMinimum : 0 - timeCircleMaximum : vDGFilterFlush.total - timeCircleProgressValue : vDGFilterFlush.elapsed - timeCircleTimeTextValue : vDGFilterFlush.remaining * 60 + timeCircleMaximum : vPreTreatmentSelfTestDry.total + timeCircleProgressValue : vPreTreatmentSelfTestDry.elapsed + timeCircleTimeTextValue : vPreTreatmentSelfTestDry.remaining * 60 hasCheckList : true checkListStepNames : [ @@ -62,9 +62,9 @@ hasTimeCircle : true timeCircleMinimum : 0 - timeCircleMaximum : vDGFilterFlush.total - timeCircleProgressValue : vDGFilterFlush.elapsed - timeCircleTimeTextValue : vDGFilterFlush.remaining * 60 + timeCircleMaximum : vPreTreatmentDisposablePrime.total + timeCircleProgressValue : vPreTreatmentDisposablePrime.elapsed + timeCircleTimeTextValue : vPreTreatmentDisposablePrime.remaining * 60 hasCheckList : true checkListStepNames : [ @@ -81,7 +81,7 @@ onSelfTestDry_bubbleDetectorEntered : { _preTreatmentDrySelfTest.checkList.setItem( 0, vselfTestDry_bubbleDetector )} onSelfTestDry_airTrapEntered : { _preTreatmentDrySelfTest.checkList.setItem( 1, vselfTestDry_airTrap )} onSelfTestDry_occlusionSensorsEntered : { _preTreatmentDrySelfTest.checkList.setItem( 2, vselfTestDry_occlusionSensors )} - onSelfTestDry_pressureSensorsSetupEntered : { _preTreatmentDrySelfTest.checkList.setItem( 3, true )} + onSelfTestDry_pressureSensorsSetupEntered : { _preTreatmentDrySelfTest.checkList.setItem( 3, true )} onSelfTestDry_pressureSensorsEntered : {} onSelfTestDry_pressureSensorsNormalEntered : { _preTreatmentDrySelfTest.checkList.setItem( 3, vselfTestDry_pressureSensorsNormal )} onSelfTestDry_stoppedEntered : {} @@ -91,10 +91,10 @@ Connections { target: vPreTreatmentStates onPrimeChanged : { if ( vprime ) { page( _preTreatmentDisposablesPrime )}} onPrime_waitUserStartEntered : {} - onPrime_salineSetupEntered : { _preTreatmentDisposablesPrime.checkList.setItem(0, true)} + onPrime_salineSetupEntered : { _preTreatmentDisposablesPrime.checkList.setItem(0, true )} onPrime_salinePurgeAirEntered : {} onPrime_salineCirculateBloodCircuitEntered : { _preTreatmentDisposablesPrime.checkList.setItem(0, vprime_salineCirculateBloodCircuit )} - onPrime_reservoiOneFillCompleteEntered : { _preTreatmentDisposablesPrime.checkList.setItem(1, true )} + onPrime_reservoiOneFillCompleteEntered : { _preTreatmentDisposablesPrime.checkList.setItem(1, true )} onPrime_dialysateDialyzerEntered : {} onPrime_reservoirTwoFillCompleteEntered : {} onPrime_dialysateBypassEntered : { _preTreatmentDisposablesPrime.checkList.setItem(1, vprime_dialysateBypass )} @@ -109,8 +109,8 @@ Connections { target: _preTreatmentDisposablesPrime onConfirmClicked : {} - onBackClicked : {vTreatmentCreate.doRequestPop() } - //onContinueClicked : {vTreatmentCreate.doFinishedPrime(); } + onBackClicked : { vTreatmentCreate.doRequestPop() } + //onContinueClicked : { vTreatmentCreate.doFinishedPrime() } } onVisibleChanged: {