Index: sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp =================================================================== diff -u -rca67f7413160dfba507856222bd9aa95c5fa6200 -rcbfda5b02abeec60eb45b49da4bfbe07283a037f --- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp (.../VPreTreatmentAdjustmentWaterSample.cpp) (revision ca67f7413160dfba507856222bd9aa95c5fa6200) +++ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp (.../VPreTreatmentAdjustmentWaterSample.cpp) (revision cbfda5b02abeec60eb45b49da4bfbe07283a037f) @@ -23,38 +23,26 @@ \details All the class signal/slot connections are defined here. */ void View::VPreTreatmentAdjustmentWaterSample::initConnections() { -// ADJUST_VIEW_CONNECTION(AdjustWaterSampleRequestData ); - ADJUST_VIEW_CONNECTION(AdjustWaterSampleResultRequestData ); -// ACTION_VIEW_CONNECTION(AdjustWaterSampleResponseData ); + ADJUST_VIEW_CONNECTION(AdjustWaterSampleResultRequestData ); + ACTION_VIEW_CONNECTION(AdjustWaterSampleResultResponseData ); } -///*! -// * \brief VPreTreatmentAdjustmentWaterSample::onActionReceive -// * \details received response model data handler -// * \param vData - model data -// */ -//void View::VPreTreatmentAdjustmentWaterSample::onActionReceive(const AdjustWaterSampleResponseData &vData) -//{ -// adjustment_Accepted ( vData.mAccepted ); -// adjustment_Reason ( vData.mReason ); +/*! + * \brief VPreTreatmentAdjustmentWaterSample::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentWaterSample::onActionReceive(const AdjustWaterSampleResultResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); -// // *** 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 ); -//} + resultValue (vData.mValue ); -///*! -// * \brief View::VPreTreatmentAdjustmentWaterSample::doSample -// * \details requests to start or stop the water sample -// * \param vStart - the boolean value to indicate the request. -// */ -//void View::VPreTreatmentAdjustmentWaterSample::doSample(bool vStart) { -// AdjustWaterSampleRequestData data; -// data.requestedState = vStart ? -// AdjustWaterSampleRequestData::eStart: -// AdjustWaterSampleRequestData::eStop ; -// emit didAdjustment(data); -//} + // *** 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 ); +} /*! * \brief View::VPreTreatmentAdjustmentWaterSample::doResult