Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp (.../MTreatmentLogAlarmData.cpp) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp (.../MTreatmentLogAlarmData.cpp) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -14,11 +14,13 @@ */ #include "MTreatmentLogAlarmData.h" +// Qt +#include + using namespace Model; QVariantList MTreatmentLogAlarmData::parameters() const { return { - _data.mTimeStamp.value, _data.mAlarmID .value, _data.mParam1 .value, _data.mParam2 .value, @@ -27,15 +29,13 @@ bool MTreatmentLogAlarmData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTimeStamp)) if (GetValue(vByteArray, index, _data.mAlarmID )) if (GetValue(vByteArray, index, _data.mParam1 )) if (GetValue(vByteArray, index, _data.mParam2 )) return true ; 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; } } /*! @@ -45,7 +45,7 @@ */ TreatmentLogAlarmData MTreatmentLogAlarmData::data() const { Data data; - data.mTimeStamp = _data.mTimeStamp .value; + data.mTimeStamp = QDateTime::currentDateTime().toSecsSinceEpoch(); data.mAlarmID = _data.mAlarmID .value; data.mParam1 = _data.mParam1 .value; data.mParam2 = _data.mParam2 .value;