Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml =================================================================== diff -u -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 -r3ae0250875fbc566e161cb7865371ae91323d1c9 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 3ae0250875fbc566e161cb7865371ae91323d1c9) @@ -31,9 +31,10 @@ enum Prime { BloodTubeCircuit = 0, - DialysateCircuit = 1, - DialysatePurge = 2, - PrimingFluidDiscard = 3 + WaitForDialysate = 1, + DialysateCircuit = 2, + DialysatePurge = 3, + PrimingFluidDiscard = 4 } isComplete : vPreTreatmentDisposablesPrime.primeComplete @@ -50,15 +51,17 @@ hasCheckList : true checkListStepNames : [ qsTr("Blood Tubing Circuit Priming" ), + qsTr("Wait For Dialysate" ), qsTr("Dialysate Circuit Priming" ), - qsTr("Dialysate Purge" ), + qsTr("Dialyzer Purge" ), qsTr("Priming Fluid Discard" ), ] onVisibleChanged: if (visible) checkList.resetItems() Connections { target: vPreTreatmentDisposablesPrime function onPrimeBloodCircuitChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.BloodTubeCircuit , vValue )} + function onPrimeWaitForDialysateChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.WaitForDialysate , 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 )} Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -re68c1cc0f53b3c03943af4b70c46b5954603b53a -r3ae0250875fbc566e161cb7865371ae91323d1c9 --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision e68c1cc0f53b3c03943af4b70c46b5954603b53a) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 3ae0250875fbc566e161cb7865371ae91323d1c9) @@ -245,17 +245,6 @@ function onGoToPreviousStep () { setPage ( _pretreatmentConcentrates )} } - // priming - TODO check if needed. may not need -// Connections { target: vPreTreatmentAdjustmentDisposablesPrime -// function onAdjustmentTriggered ( vValue ) { -// if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) { -// _pretreatmentPrime.reasonText = "" -// } else { -// _pretreatmentPrime.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text() -// } -// } -// } - // creat rx Connections{ target: vTreatmentCreate function onDidValidationPass ( ) { Index: sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp =================================================================== diff -u -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 -r3ae0250875fbc566e161cb7865371ae91323d1c9 --- sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp (.../VPreTreatmentDisposablesPrimeData.cpp) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) +++ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp (.../VPreTreatmentDisposablesPrimeData.cpp) (revision 3ae0250875fbc566e161cb7865371ae91323d1c9) @@ -39,7 +39,10 @@ primeBloodCircuit ( vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_BC_INITIAL_REVERSE_STATE && vData.mPrimeState < GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_DIALYSATE_READY_STATE ); - primeDialysateCircuit ( vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_DIALYSATE_READY_STATE && + primeWaitForDialysate ( vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_DIALYSATE_READY_STATE && + vData.mPrimeState < GuiPreTreatmentPrimeStates::PRIME_DC_INITIAL_DIALYSATE_STATE ); + + primeDialysateCircuit ( vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_DC_INITIAL_DIALYSATE_STATE && vData.mPrimeState < GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE ); primeDialysatePurge ( vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE && Index: sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h =================================================================== diff -u -re21325dc5cd8cce229eb129d4acbce5642ba3f57 -r3ae0250875fbc566e161cb7865371ae91323d1c9 --- sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision e21325dc5cd8cce229eb129d4acbce5642ba3f57) +++ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision 3ae0250875fbc566e161cb7865371ae91323d1c9) @@ -43,6 +43,7 @@ PROPERTY( quint32 , elapsed , 0) PROPERTY ( bool , primeBloodCircuit , false) + PROPERTY ( bool , primeWaitForDialysate , false) PROPERTY ( bool , primeDialysateCircuit , false) PROPERTY ( bool , primeDialysatePurge , false) PROPERTY ( bool , primePrimingFluidDiscard , false)