Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) @@ -61,12 +61,6 @@ salineState ( vData.mSalineState ); // Ultrafiltration states - ENUM_CHECK_O( GuiUFStates, vData.mUFState ) { - ENUM_CHECK ( GuiUFStates, UF_PAUSED_STATE ) - ENUM_CHECK ( GuiUFStates, UF_RUNNING_STATE ) - ENUM_CHECK_C( GuiUFStates, NUM_OF_UF_STATES ) } - ENUM_READ ( GuiUFStates, UF_PAUSED_STATE , ufPaused ); - ENUM_READ ( GuiUFStates, UF_RUNNING_STATE, ufRunning ); // Saline Bolus states ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) { @@ -101,29 +95,30 @@ emit heparinChanged(_heparin); // Treatment states - ENUM_CHECK_O( GuiTreatmentStates, vData.mSubMode ) { - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_START_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_BLOOD_PRIME_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_DIALYSIS_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_STOP_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_RINSEBACK_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_RECIRC_STATE ) - ENUM_CHECK ( GuiTreatmentStates, TREATMENT_END_STATE ) - ENUM_CHECK_C( GuiTreatmentStates, NUM_OF_TREATMENT_STATES ) } + ENUM_CHECK_O( GuiTreatmentStates, vData.mSubMode ) { + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_START_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_BLOOD_PRIME_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_DIALYSIS_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_PAUSED_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_RINSEBACK_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_RECIRC_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_END_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_ISO_UF_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_SALINE_BOLUS_STATE ) + ENUM_CHECK ( GuiTreatmentStates, TREATMENT_DIALYSATE_PAUSED_STATE ) + ENUM_CHECK_C( GuiTreatmentStates, NUM_OF_TREATMENT_STATES ) } // Treatment states - Basics ENUM_READ ( GuiTreatmentStates, TREATMENT_START_STATE , txStart ); // Treatment states - Dialysis 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 ( GuiDialysisState, DIALYSIS_UF_PAUSED_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 ); + ENUM_READ ( GuiDialysisState, DIALYSIS_UF_PAUSED_STATE , dySalineBolus ); } txDialysis ( mDialysis ); // it's the main dialysis event so moved last to have all the sub-dialysis-states updated prior to. @@ -142,7 +137,7 @@ // Treatment states - Rinse back // Rinseback states - bool mRinseback = vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_STATE ; + bool mRinseback = vData.mSubMode == GuiTreatmentStates ::TREATMENT_RINSEBACK_STATE ; if ( mRinseback ) { ENUM_CHECK_O( GuiRinsebackStates, vData.mRinsebackState ) { ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE ) @@ -162,7 +157,7 @@ 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 ; + bool mRecirculate = vData.mSubMode == GuiTreatmentStates ::TREATMENT_RECIRC_STATE ; if ( mRecirculate ) { ENUM_CHECK_O( GuiRecirculateStates, vData.mRecirculateState ) { ENUM_CHECK ( GuiRecirculateStates, TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE ) @@ -178,7 +173,7 @@ txRecirculate ( mRecirculate ); // it's the main recirculate even so moved last to have all the sub-recirculate-states updated prior to. // Blood Prime states - bool mBloodPrime = vData.mSubMode == GuiTreatmentStates ::TREATMENT_BLOOD_PRIME_STATE ; + bool mBloodPrime = vData.mSubMode == GuiTreatmentStates ::TREATMENT_BLOOD_PRIME_STATE ; if ( mBloodPrime ) { ENUM_CHECK_O( GuiBloodPrimeStates, vData.mBloodPrimeState ) { ENUM_CHECK ( GuiBloodPrimeStates, BLOOD_PRIME_RAMP_STATE ) @@ -188,7 +183,7 @@ txBloodPrime ( mBloodPrime ); // Treatment End states - bool mTreatmentEnd = vData.mSubMode == GuiTreatmentStates ::TREATMENT_END_STATE ; + bool mTreatmentEnd = vData.mSubMode == GuiTreatmentStates ::TREATMENT_END_STATE ; if ( mTreatmentEnd ) { ENUM_CHECK_O( GuiTreatmentEndStates, vData.mTreatmentEndState ) { ENUM_CHECK ( GuiTreatmentEndStates, TREATMENT_END_WAIT_FOR_RINSEBACK_STATE ) @@ -200,20 +195,20 @@ txEnd ( mTreatmentEnd ); // Treatment Stop states - bool mTreatmentStop = vData.mSubMode == GuiTreatmentStates ::TREATMENT_STOP_STATE ; + bool mTreatmentStop = vData.mSubMode == GuiTreatmentStates ::TREATMENT_PAUSED_STATE ; if ( mTreatmentStop ) { - ENUM_CHECK_O( GuiTreatmentStopStates , vData.mTreatmentStopState ) { - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_STATE ) - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE ) - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE ) - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_NO_RECIRC_STATE ) - ENUM_CHECK ( GuiTreatmentStopStates , TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE ) - ENUM_CHECK_C( GuiTreatmentStopStates , NUM_OF_TREATMENT_STOP_STATES ) } - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_STATE , tsRecirculate ) - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE, tsRecirculateDialysate ) - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE , tsRecirculateBlood ) - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_NO_RECIRC_STATE , tsRecirculateNo ) - ENUM_READ ( GuiTreatmentStopStates , TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE , tsRecoverBloodDetect ) + ENUM_CHECK_O( GuiTreatmentPausedStates, vData.mTreatmentStopState ) { + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_NO_RECIRC_STATE ) + ENUM_CHECK ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE ) + ENUM_CHECK_C( GuiTreatmentPausedStates, NUM_OF_TREATMENT_PAUSED_STATES ) } + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_STATE , tsRecirculate ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_DIALYSATE_ONLY_STATE, tsRecirculateDialysate ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECIRC_BLOOD_ONLY_STATE , tsRecirculateBlood ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_NO_RECIRC_STATE , tsRecirculateNo ) + ENUM_READ ( GuiTreatmentPausedStates, TREATMENT_PAUSED_RECOVER_BLOOD_DETECT_STATE , tsRecoverBloodDetect ) } txStop ( mTreatmentStop ); @@ -225,13 +220,7 @@ * \details message handler for the message AdjustUltrafiltrationStateResponse data * \param vData - AdjustUltrafiltrationStateResponse data */ -void VHDTreatmentStates::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData) +void VHDTreatmentStates::onActionReceive(const AdjustUltrafiltrationStateResponseData &) { // Ultrafiltration states - ENUM_CHECK_O( GuiUFStates, vData.mUFState ) { - ENUM_CHECK ( GuiUFStates, UF_PAUSED_STATE ) - ENUM_CHECK ( GuiUFStates, UF_RUNNING_STATE ) - ENUM_CHECK_C( GuiUFStates, NUM_OF_UF_STATES ) } - ENUM_READ ( GuiUFStates, UF_PAUSED_STATE , ufPaused ); - ENUM_READ ( GuiUFStates, UF_RUNNING_STATE, ufRunning ); }