Index: sources/view/vtreatmentultrafiltrationconfirm.cpp =================================================================== diff -u -r524fee2471717bf627eae41c6a599c9b5f4fbe55 -r6616f7b9b88efffa42ab605833d296afb76d3cb1 --- sources/view/vtreatmentultrafiltrationconfirm.cpp (.../vtreatmentultrafiltrationconfirm.cpp) (revision 524fee2471717bf627eae41c6a599c9b5f4fbe55) +++ sources/view/vtreatmentultrafiltrationconfirm.cpp (.../vtreatmentultrafiltrationconfirm.cpp) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) @@ -20,26 +20,26 @@ void VTreatmentUltrafiltrationConfirm::initConnections() { - //ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustUltrafiltrationConfirmResponseData); + ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController,AdjustUltrafiltrationConfirmResponseData); connect(this , SIGNAL(didAdjustment(const AdjustUltrafiltrationConfirmRequestData &)), &_GuiController, SLOT( doAdjustment(const AdjustUltrafiltrationConfirmRequestData &))); } -//void VTreatmentUltrafiltrationConfirm::onActionReceive(const AdjustUltrafiltrationConfirmResponseData &vData) -//{ -// adjustment_Accepted ( vData.mAccepted ); -// if (adjustment_Accepted()) { -// // the response doesn't have the state so the requested state which has been accepted is used. -// optionRate ( _data.requestedState == AdjustUltrafiltrationConfirmRequestData::eRate ); -// optionDuration ( _data.requestedState == AdjustUltrafiltrationConfirmRequestData::eDuration ); -// } -// -// // *** has to be the last to let the information to be set and then emit the signal *** -// // *** otherwise will use the previous values before being set. *** -// adjustment ( true ); -//} +void VTreatmentUltrafiltrationConfirm::onActionReceive(const AdjustUltrafiltrationConfirmResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + volume ( vData.mVolume / 1000 ); // mL => L + duration ( vData.mDuration ); + rate ( vData.mRate ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustment ( true ); +} + void View::VTreatmentUltrafiltrationConfirm::doOptionRate(float vVolume) { _data.volume = vVolume;