Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) @@ -21,8 +21,6 @@ _data.mArterialPressure .value, _data.mVenousPressure .value, _data.mBloodPumpOcclusion .value, - _data.mDialysateInletPumpOcclusion .value, - _data.mDialysateOutletPumpOcclusion .value }; } @@ -31,14 +29,10 @@ if (GetValue(vByteArray, index, _data.mArterialPressure )) if (GetValue(vByteArray, index, _data.mVenousPressure )) if (GetValue(vByteArray, index, _data.mBloodPumpOcclusion )) - if (GetValue(vByteArray, index, _data.mDialysateInletPumpOcclusion )) - if (GetValue(vByteArray, index, _data.mDialysateOutletPumpOcclusion )) 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; } } /*! @@ -51,7 +45,5 @@ data.mArterialPressure = _data.mArterialPressure .value; data.mVenousPressure = _data.mVenousPressure .value; data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; - data.mDialysateInletPumpOcclusion = _data.mDialysateInletPumpOcclusion .value; - data.mDialysateOutletPumpOcclusion = _data.mDialysateOutletPumpOcclusion .value; return data; }