Index: sources/view/vtreatmentadjustmentsresponse.cpp =================================================================== diff -u -r5c5fa01738826261e0b3647db6b7b3fc26b04251 -r95c671ab7037af055db551456a719ff67bf10262 --- sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision 5c5fa01738826261e0b3647db6b7b3fc26b04251) +++ sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision 95c671ab7037af055db551456a719ff67bf10262) @@ -21,30 +21,7 @@ VIEW_DEF_CONNECTION_ADJUSTMENTS } -void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustBloodDialysateResponseData &vData) -{ - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - bloodFlow_FlowSetPoint ( vData.mBloodRate ); - dialysateFlow_FlowSetPoint ( vData.mDialydateReate ); - // *** 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_Flow_Triggered( true ); -} - -void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustDurationResponseData &vData) -{ - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - duration ( vData.mDuration ); - UFVolume ( vData.mUFVolume ); - - // *** 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_Duration_Triggered( true ); -} - /*! * \brief VTreatmentAdjustmentsResponse::reasonText * \details this code is the place holder for the alarms description mapping @@ -70,3 +47,27 @@ text = reasonText(static_cast(_adjustment_Reason)); return text; } + +void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustBloodDialysateResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + bloodFlow_FlowSetPoint ( vData.mBloodRate ); + dialysateFlow_FlowSetPoint ( vData.mDialydateReate ); + + // *** 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. *** + adjustmentFlow ( true ); +} + +void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustDurationResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + duration ( vData.mDuration ); + ultrafiltration ( vData.mUFVolume ); + + // *** 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. *** + adjustmentDuration ( true ); +}