Index: sources/view/settings/VRoWaterMode.cpp =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r16aaf5ab7e1c58199754a132d624a470295d3440 --- sources/view/settings/VRoWaterMode.cpp (.../VRoWaterMode.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/view/settings/VRoWaterMode.cpp (.../VRoWaterMode.cpp) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) @@ -12,27 +12,41 @@ void View::VRoWaterMode::initConnections() { ADJUST_VIEW_CONNECTION(RoWaterModeRequestData) ACTION_VIEW_CONNECTION(RoWaterModeResponseData) + ADJUST_VIEW_CONNECTION(AdjustRoWaterModeRequestData) + ACTION_VIEW_CONNECTION(AdjustRoWaterModeResponseData) - connect(&_GuiController, &GuiController::didPOSTPass, this, [=](bool) - { - //POST// - doAdjustment(); - }); } void View::VRoWaterMode::onActionReceive(const RoWaterModeResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - status ( vData.mValue ); + status ( vData.mStatus ); // *** 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::VRoWaterMode::doAdjustment() +void View::VRoWaterMode::doRequest() { RoWaterModeRequestData data; emit didAdjustment(data); } + +void View::VRoWaterMode::onActionReceive(const AdjustRoWaterModeResponseData &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 ); +} + +void View::VRoWaterMode::doAdjustment(int vStatus) +{ + AdjustRoWaterModeRequestData data; + data.mStatus = vStatus; + emit didAdjustment(data); +}