Index: sources/model/hd/data/MTreatmentOutletFlowData.h =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/model/hd/data/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/hd/data/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -17,24 +17,18 @@ #include // Project +#include "MAbstract.h" #include "types.h" namespace Model { -class MOutletFlow { -public: - QString stringPrefix = "Dialysate Outlet Flow"; - struct Data { - float mRefUFVol = 0; /*!< Reference UF Volume value of type float extracted out */ - float mMeasUFVol = 0; /*!< Measured UF Volume value of type float extracted out */ - float mRotorSpeed = 0; /*!< Rotor Speed value of type float extracted out */ - float mMotorSpeed = 0; /*!< Motor Speed value of type float extracted out */ - float mMotorCtlSpeed = 0; /*!< Motor Controller Speed value of type float extracted out */ - float mMotorCtlCurrent = 0; /*!< Motor Controller Current value of type float extracted out */ - float mPWMDtCycle = 0; /*!< PWM Duty Cycle in % value of type float extracted out */ - }; +class MOutletFlow : public MAbstract { -private: + Type_Enum typeText () const override { return Type_Enum::eDatum; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("OutletFlow"); } + QVariantList parameters() const override; + struct { Types::F32 mRefUFVol ; Types::F32 mMeasUFVol ; @@ -46,13 +40,21 @@ } _data; public: + QString stringPrefix = "Dialysate Outlet Flow"; + struct Data { + float mRefUFVol = 0; /*!< Reference UF Volume value of type float extracted out */ + float mMeasUFVol = 0; /*!< Measured UF Volume value of type float extracted out */ + float mRotorSpeed = 0; /*!< Rotor Speed value of type float extracted out */ + float mMotorSpeed = 0; /*!< Motor Speed value of type float extracted out */ + float mMotorCtlSpeed = 0; /*!< Motor Controller Speed value of type float extracted out */ + float mMotorCtlCurrent = 0; /*!< Motor Controller Current value of type float extracted out */ + float mPWMDtCycle = 0; /*!< PWM Duty Cycle in % value of type float extracted out */ + }; + MOutletFlow () { } - 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 ; }; }