Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml =================================================================== diff -u -rd62949c62c5512952e86a427285ef0dc72344248 -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision d62949c62c5512952e86a427285ef0dc72344248) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) @@ -33,11 +33,10 @@ BloodTubeCircuit = 0, DialysateCircuit = 1, DialysatePurge = 2, - PrimingFluidDiscard = 3, - Complete = 4 + PrimingFluidDiscard = 3 } - isComplete : vPreTreatmentDisposablesPrime.primeComplete // PRIME_COMPLETE_STATE + isComplete : vPreTreatmentDisposablesPrime.primeComplete completeText : qsTr("Priming Complete!") // time circle @@ -58,30 +57,10 @@ onVisibleChanged: if (visible) checkList.resetItems() - Item { - anchors.top: parent.top - anchors.left: parent.left - width: 40 - height: 40 - Text { - color: Colors.offWhite - text: vPreTreatmentDisposablesPrime.state - anchors.centerIn: parent - } - } - Connections { target: vPreTreatmentDisposablesPrime - function onPrimeBloodCircuitChanged ( vValue ) { print("onPrimeBloodCircuitChanged " + vValue) - checkList.setItemExt(PreTreatmentPrime.BloodTubeCircuit , vValue ) - } - - function onPrimeBloodCircuitStartChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.BloodTubeCircuit , true )} - function onPrimeBloodCircuitEndChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.BloodTubeCircuit , vValue )} - function onPrimeDialysateCircuitStartChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysateCircuit , true )} - function onPrimeDialysateCircuitEndChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysateCircuit , vValue )} - function onPrimeDialysatePurgeStartChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysatePurge , true )} - function onPrimeDialysatePurgeEndChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysatePurge , vValue )} - function onPrimePrimingFluidDiscardStartChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.PrimingFluidDiscard , vValue )} - function onPrimePrimingFluidDiscardEndChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.Complete , vValue )} + function onPrimeBloodCircuitChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.BloodTubeCircuit , vValue )} + function onPrimeDialysateCircuitChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysateCircuit , vValue )} + function onPrimeDialysatePurgeChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysatePurge , vValue )} + function onPrimePrimingFluidDiscardChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.PrimingFluidDiscard , vValue )} } }