Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp =================================================================== diff -u -r48343520806859178923efdcca8a95f6af8599e9 -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -16,17 +16,13 @@ using namespace Model; -QString MAdjustDurationConfirmResponse::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4,%5") - .arg(_data.mAccepted .value) - .arg(_data.mReason .value); +QVariantList MAdjustDurationConfirmResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + }; } -void MAdjustDurationConfirmResponse::toVariantList(QVariantList &vData) const { - vData += _data.mAccepted .value; - vData += _data.mReason .value; -} - bool MAdjustDurationConfirmResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; @@ -38,7 +34,6 @@ if(vIndex) { *vIndex = index; } return false ; - } /*! Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h =================================================================== diff -u -r8325066ffcce349e21df74e33bd3d298d3042ef3 -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h (.../MTreatmentAdjustDurationConfirmResponse.h) (revision 8325066ffcce349e21df74e33bd3d298d3042ef3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h (.../MTreatmentAdjustDurationConfirmResponse.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -18,6 +18,7 @@ #include // Project +#include "MAbstract.h" #include "types.h" // forward declarations @@ -48,32 +49,33 @@ * | infoText | AdjustUFConfirm | * */ -class MAdjustDurationConfirmResponse { +class MAdjustDurationConfirmResponse : public MAbstract { // friends friend class ::tst_models; + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + } _data; + public: - QString stringPrefix = "AdjustDurationConfirm"; + Type_Enum typeText() const override { return Type_Enum::eEvent ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + QString infoText() const override { return QString("AdjustDurationConfirm") ; } + struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ }; -protected: - struct _Data { - Types::U32 mAccepted ; - Types::U32 mReason ; - } _data; - public: MAdjustDurationConfirmResponse () { } - 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 ; }; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.cpp =================================================================== diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.cpp (.../MTreatmentAdjustIsolatedUFConfirmResponse.cpp) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.cpp (.../MTreatmentAdjustIsolatedUFConfirmResponse.cpp) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -16,21 +16,17 @@ using namespace Model; -QString MAdjustIsolatedUFConfirmResponse::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4,%5") - .arg(_data.mAccepted .value) - .arg(_data.mReason .value); +QVariantList MAdjustIsolatedUFConfirmResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + }; } -void MAdjustIsolatedUFConfirmResponse::toVariantList(QVariantList &vData) const { - vData += _data.mAccepted .value; - vData += _data.mReason .value; -} - bool MAdjustIsolatedUFConfirmResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; return true ; @@ -48,7 +44,7 @@ */ AdjustIsolatedUFConfirmResponseData MAdjustIsolatedUFConfirmResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h =================================================================== diff -u -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046 -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h (.../MTreatmentAdjustIsolatedUFConfirmResponse.h) (revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h (.../MTreatmentAdjustIsolatedUFConfirmResponse.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -18,6 +18,7 @@ #include // Project +#include "MAbstract.h" #include "types.h" // forward declarations @@ -48,32 +49,33 @@ * | infoText | AdjustUFConfirm | * */ -class MAdjustIsolatedUFConfirmResponse { +class MAdjustIsolatedUFConfirmResponse : public MAbstract { // friends friend class ::tst_models; + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + } _data; + public: - QString stringPrefix = "AdjustUFConfirm"; + Type_Enum typeText() const override { return Type_Enum::eEvent ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + QString infoText() const override { return QString("AdjustIsolatedUFConfirm") ; } + struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ }; -protected: - struct _Data { - Types::U32 mAccepted ; - Types::U32 mReason ; - } _data; - public: MAdjustIsolatedUFConfirmResponse () { } - 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 ; }; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp (.../MTreatmentAdjustIsolatedUFDurationEditResponse.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp (.../MTreatmentAdjustIsolatedUFDurationEditResponse.cpp) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -16,20 +16,14 @@ using namespace Model; -QString MAdjustIsolatedUFDurationEditResponse::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4") - .arg(_data.mAccepted .value) - .arg(_data.mReason .value) - .arg(_data.mVolumeMax .value) - ; +QVariantList MAdjustIsolatedUFDurationEditResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mVolumeMax .value, + }; } -void MAdjustIsolatedUFDurationEditResponse::toVariantList(QVariantList &vData) const { - vData += _data.mAccepted .value; - vData += _data.mReason .value; - vData += _data.mVolumeMax .value; -} - bool MAdjustIsolatedUFDurationEditResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h (.../MTreatmentAdjustIsolatedUFDurationEditResponse.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h (.../MTreatmentAdjustIsolatedUFDurationEditResponse.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -18,6 +18,7 @@ #include // Project +#include "MAbstract.h" #include "types.h" // forward declarations @@ -49,14 +50,18 @@ * | infoText | AdjustIsolatedUFDurationEdit | * */ -class MAdjustIsolatedUFDurationEditResponse +class MAdjustIsolatedUFDurationEditResponse : public MAbstract { - // friends friend class ::tst_models; + QVariantList parameters() const override; + public: - QString stringPrefix = "AdjustUFDurationEdit"; + Type_Enum typeText() const override { return Type_Enum::eEvent ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + QString infoText() const override { return QString("AdjustIsolatedUFDurationEdit") ; } + //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. @@ -76,11 +81,8 @@ public: MAdjustIsolatedUFDurationEditResponse () { } - 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 ; }; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp (.../MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp (.../MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -16,24 +16,16 @@ using namespace Model; -QString MAdjustIsolatedUFVolumeEditResponse::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4,%5") - .arg(_data.mAccepted .value) - .arg(_data.mReason .value) - .arg(_data.mVolume .value) - .arg(_data.mDuration .value) - .arg(_data.mRate .value) - ; +QVariantList MAdjustIsolatedUFVolumeEditResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mVolume .value, + _data.mDuration .value, + _data.mRate .value, + }; } -void MAdjustIsolatedUFVolumeEditResponse::toVariantList(QVariantList &vData) const { - vData += _data.mAccepted .value; - vData += _data.mReason .value; - vData += _data.mVolume .value; - vData += _data.mDuration .value; - vData += _data.mRate .value; -} - bool MAdjustIsolatedUFVolumeEditResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h (.../MTreatmentAdjustIsolatedUFVolumeEditResponse.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h (.../MTreatmentAdjustIsolatedUFVolumeEditResponse.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -18,6 +18,7 @@ #include // Project +#include "MAbstract.h" #include "types.h" // forward declarations @@ -51,14 +52,26 @@ * | infoText | AdjustIsolatedUFVolumeEdit | * */ -class MAdjustIsolatedUFVolumeEditResponse +class MAdjustIsolatedUFVolumeEditResponse : public MAbstract { - // friends friend class ::tst_models; + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mVolume ; + Types::U32 mDuration ; + Types::U32 mRate ; + } _data; + public: - QString stringPrefix = "AdjustUFVolumeEdit"; + Type_Enum typeText() const override { return Type_Enum::eEvent ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + QString infoText() const override { return QString("AdjustIsolatedUFVolumeEdit") ; } + //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. @@ -70,23 +83,11 @@ quint32 mRate = 0; /*!< rate value of type quint32 extracted out */ }; -private: - struct _Data { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::U32 mVolume ; - Types::U32 mDuration ; - Types::U32 mRate ; - } _data; - public: MAdjustIsolatedUFVolumeEditResponse () { } - 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 ; }; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp =================================================================== diff -u -r48343520806859178923efdcca8a95f6af8599e9 -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp (.../MTreatmentAdjustUltrafiltrationConfirmResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp (.../MTreatmentAdjustUltrafiltrationConfirmResponse.cpp) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -16,17 +16,13 @@ using namespace Model; -QString MAdjustUltrafiltrationConfirmResponse::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4,%5") - .arg(_data.mAccepted .value) - .arg(_data.mReason .value); +QVariantList MAdjustUltrafiltrationConfirmResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + }; } -void MAdjustUltrafiltrationConfirmResponse::toVariantList(QVariantList &vData) const { - vData += _data.mAccepted .value; - vData += _data.mReason .value; -} - bool MAdjustUltrafiltrationConfirmResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; @@ -38,7 +34,6 @@ if(vIndex) { *vIndex = index; } return false ; - } /*! Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h =================================================================== diff -u -r8325066ffcce349e21df74e33bd3d298d3042ef3 -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h (.../MTreatmentAdjustUltrafiltrationConfirmResponse.h) (revision 8325066ffcce349e21df74e33bd3d298d3042ef3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h (.../MTreatmentAdjustUltrafiltrationConfirmResponse.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -18,6 +18,7 @@ #include // Project +#include "MAbstract.h" #include "types.h" // forward declarations @@ -48,32 +49,33 @@ * | infoText | AdjustUFConfirm | * */ -class MAdjustUltrafiltrationConfirmResponse { +class MAdjustUltrafiltrationConfirmResponse : public MAbstract { // friends friend class ::tst_models; + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + } _data; + public: - QString stringPrefix = "AdjustUFConfirm"; + Type_Enum typeText() const override { return Type_Enum::eEvent ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + QString infoText() const override { return QString("AdjustUFConfirm") ; } + struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ }; -protected: - struct _Data { - Types::U32 mAccepted ; - Types::U32 mReason ; - } _data; - public: MAdjustUltrafiltrationConfirmResponse () { } - 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 ; }; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp (.../MTreatmentAdjustUltrafiltrationEditResponse.cpp) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp (.../MTreatmentAdjustUltrafiltrationEditResponse.cpp) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -16,30 +16,19 @@ using namespace Model; -QString MAdjustUltrafiltrationEditResponse::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4,%5,%6,%7,%8") - .arg(_data.mAccepted .value) - .arg(_data.mReason .value) - .arg(_data.mVolume .value) - .arg(_data.mDuration .value) - .arg(_data.mDurationDiff.value) - .arg(_data.mRate .value) - .arg(_data.mRateDiff .value) - .arg(_data.mRateOld .value) - ; +QVariantList MAdjustUltrafiltrationEditResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mVolume .value, + _data.mDuration .value, + _data.mDurationDiff .value, + _data.mRate .value, + _data.mRateDiff .value, + _data.mRateOld .value, + }; } -void MAdjustUltrafiltrationEditResponse::toVariantList(QVariantList &vData) const { - vData += _data.mAccepted .value; - vData += _data.mReason .value; - vData += _data.mVolume .value; - vData += _data.mDuration .value; - vData += _data.mDurationDiff.value; - vData += _data.mRate .value; - vData += _data.mRateDiff .value; - vData += _data.mRateOld .value; -} - bool MAdjustUltrafiltrationEditResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; 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 ; }; } Index: sources/model/td/data/treatment/MTreatmentIsolatedUFData.h =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 --- sources/model/td/data/treatment/MTreatmentIsolatedUFData.h (.../MTreatmentIsolatedUFData.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h (.../MTreatmentIsolatedUFData.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x9A00| 0x100 | 7 | 1 Hz | N | TD | All | Treatment IsolatedUF Data | + * |0x9A00| 0x100 | 7 | 1 Hz | N | TD | All | Treatment IsolatedUF Data | * * | Payload || * | || @@ -66,11 +66,10 @@ } _data; public: + Type_Enum typeText() const override { return Type_Enum::eDatum ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } + QString infoText() const override { return QString("IsolatedUF") ; } - Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eTD ; } - QString infoText() const override { return QString("IsolatedUF") ; } - struct Data { quint32 mDuration = 0; ///< Current duration quint32 mSetVolume = 0; ///< Current volume goal