Index: sources/model/hd/data/MTreatmentRangesData.h =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -17,6 +17,7 @@ #include // Project +#include "MAbstract.h" #include "types.h" // forward declarations @@ -25,23 +26,16 @@ namespace Model { -class MTreatmentRanges { +class MTreatmentRanges : public MAbstract { // friends friend class ::tst_models; -public: - QString stringPrefix = "Treatment Ranges"; - struct Data { - quint32 mDuration_Min = 0; /*!< mDuration_Min value of type U32 extracted out */ - quint32 mDuration_Max = 0; /*!< mDuration_Max value of type U32 extracted out */ - float mUltrafiltration_Volume_Min = 0; /*!< mUltrafiltration_Volume_Min value of type float extracted out */ - float mUltrafiltration_Volume_Max = 0; /*!< mUltrafiltration_Volume_Max value of type float extracted out */ - quint32 mDialysate_Flow_Min = 0; /*!< mDialysate_Flow_Min value of type U32 extracted out */ - quint32 mDialysate_Flow_Max = 0; /*!< mDialysate_Flow_Max value of type U32 extracted out */ - }; + Type_Enum typeText () const override { return Type_Enum::eDatum; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("TreatmentRanges"); } + QVariantList parameters() const override; -private: struct { Types::U32 mDuration_Min ; Types::U32 mDuration_Max ; @@ -52,13 +46,19 @@ } _data; public: + struct Data { + quint32 mDuration_Min = 0; /*!< mDuration_Min value of type U32 extracted out */ + quint32 mDuration_Max = 0; /*!< mDuration_Max value of type U32 extracted out */ + float mUltrafiltration_Volume_Min = 0; /*!< mUltrafiltration_Volume_Min value of type float extracted out */ + float mUltrafiltration_Volume_Max = 0; /*!< mUltrafiltration_Volume_Max value of type float extracted out */ + quint32 mDialysate_Flow_Min = 0; /*!< mDialysate_Flow_Min value of type U32 extracted out */ + quint32 mDialysate_Flow_Max = 0; /*!< mDialysate_Flow_Max value of type U32 extracted out */ + }; + MTreatmentRanges () { } - 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 ; }; }