Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -r5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7 -r38ae7b93679d05a54fc460dac68891562d7da72d --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 5d142e2ec2aa4bdfd2567eb521c7208f76e16ae7) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file MTreatmentPressureOcclusionData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 11-Apr-2021 + * \author (last) Dara Navaei + * \date (last) 03-May-2024 * \author (original) Behrouz NematiPour * \date (original) 11-Apr-2021 * @@ -18,21 +18,48 @@ 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, + _data.mArtLongFilter .value, + _data.mVenousLongFilter .value, + _data.mBloodOcclLongFilter .value, + _data.mPartialOcclBaseline .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 )) + 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; } 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; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -42,8 +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.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; }