Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r15de0cd12dad1ea5107c52e5ed89280bc9e29b1d -r246bf68b01c9249f2a74dddbba67f49807937fa2 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 15de0cd12dad1ea5107c52e5ed89280bc9e29b1d) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 246bf68b01c9249f2a74dddbba67f49807937fa2) @@ -35,10 +35,25 @@ class MModel { protected: static QString toString (const QString &vStringPrefix, const QVariant &vParameters) { - return QString(vStringPrefix + "," + vParameters.toStringList().join(',')); + QString senderID = "UI,"; + return QString(senderID + vStringPrefix + "," + vParameters.toStringList().join(',')); }; }; +class MAdjustPowerOffReq : public MModel { +public: + quint8 state; + QString toString() { + return toString({state}); + } + + explicit MAdjustPowerOffReq(quint8 vState) : state(vState) { } + + static QString toString(const QVariantList &vParameters) { + return MModel::toString("PowerOff", vParameters); + } +}; + class MAdjustBloodDialysateReq : public MModel { public: quint32 bloodFlow = 0; @@ -49,7 +64,7 @@ } static QString toString(const QVariantList &vParameters) { - return MModel::toString("Adjust Blood/Dialysate", vParameters); + return MModel::toString("AdjustBloodDialisate", vParameters); } }; @@ -61,7 +76,7 @@ return toString({duration}); } static QString toString(const QVariantList &vParameters) { - return MModel::toString("Adjust Duration", vParameters); + return MModel::toString("AdjustDuration", vParameters); } }; @@ -77,7 +92,7 @@ return toString({requestedState}); } static QString toString(const QVariantList &vParameters) { - return MModel::toString("Adjust Ultrafiltration State", vParameters); + return MModel::toString("AdjustUFState", vParameters); } }; @@ -89,7 +104,7 @@ return toString({volume}); } static QString toString(const QVariantList &vParameters) { - return MModel::toString("Adjust Ultrafiltration Edit", vParameters); + return MModel::toString("AdjustUFEdit", vParameters); } }; @@ -105,12 +120,13 @@ return toString({volume , option}); } static QString toString(const QVariantList &vParameters) { - return MModel::toString("Adjust Ultrafiltration Confirm", vParameters); + return MModel::toString("AdjustUFConfirm", vParameters); } }; } +typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; typedef Model:: MAdjustDurationReq AdjustDurationRequestData; typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData;