Index: sources/model/dg/data/MDGTemperaturesData.cpp =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r90bcc276f2a879169fef20e9168711cf906c0e54 --- sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision 90bcc276f2a879169fef20e9168711cf906c0e54) @@ -15,37 +15,24 @@ using namespace Model; -QString MDGTemperatures::toString() const { - return QString(stringPrefix + ",%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11,%12") - .arg(_data.mInletPrimaryHeater .value) - .arg(_data.mOutletPrimaryHeater .value) - .arg(_data.mConductivitySensor1 .value) - .arg(_data.mConductivitySensor2 .value) - .arg(_data.mOutletRedundancy .value) - .arg(_data.mInletDialysate .value) - .arg(_data.mPrimaryHeaterThermoCouple .value) - .arg(_data.mTrimmerHeaterThermoCouple .value) - .arg(_data.mPrimaryHeaterColdJunction .value) - .arg(_data.mTrimmerHeaterColdJunction .value) - .arg(_data.mPrimaryHeaterInternal .value) - .arg(_data.mTrimmerHeaterInternal .value); +QVariantList MDGTemperatures::parameters() const +{ + return { + _data.mInletPrimaryHeater .value, + _data.mOutletPrimaryHeater .value, + _data.mConductivitySensor1 .value, + _data.mConductivitySensor2 .value, + _data.mOutletRedundancy .value, + _data.mInletDialysate .value, + _data.mPrimaryHeaterThermoCouple .value, + _data.mTrimmerHeaterThermoCouple .value, + _data.mPrimaryHeaterColdJunction .value, + _data.mTrimmerHeaterColdJunction .value, + _data.mPrimaryHeaterInternal .value, + _data.mTrimmerHeaterInternal .value + }; } -void MDGTemperatures::toVariantList(QVariantList &vData) const { - vData += _data.mInletPrimaryHeater .value; - vData += _data.mOutletPrimaryHeater .value; - vData += _data.mConductivitySensor1 .value; - vData += _data.mConductivitySensor2 .value; - vData += _data.mOutletRedundancy .value; - vData += _data.mInletDialysate .value; - vData += _data.mPrimaryHeaterThermoCouple .value; - vData += _data.mTrimmerHeaterThermoCouple .value; - vData += _data.mPrimaryHeaterColdJunction .value; - vData += _data.mTrimmerHeaterColdJunction .value; - vData += _data.mPrimaryHeaterInternal .value; - vData += _data.mTrimmerHeaterInternal .value; -} - bool MDGTemperatures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mInletPrimaryHeater ))