Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 -r8eee2f9b4de52348bdb7816bfefa9956f1042d94 --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 8eee2f9b4de52348bdb7816bfefa9956f1042d94) @@ -62,21 +62,14 @@ // Isolated Ultrafiltration states bool mIsoUf = vData.mSubMode == GuiTreatmentStates ::TREATMENT_ISO_UF_STATE ; - /// *********** UPDATE FOR REAL STATES ******************** - isoUfRunning(_isoUfState==0); - isoUfPaused (_isoUfState==1); - ///****************** END UPDATE FOR REAL STATES ********* - -// if ( mIsoUf ) { -// ENUM_CHECK_O( GuiDialysisState, vData.mIsolatedUFState ) { -// ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_STATE ) -// ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE ) -// ENUM_CHECK ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE ) -// ENUM_CHECK_C( GuiDialysisState, NUM_OF_DIALYSIS_STATES ) } -// ENUM_READ ( GuiDialysisState, DIALYSIS_UF_STATE , dyUltrafiltration ); -// ENUM_READ ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE , dyUltrafiltrationPaused ); -// ENUM_READ ( GuiDialysisState, DIALYSIS_UF_FLUID_BOLUS_STATE , dyFluidBolus ); -// } + if ( mIsoUf ) { + ENUM_CHECK_O( GuiIsoUfState, vData.mIsolatedUFState ) { + ENUM_CHECK ( GuiIsoUfState, ISOLATED_UF_RUNNINGS_STATE ) + ENUM_CHECK ( GuiIsoUfState, ISOLATED_UF_PAUSED_STATE ) + ENUM_CHECK_C( GuiIsoUfState, NUM_OF_ISOLATED_UF_STATES ) } + ENUM_READ ( GuiIsoUfState, ISOLATED_UF_RUNNINGS_STATE , isoUfRunning ); + ENUM_READ ( GuiIsoUfState, ISOLATED_UF_PAUSED_STATE , isoUfPaused ); + } txIsolatedUF ( mIsoUf ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to.