Index: sources/gui/GuiGlobals.h =================================================================== diff -u -re68c1cc0f53b3c03943af4b70c46b5954603b53a -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e68c1cc0f53b3c03943af4b70c46b5954603b53a) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) @@ -457,7 +457,7 @@ // Pre-Treatment Self Test Dry Q_ENUM(TD_Pre_Treatment_Dry_Self_Tests_States) // Pre-Treatment Prime - Q_ENUM(TD_Pre_Treatment_Prime_States) + Q_ENUM(TD_Prime_States) // Pre-Treatment Recirculate Q_ENUM(TD_Pre_Treatment_Recirc_States) // Post-Treatment SubMode @@ -537,7 +537,7 @@ // Pre-Treatment Self Test Dry typedef GuiActions::TD_Pre_Treatment_Dry_Self_Tests_States GuiPreTreatmentSelfTestDryStates; // Pre-Treatment Prime - typedef GuiActions::TD_Pre_Treatment_Prime_States GuiPreTreatmentPrimeStates; + typedef GuiActions::TD_Prime_States GuiPreTreatmentPrimeStates; // Pre-Treatment Recirculate typedef GuiActions::TD_Pre_Treatment_Recirc_States GuiPreTreatmentRecirculateStates; Index: sources/gui/qml/compounds/CheckListView.qml =================================================================== diff -u -ra7aab61ca63538c37b6931c60252680fc2ec2416 -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 --- sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) +++ sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) @@ -53,73 +53,40 @@ function setWait (vModel) { vModel.stepStart = true ; vModel.stepDone = false } function setDone (vModel) { vModel.stepStart = true ; vModel.stepDone = true } - function setItemExt (vIndex, vEntered) { - let goBak = pIndex > vIndex - let goTop = pIndex < vIndex - // if ( pIndex === vIndex && !vEntered ) return + function setItemExt(vIndex, vEntered) { + // Direction: + // 1 = forward + // -1 = backward + // 0 = same item + const direction = Math.sign(vIndex - pIndex) // returns sign of nuymber - for ( let i = 0; i < _listView.count; i++ ) { - let model = _listView.itemAt(i) - //DEBUG console.log(i, pIndex, vEntered?"I":"O", vIndex/*, goBak?"B":" ", goTop?"T":" "*/) - if ( i < vIndex ) { - if ( goTop ) { - // Do nothing - } - else { - // setDone(model) - } + for (let i = 0; i < _listView.count; ++i) { + const model = _listView.itemAt(i) + + if (i < vIndex) { + // Items before the current one. + if (direction > 0) + setDone(model) // Completed while moving forward. + else if (direction < 0) + setClear(model) // Reset while moving backward. } - if ( i > vIndex ) { - setClear(model) + else if (i === vIndex) { + // Current item. + if (vEntered) + setWait(model) // Entered current item. + else if (direction === 0) + setDone(model) // Finished current item. + else + setClear(model) // Leaving for another item. + } - if ( i === vIndex ) { - if ( vEntered ) { - setWait(model) - } - else { - if ( goTop ) { - setClear(model) - } - else { - if ( goBak ) { - setClear(model) - } - else { - setDone(model) - } - } - } - } - } - pIndex = vIndex - //DEBUG console.log("-----") - } - //DEBUG Test function for investigation - function setItemExt2 (vIndex, vValue, vMode) { - for ( let i = 0; i < _listView.count; i++ ) { - let model = _listView.itemAt(i) - if ( i < vIndex ) { - setDone(model) - continue - } - if ( i > vIndex ) { + else { + // Items after the current one are always reset. setClear(model) - continue } - - if ( vMode === 0 ) // enter - setWait(model) - if ( vMode === 1 ) // in Progress - setWait(model) - if ( vMode === 2 ) // exit - setDone(model) - if ( vMode === 9 ){// depending on value - if ( vValue ) setWait(model) - else setDone(model) - } - } + pIndex = vIndex } width : _root.delegateWidth Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rfe26c932a53276a569d98cfcfbfc48b8a73af921 -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision fe26c932a53276a569d98cfcfbfc48b8a73af921) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) @@ -102,7 +102,7 @@ readonly property int circleNormalDiameter : 418 readonly property int progressCircleDiameterNormal : circleNormalDiameter - readonly property int progressCircleDiameterSmall : 250 + readonly property int progressCircleDiameterSmall : 200 readonly property int opacityAnimationDuration : 1200 readonly property int sliderTextMargin : 20 @@ -111,8 +111,8 @@ readonly property int notificationHeight : 80 //// ----- @LEAHIZED readonly property int notificationIconDiameter : 36 - readonly property int checkListViewItemWidth : 400 - readonly property int checkListViewItemHeight : 60 + readonly property int checkListViewItemWidth : 500 + readonly property int checkListViewItemHeight : 75 readonly property int pauseIconDiameter : 60 readonly property int arrowIconDiameter : 35 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 )} } } Index: sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp =================================================================== diff -u -re68c1cc0f53b3c03943af4b70c46b5954603b53a -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 --- sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp (.../VPreTreatmentDisposablesPrimeData.cpp) (revision e68c1cc0f53b3c03943af4b70c46b5954603b53a) +++ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp (.../VPreTreatmentDisposablesPrimeData.cpp) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) @@ -1,4 +1,4 @@ -/*! +/*! * * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright @@ -36,43 +36,17 @@ pauseCountDown (vData.mPauseCountdown ); elapsed (vData.mTotalDuration - vData.mCountDown ); - // Prime States -// ENUM_CHECK_O( GuiPreTreatmentPrimeStates, vData.mPrimeState ) { -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_START_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_REVERSE_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_AIR_TRAP_LOWER_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_DIALYZER_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_FILL_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE1 ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE2 ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE3 ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_WAIT_FOR_DIALYSATE_READY_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_DC_INITIAL_DIALYSATE_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_DC_DEPRESSURIZE_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC2_PAUSE_TO_ROTATE_OPP_DIR_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC2_REVERSE_RECIRC_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_PAUSE_STATE ) -// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE ) -// ENUM_CHECK_C( GuiPreTreatmentPrimeStates, NUM_OF_PRIME_STATES ) } + 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 && + vData.mPrimeState < GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_REVERSE_STATE , primeBloodCircuitStart ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE3 , primeBloodCircuitEnd ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_DC_INITIAL_DIALYSATE_STATE , primeDialysateCircuitStart ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE , primeDialysateCircuitEnd ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE , primeDialysatePurgeStart ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE , primeDialysatePurgeEnd ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE , primePrimingFluidDiscardStart ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE , primePrimingFluidDiscardEnd ); -// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE , primeComplete ); + primeDialysatePurge ( vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE && + vData.mPrimeState < GuiPreTreatmentPrimeStates::PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE ); -// emit state(vData.mPrimeState); + primePrimingFluidDiscard( vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE && + vData.mPrimeState < GuiPreTreatmentPrimeStates::PRIME_COMPLETE_STATE ); - - -// primeBloodCircuit(vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_START_STATE && -// vData.mPrimeState <= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_DIALYSATE_READY_STATE ); + primeComplete ( vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_COMPLETE_STATE ); } Index: sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h =================================================================== diff -u -rd62949c62c5512952e86a427285ef0dc72344248 -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 --- sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision d62949c62c5512952e86a427285ef0dc72344248) +++ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) @@ -42,21 +42,20 @@ PROPERTY( quint32 , pauseCountDown , 0) PROPERTY( quint32 , elapsed , 0) - PROPERTY ( bool , primeBloodCircuitStart , false) - PROPERTY ( bool , primeBloodCircuitEnd , false) - PROPERTY ( bool , primeDialysateCircuitStart , false) - PROPERTY ( bool , primeDialysateCircuitEnd , false) - PROPERTY ( bool , primeDialysatePurgeStart , false) - PROPERTY ( bool , primeDialysatePurgeEnd , false) - PROPERTY ( bool , primePrimingFluidDiscardStart , false) - PROPERTY ( bool , primePrimingFluidDiscardEnd , false) - PROPERTY ( bool , primeComplete , false) +// PROPERTY ( bool , primeBloodCircuitStart , false) +// PROPERTY ( bool , primeBloodCircuitEnd , false) +// PROPERTY ( bool , primeDialysateCircuitStart , false) +// PROPERTY ( bool , primeDialysateCircuitEnd , false) +// PROPERTY ( bool , primeDialysatePurgeStart , false) +// PROPERTY ( bool , primeDialysatePurgeEnd , false) +// PROPERTY ( bool , primePrimingFluidDiscardStart , false) +// PROPERTY ( bool , primePrimingFluidDiscardEnd , false) - PROPERTY ( bool , primeBloodCircuit , false) -// PROPERTY ( bool , primeDialysateCircuit\ , false) -// PROPERTY ( bool , primeDialysatePurge , false) -// PROPERTY ( bool , primePrimingFluidDiscard , false) + PROPERTY ( bool , primeDialysateCircuit , false) + PROPERTY ( bool , primeDialysatePurge , false) + PROPERTY ( bool , primePrimingFluidDiscard , false) + PROPERTY ( bool , primeComplete , false) VIEW_DEC(VPreTreatmentDisposablesPrime, PreTreatmentDisposablesPrimeData) };