Index: sources/device/DeviceModels.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r97d593e2e7adb36f2f9f97f9bb9958dcef740bc1 --- sources/device/DeviceModels.h (.../DeviceModels.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/device/DeviceModels.h (.../DeviceModels.h) (revision 97d593e2e7adb36f2f9f97f9bb9958dcef740bc1) @@ -42,9 +42,12 @@ * \param vParameters - list of parameter values of the model as a comma separated string. * \return QString */ - static QString toString (const QString &vStringPrefix, const QVariant &vParameters) { - QString senderID = "UI,"; - return QString(senderID + vStringPrefix + "," + vParameters.toStringList().join(',')); + static QString toString (const QString &vStringPrefix, const QVariantList &vParameters) { + QString senderID = MAbstract::unitText(MAbstract::Unit_Enum::eUI) + ","; + QString mString = QString(senderID + vStringPrefix); + for (const auto ¶m : vParameters) + mString += QString(",%1").arg(param.toString()); + return mString; } }; @@ -57,17 +60,16 @@ // friends friend class ::tst_models; - QVariantList parameters() const override; - public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } Unit_Enum unitText () const override { return Unit_Enum::eDV ; } QString infoText () const override { return QString("DeviceBase") ; } struct Data { + // by default it has to be accepted with no rejection reason bool mAccepted = true; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0 ; /*!< Reason value of type quint32 extracted out */ + QString mMessage = "" ; /*!< Message value of type QString of the reason */ }; MDeviceResponseBase () { } @@ -78,28 +80,33 @@ // ------------------------------------------------------------------ -class MDeviceBrightnessResponse : MDeviceResponseBase { -public: - struct Data : MDeviceResponseBase::Data { - quint8 mBrightnessPercent = 0; - } _data; - - QString infoText () const override { return QString("DeviceBrightness") ; } - Data data () const ; -}; - class MDeviceBrightnessRequest : public MDeviceRequestBase { public: + struct Data { quint8 mBrightnessPercent = 100; } _data; + explicit MDeviceBrightnessRequest(const Data &vData) : _data(vData) { } + QString toString() { return MDeviceRequestBase::toString("DeviceBrightness", { _data.mBrightnessPercent }); } }; +class MDeviceBrightnessResponse : public MDeviceResponseBase { +public: + struct Data : MDeviceResponseBase::Data { + quint8 mBrightnessPercent = 0; + } _data; + + QVariantList parameters () const override { return { _data.mBrightnessPercent }; } + QString infoText () const override { return QString("DeviceBrightness") ; } + Data data () const; +}; + } -typedef Model::MDeviceBrightnessRequest ::Data DeviceBrightnessRequestData; -typedef Model::MDeviceBrightnessResponse::Data DeviceBrightnessResponseData; +typedef Model::MDeviceResponseBase ::Data DeviceResponseBaseData ; +typedef Model::MDeviceBrightnessRequest ::Data DeviceBrightnessRequestData ; +typedef Model::MDeviceBrightnessResponse::Data DeviceBrightnessResponseData ;