Index: sources/model/hd/data/MTreatmentPressureOcclusionData.h =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/hd/data/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -17,22 +17,19 @@ #include // Project +#include "MAbstract.h" #include "types.h" namespace Model { -class MPressureOcclusion { +class MPressureOcclusion : public MAbstract { public: - QString stringPrefix = "Pressure/Occlusion"; - struct Data { - float mArterialPressure = 0; /*!< ArterialPressure value of type float extracted out */ - float mVenousPressure = 0; /*!< VenousPressure value of type float extracted out */ - float mBloodPumpOcclusion = 0; /*!< BloodPumpOcclusion value of type float extracted out */ - float mDialysateInletPumpOcclusion = 0; /*!< DialysateInletPumpOcclusion value of type float extracted out */ - float mDialysateOutletPumpOcclusion = 0; /*!< DialysateOutletPumpOcclusion value of type float extracted out */ - }; -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("Pressure/Occlusion"); } + QVariantList parameters() const override; + struct { Types::F32 mArterialPressure ; Types::F32 mVenousPressure ; @@ -42,13 +39,18 @@ } _data; public: + struct Data { + float mArterialPressure = 0; /*!< ArterialPressure value of type float extracted out */ + float mVenousPressure = 0; /*!< VenousPressure value of type float extracted out */ + float mBloodPumpOcclusion = 0; /*!< BloodPumpOcclusion value of type float extracted out */ + float mDialysateInletPumpOcclusion = 0; /*!< DialysateInletPumpOcclusion value of type float extracted out */ + float mDialysateOutletPumpOcclusion = 0; /*!< DialysateOutletPumpOcclusion value of type float extracted out */ + }; + MPressureOcclusion () { } - 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 ; }; }