Index: sources/model/dd/data/MDDBloodLeakData.cpp =================================================================== diff -u -r86c040b666b2544800274db2a18ba5374fbfd4e7 -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDBloodLeakData.cpp (.../MDDBloodLeakData.cpp) (revision 86c040b666b2544800274db2a18ba5374fbfd4e7) +++ sources/model/dd/data/MDDBloodLeakData.cpp (.../MDDBloodLeakData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -18,13 +18,31 @@ QVariantList MDDBloodLeakData::parameters() const { return { - _data.mBloodLeak .value, + _data.mBloodLeakStatus .value, + _data.mBloodLeakState .value, + _data.mBloodLeakPersistentCounter .value, + _data.mBloodLeakSerialCommState .value, + _data.mBloodLeakIntensity .value, + _data.mBloodLeakDetect .value, + _data.mBloodLeakIntensityMovingAvg .value, + _data.mBloodLeakTimeSinceZeroMS .value, + _data.mDriftInRangeStatus .value, + _data.mDriftUpperRangeStatus .value, }; } bool MDDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mBloodLeak )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakStatus )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakIntensity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakDetect )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakIntensityMovingAvg )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodLeakTimeSinceZeroMS )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDriftInRangeStatus )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDriftUpperRangeStatus )) goto lError; return true; @@ -36,6 +54,15 @@ MDDBloodLeakData::Data MDDBloodLeakData::data() const { Data data; - data.mBloodLeak = _data.mBloodLeak .value; + data.mBloodLeakStatus = _data.mBloodLeakStatus .value; + data.mBloodLeakState = _data.mBloodLeakState .value; + data.mBloodLeakPersistentCounter = _data.mBloodLeakPersistentCounter .value; + data.mBloodLeakSerialCommState = _data.mBloodLeakSerialCommState .value; + data.mBloodLeakIntensity = _data.mBloodLeakIntensity .value; + data.mBloodLeakDetect = _data.mBloodLeakDetect .value; + data.mBloodLeakIntensityMovingAvg = _data.mBloodLeakIntensityMovingAvg .value; + data.mBloodLeakTimeSinceZeroMS = _data.mBloodLeakTimeSinceZeroMS .value; + data.mDriftInRangeStatus = _data.mDriftInRangeStatus .value; + data.mDriftUpperRangeStatus = _data.mDriftUpperRangeStatus .value; return data; }