Index: sources/model/dg/data/MDGPressuresData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5e9239161c20344a9c56220d6569f429a66b7c41 --- sources/model/dg/data/MDGPressuresData.cpp (.../MDGPressuresData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGPressuresData.cpp (.../MDGPressuresData.cpp) (revision 5e9239161c20344a9c56220d6569f429a66b7c41) @@ -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; }