Index: sources/model/td/data/MTDAirBubbleData.cpp =================================================================== diff -u -r47aa5719d35c6023a9a612f16da694f08ffa27be -r3c07dc803109f716937b692cb4a67a5324bb9ca3 --- sources/model/td/data/MTDAirBubbleData.cpp (.../MTDAirBubbleData.cpp) (revision 47aa5719d35c6023a9a612f16da694f08ffa27be) +++ sources/model/td/data/MTDAirBubbleData.cpp (.../MTDAirBubbleData.cpp) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) @@ -5,28 +5,28 @@ * 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 MHDAirBubbleData.cpp + * \file MTDAirBubbleData.cpp * \author (last) Dara Navaei * \date (last) 27-Feb-2024 * \author (original) Michael Garthwaite * \date (original) 23-Feb-2022 * */ -#include "MHDAirBubbleData.h" +#include "MTDAirBubbleData.h" using namespace Model; -QVariantList MHDAirBubbleData::parameters() const { +QVariantList MTDAirBubbleData::parameters() const { return { - _data.mVenousAirBubbleStatus .value, - _data.mVenousAirBubbleState .value, + _data.h18Status .value, + _data.h18State .value, }; } -bool MHDAirBubbleData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MTDAirBubbleData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mVenousAirBubbleStatus )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousAirBubbleState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.h18Status )) goto lError; + if ( ! GetValue(vByteArray, index, _data.h18State )) goto lError; return true ; @@ -37,13 +37,13 @@ } /*! - * \brief MHDAirBubbleData::data + * \brief MTDAirBubbleData::data * \details Provides model's Data from the received messages data values * \return Data */ -MHDAirBubbleData::Data MHDAirBubbleData::data() const{ +MTDAirBubbleData::Data MTDAirBubbleData::data() const{ Data data; - data.mVenousAirBubbleStatus = _data.mVenousAirBubbleStatus.value; - data.mVenousAirBubbleState = _data.mVenousAirBubbleState.value; + data.mVenousAirBubbleStatus = _data.h18Status .value; + data.mVenousAirBubbleState = _data.h18State .value; return data; }