Index: sources/model/hd/data/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/model/hd/data/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/hd/data/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -15,23 +15,16 @@ using namespace Model; -QString MPressureOcclusion::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4,%5") - .arg(_data.mArterialPressure .value) - .arg(_data.mVenousPressure .value) - .arg(_data.mBloodPumpOcclusion .value) - .arg(_data.mDialysateInletPumpOcclusion .value) - .arg(_data.mDialysateOutletPumpOcclusion .value); +QVariantList MPressureOcclusion::parameters() const { + return { + _data.mArterialPressure .value, + _data.mVenousPressure .value, + _data.mBloodPumpOcclusion .value, + _data.mDialysateInletPumpOcclusion .value, + _data.mDialysateOutletPumpOcclusion .value + }; } -void MPressureOcclusion::toVariantList(QVariantList &vData) const { - vData += _data.mArterialPressure .value; - vData += _data.mVenousPressure .value; - vData += _data.mBloodPumpOcclusion .value; - vData += _data.mDialysateInletPumpOcclusion .value; - vData += _data.mDialysateOutletPumpOcclusion .value; -} - bool MPressureOcclusion::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mArterialPressure ))