Index: sources/device/DeviceView.cpp =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r97d593e2e7adb36f2f9f97f9bb9958dcef740bc1 --- sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 97d593e2e7adb36f2f9f97f9bb9958dcef740bc1) @@ -21,31 +21,16 @@ #include "GuiController.h" #include "GuiGlobals.h" - -// // defines -// #define CONNECT_GUI( vATTRIBUTE ) -// connect(_GuiController , SIGNAL( didAttributeRespond(Device##vATTRIBUTE##RespondData)), -// this , SLOT( onAttributeRespond(Device##vATTRIBUTE##RespondData))); -// connect(this , SIGNAL( didAttributeRequest(Device##vATTRIBUTE##RequestData)), -// _GuiController , SLOT( doAttributeRespond(Device##vATTRIBUTE##RequestData))); -// - VIEW_DEF_CLASS(VDevice) void VDevice::initConnections() { - // to convert the value to the model and emit the signal to go to the controller (Qml -> View) - connect(this , SIGNAL(didAttributeRequest(const DeviceBrightnessRequestData &)), - &_GuiController , SLOT( doAttributeRequest(const DeviceBrightnessRequestData &))); - - // View <- Gui - connect(&_GuiController , SIGNAL(didAttributeResponse(const DeviceBrightnessResponseData &)), - this , SLOT( onAttributeResponse(const DeviceBrightnessResponseData &))); + DEVICE_VIEW_INIT_CONNECTIONS_LIST } // developer implementation section void VDevice::brightnessRequest(const quint8 &vValue) { - qDebug() << "HERE Request" << vValue; + // DEBUG : qDebug() << "HERE Request" << vValue; DeviceBrightnessRequestData data; data.mBrightnessPercent = vValue; emit didAttributeRequest(data); @@ -65,10 +50,16 @@ * */ void VDevice::onAttributeResponse(const DeviceBrightnessResponseData &vData) { - qDebug() << "HERE Response" << vData.mBrightnessPercent; + // DEBUG : qDebug() << "HERE Response" << vData.mBrightnessPercent; if ( vData.mAccepted ) { - _brightness_(vData.mBrightnessPercent); + brightness(vData.mBrightnessPercent); + status(""); } + else { + // this has to be called to let Gui to set to old value that device controller provided. + emit brightnessChanged(vData.mBrightnessPercent); + status(vData.mMessage); + } accepted(vData.mAccepted); reason (vData.mReason );