Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rcf61c7736f11f4b75a4e2df803f29bdc7769db53 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp (.../MTreatmentAdjustPressuresLimitsResponse.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp (.../MTreatmentAdjustPressuresLimitsResponse.cpp) (revision cf61c7736f11f4b75a4e2df803f29bdc7769db53) @@ -18,30 +18,27 @@ QVariantList MAdjustPressuresLimitsResponse::parameters() const { return { - _data.mAccepted .value, - _data.mReason .value, - _data.mArterialLimitLow .value, - _data.mArterialLimitHigh .value, - _data.mVenousLimitLow .value, - _data.mVenousLimitHigh .value + _data.mAccepted .value, + _data.mReason .value, + _data.mArterialPressureLimitWindow .value, + _data.mVenousPressureLimitWindow .value, + _data.mVenousPressureLimitAsymtrc .value }; } bool MAdjustPressuresLimitsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mAccepted )) - if (GetValue(vByteArray, index, _data.mReason )) - if (GetValue(vByteArray, index, _data.mArterialLimitLow )) - if (GetValue(vByteArray, index, _data.mArterialLimitHigh )) - if (GetValue(vByteArray, index, _data.mVenousLimitLow )) - if (GetValue(vByteArray, index, _data.mVenousLimitHigh )) + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mReason )) + if (GetValue(vByteArray, index, _data.mArterialPressureLimitWindow )) + if (GetValue(vByteArray, index, _data.mVenousPressureLimitWindow )) + if (GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrc )) 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; } } /*! @@ -51,11 +48,10 @@ */ AdjustPressuresLimitsResponseData MAdjustPressuresLimitsResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; - data.mArterialLimitLow = _data.mArterialLimitLow .value; - data.mArterialLimitHigh = _data.mArterialLimitHigh .value; - data.mVenousLimitLow = _data.mVenousLimitLow .value; - data.mVenousLimitHigh = _data.mVenousLimitHigh .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mArterialPressureLimitWindow = _data.mArterialPressureLimitWindow .value; + data.mVenousPressureLimitWindow = _data.mVenousPressureLimitWindow .value; + data.mVenousPressureLimitAsymtrc = _data.mVenousPressureLimitAsymtrc .value; return data; }