Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) @@ -18,35 +18,35 @@ QVariantList MPressureOcclusion::parameters() const { return { - _data.mArterialPressure .value, - _data.mVenousPressure .value, - _data.mBloodPumpOcclusion .value, - _data.mPressureLimitState .value, - _data.mArterialLimitLow .value, - _data.mArterialLimitHigh .value, - _data.mVenousLimitLow .value, - _data.mVenousLimitHigh .value, - _data.mArtLongFilter .value, - _data.mVenousLongFilter .value, - _data.mBloodOcclLongFilter .value, - _data.mPartialOcclBaseline .value, + _data.mArterialPressure .value, + _data.mVenousPressure .value, + _data.mLimitState .value, + _data.mArterialMin .value, + _data.mArterialMax .value, + _data.mVenousMin .value, + _data.mVenousMax .value, + _data.mArterialLongFilter .value, + _data.mVenousLongFilter .value, + _data.mTmpPressure .value, + _data.mTmpMin .value, + _data.mTmpMax .value, }; } bool MPressureOcclusion::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mArterialPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodPumpOcclusion )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPressureLimitState )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialLimitLow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialLimitHigh )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousLimitLow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousLimitHigh )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArtLongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousLongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodOcclLongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPartialOcclBaseline )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mLimitState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialMin )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialMax )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousMin )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousMax )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialLongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousLongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTmpPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTmpMin )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTmpMax )) goto lError; return true ; @@ -63,17 +63,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.mArtLongFilter = _data.mArtLongFilter .value; - data.mVenousLongFilter = _data.mVenousLongFilter .value; - data.mBloodOcclLongFilter = _data.mBloodOcclLongFilter .value; - data.mPartialOcclBaseline = _data.mPartialOcclBaseline .value; + data.mArterialPressure = _data.mArterialPressure .value; + data.mVenousPressure = _data.mVenousPressure .value; + data.mLimitState = _data.mLimitState .value; + data.mArterialMin = _data.mArterialMin .value; + data.mArterialMax = _data.mArterialMax .value; + data.mVenousMin = _data.mVenousMin .value; + data.mVenousMax = _data.mVenousMax .value; + data.mArterialLongFilter = _data.mArterialLongFilter .value; + data.mVenousLongFilter = _data.mVenousLongFilter .value; + data.mTmpPressure = _data.mTmpPressure .value; + data.mTmpMin = _data.mTmpMin .value; + data.mTmpMax = _data.mTmpMax .value; return data; }