Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp =================================================================== diff -u -r8172c6aa4187be26aa9c0e73a130bc6183ad10dd -rbbb970aff112f09c189986f026055bec794afbd6 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 8172c6aa4187be26aa9c0e73a130bc6183ad10dd) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision bbb970aff112f09c189986f026055bec794afbd6) @@ -114,8 +114,20 @@ ENUM_READ ( GuiTreatmentStates, TREATMENT_START_STATE , txStart ); // Treatment states - Dialysis - ENUM_READ ( GuiTreatmentStates, TREATMENT_DIALYSIS_STATE , txDialysis ); + bool mDialysis = vData.mSubMode == GuiTreatmentStates ::TREATMENT_DIALYSIS_STATE ; + if ( mDialysis ) { + ENUM_CHECK_O( GuiDialysisState, vData.mDialysisState ) { + ENUM_CHECK ( GuiDialysisState, DIALYSIS_START_STATE ) + ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_STATE ) + ENUM_CHECK ( GuiDialysisState, DIALYSIS_SALINE_BOLUS_STATE ) + ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES ) } + ENUM_READ ( GuiDialysisState, DIALYSIS_START_STATE , dyStart ); + ENUM_READ ( GuiDialysisState, DIALYSIS_UF_STATE , dyUltrafiltration ); + ENUM_READ ( GuiDialysisState, DIALYSIS_SALINE_BOLUS_STATE , dySalineBolus ); + } + txDialysis ( mDialysis ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to. + // TODO : Check with Qt.5.15.10 // NOTE : For Rinseback and Recirculate // 1 - it seems we may never need the txRinseback @@ -145,7 +157,7 @@ ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_STATE , rbStop ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE , rbAdditional ); } - txRinseback ( mRinseback ); // it's the main rinseback even so moved last to have all the sub-rinseback-states updated prior to. + txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to. // Recirculate states bool mRecirculate = vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_STATE ;