Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r90bcc276f2a879169fef20e9168711cf906c0e54 --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 90bcc276f2a879169fef20e9168711cf906c0e54) @@ -31,7 +31,11 @@ friend class ::tst_models; // DG RO Pump Data (U32) Set pt. pressure (F32) flow rate (F32) PWM - QString stringPrefix = "D,DG,RO Pump"; + Type_Enum typeText () const override { return Type_Enum::eDatum; } + Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + QString infoText () const override { return QString("ROPump"); } + QVariantList parameters() const override; + struct { Types::U32 mPressure ; Types::F32 mFlowRate ; @@ -47,11 +51,8 @@ MDGROPump () { } - 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 ; }; }