Index: sources/model/malarmstatus.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 --- sources/model/malarmstatus.cpp (.../malarmstatus.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/model/malarmstatus.cpp (.../malarmstatus.cpp) (revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616) @@ -19,12 +19,12 @@ MAlarmStatus::MAlarmStatus() { } QString MAlarmStatus::toString() const { - return QString("Alarm Status(%1, %2, %3, %4, %5)") + return QString(stringPrefix + ",%1,%2,%3,%4,%5") .arg(_data.mState .value ) .arg(_data.mTop .value ) .arg(_data.mMuteTimeout .value ) .arg(_data.mEscalatesIn .value ) - .arg(_data.mFlags .toString()); + .arg(_data.mFlags .toString("")); } void MAlarmStatus::toVariantList(QVariantList &vData) const { @@ -37,13 +37,19 @@ } } -void MAlarmStatus::fromByteArray(const QByteArray &vByteArray) { +bool MAlarmStatus::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - Types::getValue<>(vByteArray, index, _data.mState ); - Types::getValue<>(vByteArray, index, _data.mTop ); - Types::getValue<>(vByteArray, index, _data.mMuteTimeout ); - Types::getValue<>(vByteArray, index, _data.mEscalatesIn ); - Types::getBits (vByteArray, index, _data.mFlags , eFlag_Bits_Length); + if (GetValue(vByteArray, index, _data.mState )) + if (GetValue(vByteArray, index, _data.mTop )) + if (GetValue(vByteArray, index, _data.mMuteTimeout )) + if (GetValue(vByteArray, index, _data.mEscalatesIn )) + if (GetBits (vByteArray, index, _data.mFlags , eFlag_Bits_Length)) + 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; } + else { if(vIndex) *vIndex = index; return false; } } MAlarmStatus::Data MAlarmStatus::data() const {