Index: sources/view/vtreatmentultrafiltrationstate.cpp =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -16,21 +16,22 @@ // Project #include "guicontroller.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentUltrafiltrationState, TreatmentUltrafiltrationStateData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) void VTreatmentUltrafiltrationState::initConnections() { - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, TreatmentUltrafiltrationStateData); + ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustUltrafiltrationStateResponseData); - connect(this , SIGNAL(didUltrafiltrationStateRequest(quint32)), - &_GuiController, SLOT( doUltrafiltrationStateRequest(quint32))); + connect(this , SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), + &_GuiController, SLOT( doAdjustment(const AdjustUltrafiltrationStateRequestData &))); } -void VTreatmentUltrafiltrationState::onActionReceive(const TreatmentUltrafiltrationStateData &vData) +void VTreatmentUltrafiltrationState::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); + adjustment_Accepted ( vData.mAccepted ); if (adjustment_Accepted()) { - isPaused ( _requestedState == GuiActionData::Pause); + // the response doesn't have the state so the requested state which has been accepted is used. + isPaused ( _data.requestedState == AdjustUltrafiltrationStateRequestData::ePaused ); } // *** has to be the last to let the information to be set and then emit the signal *** @@ -40,14 +41,14 @@ void View::VTreatmentUltrafiltrationState::doPause() { - _requestedState = GuiActionData::Pause; - emit didUltrafiltrationStateRequest(static_cast(_requestedState)); + _data.requestedState = AdjustUltrafiltrationStateRequestData::ePaused; + emit didAdjustment(_data); } void View::VTreatmentUltrafiltrationState::doResume() { - _requestedState = GuiActionData::Resume; - emit didUltrafiltrationStateRequest(static_cast(_requestedState)); + _data.requestedState = AdjustUltrafiltrationStateRequestData::eRunning; + emit didAdjustment(_data); } /*! @@ -58,16 +59,20 @@ */ QString View::VTreatmentUltrafiltrationState::text() { + // if there is a reason (passed) it will be used QString mText = VTreatmentAdjustmentsResponse::text(); if (! mText.isEmpty()) return mText; + // otherwise a general message will be created/passed. if (! adjustment_Accepted()) { - switch (_requestedState) { - case GuiActionData::Resume: + switch (_data.requestedState) { + case AdjustUltrafiltrationStateRequestData::eRunning: mText = tr("Unable to Resume Ultrafiltration or already running"); break; - case GuiActionData::Pause: + + case AdjustUltrafiltrationStateRequestData::ePaused: mText = tr("Unable to Pause Ultrafiltration or already paused"); break; + default: break; }