Index: sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp (.../MPreTreatmentStatesData.cpp) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp (.../MPreTreatmentStatesData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -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 MPreTreatmentStatesData.cpp * \author (last) Behrouz NematiPour - * \date (last) 01-Mar-2021 + * \date (last) 10-Feb-2023 * \author (original) Behrouz NematiPour - * \date (original) 02-Jul-2020 + * \date (original) 11-Apr-2021 * */ #include "MPreTreatmentStatesData.h" @@ -27,6 +27,8 @@ _data.mPrimeState .value, _data.mRecirculateState .value, _data.mPatientConnectionState .value, + _data.mWetSelfTestsState .value, + _data.mPreTreatmentRsrvrState .value, }; } @@ -41,6 +43,8 @@ if (GetValue(vByteArray, index, _data.mPrimeState )) if (GetValue(vByteArray, index, _data.mRecirculateState )) if (GetValue(vByteArray, index, _data.mPatientConnectionState )) + if (GetValue(vByteArray, index, _data.mWetSelfTestsState )) + if (GetValue(vByteArray, index, _data.mPreTreatmentRsrvrState )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,6 +55,8 @@ 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; } } /*! @@ -69,5 +75,7 @@ data.mPrimeState = _data.mPrimeState .value; data.mRecirculateState = _data.mRecirculateState .value; data.mPatientConnectionState = _data.mPatientConnectionState .value; + data.mWetSelfTestsState = _data.mWetSelfTestsState .value; + data.mPreTreatmentRsrvrState = _data.mPreTreatmentRsrvrState .value; return data; }