Index: sources/model/hd/data/MTreatmentFlowsData.h =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -18,19 +18,21 @@ #include // Project +#include "MAbstract.h" #include "types.h" namespace Model { /*! * \brief The Flow Data class */ -class MFlow { +class MFlow : public MAbstract { -public: - QString stringPrefix = ""; + Type_Enum typeText () const override { return Type_Enum::eDatum; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QVariantList parameters() const override; -private: +protected: struct Data { Types::S32 mFlowSetPoint ; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ Types::F32 mMeasuredFlow ; /*!< vMeasuredFlow - Measured Flow value of type float extracted out */ @@ -44,17 +46,16 @@ public: MFlow () { } - QString toString ( ) const ; - void toVariantList ( QVariantList &vData ) const ; - bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr); - - const Data &data() const ; + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; }; /*! * \brief The Blood Flow Data class */ class MBloodFlow : public MFlow { + + QString infoText () const override { return QString("BloodFlow"); } + public: struct Data { qint32 mFlowSetPoint = 0; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ @@ -65,14 +66,19 @@ float mMotorCtlCurrent = 0; /*!< vMotorCtlCurrent - Motor Controller Current value of type float extracted out */ float mPWMDutyCycle = 0; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ }; - MBloodFlow() { stringPrefix = "Blood Flow"; } + + MBloodFlow() { } + Data data() const; }; /*! * \brief The Dialysate Flow Data class */ class MDialysateFlow : public MFlow { + + QString infoText () const override { return QString("DialysateFlow"); } + public: struct Data { qint32 mFlowSetPoint = 0; /*!< vFlowSetPoint - Flow Set Point value of type signed int extracted out */ @@ -83,8 +89,10 @@ float mMotorCtlCurrent = 0; /*!< vMotorCtlCurrent - Motor Controller Current value of type float extracted out */ float mPWMDutyCycle = 0; /*!< vPWMDtCycle - PWM Duty Cycle in % value of type float extracted out */ }; - MDialysateFlow() { stringPrefix = "Dialysate Flow"; } - Data data() const; + + MDialysateFlow() { } + + Data data() const; }; }