Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 4f14c2ecfcd0c6b0c526f266c584f566b0b53eb5) @@ -26,6 +26,10 @@ _data.mArterialLimitHigh .value, _data.mVenousLimitLow .value, _data.mVenousLimitHigh .value, + _data.mArtLongFilter .value, + _data.mVenousLongFilter .value, + _data.mBloodOcclLongFilter .value, + _data.mPartialOcclBaseline .value, }; } @@ -39,6 +43,10 @@ if (GetValue(vByteArray, index, _data.mArterialLimitHigh )) if (GetValue(vByteArray, index, _data.mVenousLimitLow )) if (GetValue(vByteArray, index, _data.mVenousLimitHigh )) + if (GetValue(vByteArray, index, _data.mArtLongFilter )) + if (GetValue(vByteArray, index, _data.mVenousLongFilter )) + if (GetValue(vByteArray, index, _data.mBloodOcclLongFilter )) + if (GetValue(vByteArray, index, _data.mPartialOcclBaseline )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -48,6 +56,10 @@ 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; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -57,13 +69,17 @@ */ MPressureOcclusion::Data MPressureOcclusion::data() const { Data data; - data.mArterialPressure = _data.mArterialPressure .value; - data.mVenousPressure = _data.mVenousPressure .value; - data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; - data.mPressureLimitState = _data.mPressureLimitState .value; - data.mArterialLimitLow = _data.mArterialLimitLow .value; - data.mArterialLimitHigh = _data.mArterialLimitHigh .value; - data.mVenousLimitLow = _data.mVenousLimitLow .value; - data.mVenousLimitHigh = _data.mVenousLimitHigh .value; + data.mArterialPressure = _data.mArterialPressure .value; + data.mVenousPressure = _data.mVenousPressure .value; + data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .value; + data.mPressureLimitState = _data.mPressureLimitState .value; + data.mArterialLimitLow = _data.mArterialLimitLow .value; + data.mArterialLimitHigh = _data.mArterialLimitHigh .value; + data.mVenousLimitLow = _data.mVenousLimitLow .value; + data.mVenousLimitHigh = _data.mVenousLimitHigh .value; + data.mArtLongFilter = _data.mArtLongFilter .value; + data.mVenousLongFilter = _data.mVenousLongFilter .value; + data.mBloodOcclLongFilter = _data.mBloodOcclLongFilter .value; + data.mPartialOcclBaseline = _data.mPartialOcclBaseline .value; return data; }