Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h =================================================================== diff -u -r8325066ffcce349e21df74e33bd3d298d3042ef3 -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 8325066ffcce349e21df74e33bd3d298d3042ef3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -18,6 +18,7 @@ #include // Project +#include "MAbstract.h" #include "types.h" // forward declarations @@ -56,14 +57,29 @@ * | infoText | AdjustUFEdit | * */ -class MAdjustUltrafiltrationEditResponse +class MAdjustUltrafiltrationEditResponse : public MAbstract { - // friends friend class ::tst_models; + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::F32 mVolume ; + Types::U32 mDuration ; + Types::S32 mDurationDiff ; + Types::F32 mRate ; + Types::F32 mRateDiff ; + Types::F32 mRateOld ; + } _data; + public: - QString stringPrefix = "AdjustUFEdit"; + Type_Enum typeText() const override { return Type_Enum::eEvent ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + QString infoText() const override { return QString("AdjustUFEdit") ; } + //NOTE: The correct order is followed in cpp to fill in the values regarding the payload byte orders. // The struct here is just the values not in correct order // since has been inherited from the confirm to borrow some struct variables. @@ -78,26 +94,11 @@ float mRateOld = 0; /*!< rateOld value of type float extracted out */ }; -private: - struct _Data { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::F32 mVolume ; - Types::U32 mDuration ; - Types::S32 mDurationDiff ; - Types::F32 mRate ; - Types::F32 mRateDiff ; - Types::F32 mRateOld ; - } _data; - public: MAdjustUltrafiltrationEditResponse () { } - QString toString ( ) const ; - void toVariantList ( QVariantList &vData ) const ; - bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr); - - Data data() const; + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; }; }