Index: sources/model/hd/data/MHDBloodLeakData.cpp =================================================================== diff -u -r8e2ac7ad8d482cc42a8e3a0024015f69087057bc -rf0bb3c517e51b85632a794f4ea62c12205b33031 --- sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision 8e2ac7ad8d482cc42a8e3a0024015f69087057bc) +++ sources/model/hd/data/MHDBloodLeakData.cpp (.../MHDBloodLeakData.cpp) (revision f0bb3c517e51b85632a794f4ea62c12205b33031) @@ -18,25 +18,31 @@ QVariantList MHDBloodLeakData::parameters() const { return { - _data.mBloodLeakStatus .value, - _data.mBloodLeakState .value, - _data.mBloodLeakPersistentCounter .value, - _data.mBloodLeakSerialCommState .value, - _data.mBloodLeakIntensity .value, - _data.mBloodLeakDetect .value, - _data.mBloodLeakIntensityMvgAvg .value, + _data.mBloodLeakStatus .value, + _data.mBloodLeakState .value, + _data.mBloodLeakPersistentCounter .value, + _data.mBloodLeakSerialCommState .value, + _data.mBloodLeakIntensity .value, + _data.mBloodLeakDetect .value, + _data.mBloodLeakIntensityMvgAvg .value, + _data.mBloodLeakTimeSinceZeroMS .value, + _data.mBloodLeakDrfitInRangeStatus .value, + _data.mBloodLeakDriftUpperRangeStatus .value, }; } bool MHDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mBloodLeakStatus )) - if (GetValue(vByteArray, index, _data.mBloodLeakState )) - if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) - if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) - if (GetValue(vByteArray, index, _data.mBloodLeakIntensity )) - if (GetValue(vByteArray, index, _data.mBloodLeakDetect )) - if (GetValue(vByteArray, index, _data.mBloodLeakIntensityMvgAvg )) + if (GetValue(vByteArray, index, _data.mBloodLeakStatus )) + if (GetValue(vByteArray, index, _data.mBloodLeakState )) + if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter )) + if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState )) + if (GetValue(vByteArray, index, _data.mBloodLeakIntensity )) + if (GetValue(vByteArray, index, _data.mBloodLeakDetect )) + if (GetValue(vByteArray, index, _data.mBloodLeakIntensityMvgAvg )) + if (GetValue(vByteArray, index, _data.mBloodLeakTimeSinceZeroMS )) + if (GetValue(vByteArray, index, _data.mBloodLeakDrfitInRangeStatus )) + if (GetValue(vByteArray, index, _data.mBloodLeakDriftUpperRangeStatus )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -45,6 +51,9 @@ 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -54,13 +63,16 @@ */ MHDBloodLeakData::Data MHDBloodLeakData::data() const{ Data data; - 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.mBloodLeakIntensityMvgAvg = _data.mBloodLeakIntensityMvgAvg .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.mBloodLeakIntensityMvgAvg = _data.mBloodLeakIntensityMvgAvg .value; + data.mBloodLeakTimeSinceLastZeroMS = _data.mBloodLeakTimeSinceZeroMS .value; + data.mBloodLeakDriftInRangeStatus = _data.mBloodLeakDrfitInRangeStatus .value; + data.mBloodLeakDriftUpperRangeStatus = _data.mBloodLeakDriftUpperRangeStatus .value; return data; }