Index: sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r1f2e7dbd08b00f8c56eedf29f083733570aa642e --- sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp (.../MPreTreatmentStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp (.../MPreTreatmentStatesData.cpp) (revision 1f2e7dbd08b00f8c56eedf29f083733570aa642e) @@ -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; }