Index: sources/model/hd/data/treatment/MTreatmentSalineData.cpp =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06 --- sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-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 MTreatmentSalineData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 08-Sep-2020 - * \author (original) Behrouz NematiPour - * \date (original) 10-Aug-2020 + * \file MTreatmentSalineData.cpp + * \author (last) Dara Navaei + * \date (last) 06-Nov-2024 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 * */ #include "MTreatmentSalineData.h" @@ -18,21 +18,30 @@ QVariantList MTreatmentSaline::parameters() const { return { - _data.mTarget .value, - _data.mCumulative .value, - _data.mDelivered .value, + _data.mTarget .value, + _data.mCumulative .value, + _data.mDelivered .value, + _data.mDPI2BLDVolML .value, + _data.mRSRVR2DPIVolML .value, + _data.mZeroingRqstStatus .value, }; } bool MTreatmentSaline::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTarget )) - if (GetValue(vByteArray, index, _data.mCumulative )) - if (GetValue(vByteArray, index, _data.mDelivered )) + if (GetValue(vByteArray, index, _data.mTarget )) + if (GetValue(vByteArray, index, _data.mCumulative )) + if (GetValue(vByteArray, index, _data.mDelivered )) + if (GetValue(vByteArray, index, _data.mDPI2BLDVolML )) + if (GetValue(vByteArray, index, _data.mRSRVR2DPIVolML )) + if (GetValue(vByteArray, index, _data.mZeroingRqstStatus )) 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; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -42,8 +51,10 @@ */ MTreatmentSaline::Data MTreatmentSaline::data() const { Data data; - data.mTarget = _data.mTarget .value; - data.mCumulative = _data.mCumulative .value; - data.mDelivered = _data.mDelivered .value; + data.mTarget = _data.mTarget .value; + data.mCumulative = _data.mCumulative .value; + data.mDelivered = _data.mDelivered .value; + data.mDPI2BLDVolML = _data.mDPI2BLDVolML .value; + data.mRSRVR2DPIVolML = _data.mRSRVR2DPIVolML .value; return data; }