Index: sources/model/dg/data/MDGPressuresData.cpp =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/dg/data/MDGPressuresData.cpp (.../MDGPressuresData.cpp) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/model/dg/data/MDGPressuresData.cpp (.../MDGPressuresData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-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 MDGPressuresData.cpp - * \author (last) Behrouz NemaiPour - * \date (last) 04-Jul-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGPressuresData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 10-Feb-2023 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #include "MDGPressuresData.h" @@ -18,24 +18,27 @@ QVariantList MDGPressures::parameters() const { return { - _data.mROInletPSI .value, - _data.mROOutletPSI .value, - _data.mDrainInletPSI .value, - _data.mDrainOutletPSI .value + _data.mROInletPSI .value, + _data.mROOutletPSI .value, + _data.mDrainInletPSI .value, + _data.mDrainOutletPSI .value, + _data.mBarometricPSI .value }; } bool MDGPressures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mROInletPSI )) - if (GetValue(vByteArray, index, _data.mROOutletPSI )) - if (GetValue(vByteArray, index, _data.mDrainInletPSI )) - if (GetValue(vByteArray, index, _data.mDrainOutletPSI )) + if (GetValue(vByteArray, index, _data.mROInletPSI )) + if (GetValue(vByteArray, index, _data.mROOutletPSI )) + if (GetValue(vByteArray, index, _data.mDrainInletPSI )) + if (GetValue(vByteArray, index, _data.mDrainOutletPSI )) + if (GetValue(vByteArray, index, _data.mBarometricPSI )) 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; } } /*! @@ -45,9 +48,10 @@ */ MDGPressures::Data MDGPressures::data() const { Data data; - data.mROInletPSI = _data.mROInletPSI .value; - data.mROOutletPSI = _data.mROOutletPSI .value; - data.mDrainInletPSI = _data.mDrainInletPSI .value; - data.mDrainOutletPSI = _data.mDrainOutletPSI .value; + data.mROInletPSI = _data.mROInletPSI .value; + data.mROOutletPSI = _data.mROOutletPSI .value; + data.mDrainInletPSI = _data.mDrainInletPSI .value; + data.mDrainOutletPSI = _data.mDrainOutletPSI .value; + data.mBarometricPSI = _data.mBarometricPSI .value; return data; }