Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -rcf61c7736f11f4b75a4e2df803f29bdc7769db53 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision cf61c7736f11f4b75a4e2df803f29bdc7769db53) @@ -18,21 +18,36 @@ QVariantList MPressureOcclusion::parameters() const { return { - _data.mArterialPressure .value, - _data.mVenousPressure .value, - _data.mBloodPumpOcclusion .value, + _data.mArterialPressure .value, + _data.mVenousPressure .value, + _data.mBloodPumpOcclusion .value, + _data.mPressureLimitState .value, + _data.mArterialLimitLow .value, + _data.mArterialLimitHigh .value, + _data.mVenousLimitLow .value, + _data.mVenousLimitHigh .value, }; } bool MPressureOcclusion::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mArterialPressure )) - if (GetValue(vByteArray, index, _data.mVenousPressure )) - if (GetValue(vByteArray, index, _data.mBloodPumpOcclusion )) + if (GetValue(vByteArray, index, _data.mArterialPressure )) + if (GetValue(vByteArray, index, _data.mVenousPressure )) + if (GetValue(vByteArray, index, _data.mBloodPumpOcclusion )) + if (GetValue(vByteArray, index, _data.mPressureLimitState )) + if (GetValue(vByteArray, index, _data.mArterialLimitLow )) + if (GetValue(vByteArray, index, _data.mArterialLimitHigh )) + if (GetValue(vByteArray, index, _data.mVenousLimitLow )) + if (GetValue(vByteArray, index, _data.mVenousLimitHigh )) 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -42,8 +57,13 @@ */ MPressureOcclusion::Data MPressureOcclusion::data() const { Data data; - data.mArterialPressure = _data.mArterialPressure .value; - data.mVenousPressure = _data.mVenousPressure .value; - data.mBloodPumpOcclusion = _data.mBloodPumpOcclusion .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; return data; }