Index: sources/gui/qml/compounds/CheckListView.qml =================================================================== diff -u -rca43b0285ec853d03be20103c6e0e0d9af86fd0a -rb008b560dd9891bc3ef8545f148fc4cccb835e82 --- sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision ca43b0285ec853d03be20103c6e0e0d9af86fd0a) +++ sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision b008b560dd9891bc3ef8545f148fc4cccb835e82) @@ -59,7 +59,7 @@ for ( let i = 0; i < _listView.count; i++ ) { let model = _listView.itemAt(i) - console.log(i, pIndex, vEntered?"I":"O", vIndex/*, goBak?"B":" ", goTop?"T":" "*/) + //DEBUG console.log(i, pIndex, vEntered?"I":"O", vIndex/*, goBak?"B":" ", goTop?"T":" "*/) if ( i < vIndex ) { if ( goTop ) { // Do nothing @@ -91,7 +91,7 @@ } } pIndex = vIndex - console.log("-----") + //DEBUG console.log("-----") } //DEBUG Test function for investigation function setItemExt2 (vIndex, vValue, vMode) { Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -rca43b0285ec853d03be20103c6e0e0d9af86fd0a -rb008b560dd9891bc3ef8545f148fc4cccb835e82 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision ca43b0285ec853d03be20103c6e0e0d9af86fd0a) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision b008b560dd9891bc3ef8545f148fc4cccb835e82) @@ -132,7 +132,7 @@ function onPrime_salineSetupEntered ( vValue ) {} function onPrime_salinePurgeAirEntered ( vValue ) {} function onPrime_salineCirculateBloodCircuitEntered ( vValue ) {} - function onPrime_reservoiOneFillCompleteEntered ( vValue ) {} + function onPrime_reservoirOneFillCompleteEntered ( vValue ) {} function onPrime_dialysateDialyzerEntered ( vValue ) {} function onPrime_salineDialyzerSetupEntered ( vValue ) {} function onPrime_salineDialyzerEntered ( vValue ) {} Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -rca43b0285ec853d03be20103c6e0e0d9af86fd0a -rb008b560dd9891bc3ef8545f148fc4cccb835e82 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision ca43b0285ec853d03be20103c6e0e0d9af86fd0a) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision b008b560dd9891bc3ef8545f148fc4cccb835e82) @@ -113,7 +113,7 @@ prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_SETUP_STATE ); prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_PURGE_AIR_STATE ); prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); - prime_reservoiOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); + prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_DIALYSATE_DIALYZER_STATE ); prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_DIALYZER_SETUP_STATE ); prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::HD_PRIME_SALINE_DIALYZER_STATE ); @@ -126,7 +126,7 @@ prime__BloodCircuit ( _prime_salineSetup || _prime_salinePurgeAir || _prime_salineCirculateBloodCircuit); - prime__DialysateCircuit ( _prime_reservoiOneFillComplete || + prime__DialysateCircuit ( _prime_reservoirOneFillComplete || _prime_dialysateDialyzer || _prime_salineDialyzerSetup || _prime_salineDialyzer || Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -rca43b0285ec853d03be20103c6e0e0d9af86fd0a -rb008b560dd9891bc3ef8545f148fc4cccb835e82 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision ca43b0285ec853d03be20103c6e0e0d9af86fd0a) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision b008b560dd9891bc3ef8545f148fc4cccb835e82) @@ -111,7 +111,7 @@ STATE ( bool , prime_salineSetup , false ) ///< HD_PRIME_SALINE_SETUP_STATE , Saline setup state STATE ( bool , prime_salinePurgeAir , false ) ///< HD_PRIME_SALINE_PURGE_AIR_STATE , Saline purge air state STATE ( bool , prime_salineCirculateBloodCircuit , false ) ///< HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE , Circulate blood circuit state - STATE ( bool , prime_reservoiOneFillComplete , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE , Wait for reservoir 1 fill complete + STATE ( bool , prime_reservoirOneFillComplete , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE , Wait for reservoir 1 fill complete STATE ( bool , prime_dialysateDialyzer , false ) ///< HD_PRIME_DIALYSATE_DIALYZER_STATE , Dialysate dialyzer fluid path state STATE ( bool , prime_salineDialyzerSetup , false ) ///< HD_PRIME_SALINE_DIALYZER_SETUP_STATE , Saline dialyzer setup state STATE ( bool , prime_salineDialyzer , false ) ///< HD_PRIME_SALINE_DIALYZER_STATE , Saline dialyzer fluid path state @@ -121,9 +121,9 @@ STATE ( bool , prime_pause , false ) ///< HD_PRIME_PAUSE , Prime pause state, waits to be resumed STATE ( bool , prime_complete , false ) ///< HD_PRIME_COMPLETE , Prime complete state - STATE ( bool , prime__BloodCircuit , false ) - STATE ( bool , prime__DialysateCircuit , false ) - STATE ( bool , prime__WetSelfTests , false ) + STATE ( bool , prime__BloodCircuit , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen. + STATE ( bool , prime__DialysateCircuit , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen. + STATE ( bool , prime__WetSelfTests , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen. // Re-circulate blood and dialysate circuits state