Index: sources/model/hd/data/MHDAirTrapData.cpp =================================================================== diff -u -r968c7861b6caf1906c6b3ac34ae13018c6f1bf2b -r26433c42f2efa2cb18af95f523581c7eeeff049d --- sources/model/hd/data/MHDAirTrapData.cpp (.../MHDAirTrapData.cpp) (revision 968c7861b6caf1906c6b3ac34ae13018c6f1bf2b) +++ sources/model/hd/data/MHDAirTrapData.cpp (.../MHDAirTrapData.cpp) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2022-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MHDAirTrapData.cpp - * \author (last) Michael Gathwaite - * \date (last) 23-Feb-2022 - * \author (original) Michael Garthwaite - * \date (original) 23-Feb-2022 + * \file MHDAirTrapData.cpp + * \author (last) Dara Navaei + * \date (last) 27-Feb-2024 + * \author (original) Michael Garthwaite + * \date (original) 23-Feb-2022 * */ #include "MHDAirTrapData.h" @@ -20,16 +20,22 @@ return { _data.mAirTrapLowerLevel.value, _data.mAirTrapUpperLevel.value, + _data.mAirTrapRawLowerLevel.value, + _data.mAirTrapRawUpperLevel.value, }; } bool MHDAirTrapData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; if (GetValue(vByteArray, index, _data.mAirTrapLowerLevel )) if (GetValue(vByteArray, index, _data.mAirTrapUpperLevel )) + if (GetValue(vByteArray, index, _data.mAirTrapRawLowerLevel )) + if (GetValue(vByteArray, index, _data.mAirTrapRawUpperLevel )) 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; } } /*! @@ -39,7 +45,9 @@ */ MHDAirTrapData::Data MHDAirTrapData::data() const{ Data data; - data.mAirTrapLowerLevel = _data.mAirTrapLowerLevel.value; - data.mAirTrapUpperLevel = _data.mAirTrapUpperLevel.value; + data.mAirTrapLowerLevel = _data.mAirTrapLowerLevel.value; + data.mAirTrapUpperLevel = _data.mAirTrapUpperLevel.value; + data.mAirTrapRawLowerLevel = _data.mAirTrapRawLowerLevel.value; + data.mAirTrapRawUpperLevel = _data.mAirTrapRawUpperLevel.value; return data; }