Index: sources/model/hd/data/MTreatmentOutletFlowData.cpp =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67 --- sources/model/hd/data/MTreatmentOutletFlowData.cpp (.../MTreatmentOutletFlowData.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/hd/data/MTreatmentOutletFlowData.cpp (.../MTreatmentOutletFlowData.cpp) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) @@ -15,28 +15,18 @@ using namespace Model; -// ----- OutletFlow ----- -QString MOutletFlow::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4,%5,%6,%7") - .arg(_data.mRefUFVol .value) - .arg(_data.mMeasUFVol .value) - .arg(_data.mRotorSpeed .value) - .arg(_data.mMotorSpeed .value) - .arg(_data.mMotorCtlSpeed .value) - .arg(_data.mMotorCtlCurrent .value) - .arg(_data.mPWMDtCycle .value); +QVariantList MOutletFlow::parameters() const { + return { + _data.mRefUFVol .value, + _data.mMeasUFVol .value, + _data.mRotorSpeed .value, + _data.mMotorSpeed .value, + _data.mMotorCtlSpeed .value, + _data.mMotorCtlCurrent .value, + _data.mPWMDtCycle .value + }; } -void MOutletFlow::toVariantList(QVariantList &vData) const { - vData += _data.mRefUFVol .value; - vData += _data.mMeasUFVol .value; - vData += _data.mRotorSpeed .value; - vData += _data.mMotorSpeed .value; - vData += _data.mMotorCtlSpeed .value; - vData += _data.mMotorCtlCurrent.value; - vData += _data.mPWMDtCycle .value; -} - bool MOutletFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mRefUFVol ))