Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -rb5c4054a8cb175e43928bb0c4b08171e92065c82 -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision b5c4054a8cb175e43928bb0c4b08171e92065c82) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0) @@ -57,11 +57,29 @@ void VTDTreatmentStates::onActionReceive(const TreatmentStatesData &vData) { subMode ( vData.mSubMode ); - ufState ( vData.mIsolatedUFState ); + isoUfState ( vData.mIsolatedUFState ); salineState ( vData.mSalineState ); - // Ultrafiltration states + // 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 ); +// } + txIsolatedUF ( mIsoUf ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to. + + // Saline Bolus states ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) { ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE )