Index: sources/model/mtreatmentadjustultrafiltrationresponse.cpp =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/model/mtreatmentadjustultrafiltrationresponse.cpp (.../mtreatmentadjustultrafiltrationresponse.cpp) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/model/mtreatmentadjustultrafiltrationresponse.cpp (.../mtreatmentadjustultrafiltrationresponse.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -16,14 +16,16 @@ using namespace Model; QString MAdjustUltrafiltrationResponse::toString() const { - return QString(stringPrefix + "(%1, %2, %3, %4, %5, %6, %7)") + return QString(stringPrefix + "(%1, %2, %3, %4, %5, %6, %7, %8)") .arg(_data.mAccepted .value) .arg(_data.mReason .value) .arg(_data.mVolume .value) .arg(_data.mDuration .value) .arg(_data.mDurationDiff.value) .arg(_data.mRate .value) - .arg(_data.mRateDiff .value); + .arg(_data.mRateDiff .value) + .arg(_data.mRateCurr .value) + ; } void MAdjustUltrafiltrationResponse::toVariantList(QVariantList &vData) const { @@ -34,6 +36,7 @@ vData += _data.mDurationDiff.value; vData += _data.mRate .value; vData += _data.mRateDiff .value; + vData += _data.mRateCurr .value; } bool MAdjustUltrafiltrationResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { @@ -45,6 +48,7 @@ if (GetValue(vByteArray, index, _data.mDurationDiff )) if (GetValue(vByteArray, index, _data.mRate )) if (GetValue(vByteArray, index, _data.mRateDiff )) + if (GetValue(vByteArray, index, _data.mRateCurr )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -53,6 +57,7 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } AdjustUltrafiltrationResponseData MAdjustUltrafiltrationResponse::data() const { @@ -64,5 +69,6 @@ data.mDurationDiff = _data.mDurationDiff.value; data.mRate = _data.mRate .value; data.mRateDiff = _data.mRateDiff .value; + data.mRateCurr = _data.mRateCurr .value; return data; }