Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -r80250cfdbe58a3df17950d342212f155d52d3971 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 80250cfdbe58a3df17950d342212f155d52d3971) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 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 MTreatmentParametersResp.cpp - * \author (last) Peter Lucia - * \date (last) 14-Oct-2020 - * \author (original) Peter Lucia - * \date (original) 08-Sep-2020 + * \file MPreTreatmentAdjustParametersValidationResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 31-May-2023 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 * */ #include "MPreTreatmentAdjustParametersValidationResponse.h" @@ -18,49 +18,47 @@ QVariantList MAdjustParametersValidationResponse::parameters() const { return { - _data.mAccepted .value, - _data.bloodFlowRate .value, - _data.dialysateFlowRate .value, - _data.duration .value, - _data.heparinStopTime .value, - _data.salineBolus .value, - _data.acidConcentrate .value, - _data.bicarbonateConcentrate .value, - _data.dialyzerType .value, - _data.heparinType .value, - _data.bloodPressureMeasureInterval .value, - _data.rinsebackFlowRate .value, - _data.arterialPressureLimitLow .value, - _data.arterialPressureLimitHigh .value, - _data.venousPressureLimitLow .value, - _data.venousPressureLimitHigh .value, - _data.heparinDispensingRate .value, - _data.heparinBolusVolume .value, - _data.dialysateTemp .value + _data.mAccepted .value, + _data.mBloodFlowRate .value, + _data.mDialysateFlowRate .value, + _data.mDuration .value, + _data.mHeparinStopTime .value, + _data.mSalineBolus .value, + _data.mAcidConcentrate .value, + _data.mBicarbonateConcentrate .value, + _data.mDialyzerType .value, + _data.mHeparinType .value, + _data.mBloodPressureMeasureInterval .value, + _data.mRinsebackFlowRate .value, + _data.mArterialPressureLimitWindow .value, + _data.mVenousPressureLimitWindow .value, + _data.mVenousPressureLimitAsymtrc .value, + _data.mHeparinDispensingRate .value, + _data.mHeparinBolusVolume .value, + _data.mDialysateTemp .value }; } bool MAdjustParametersValidationResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mAccepted )) - if (GetValue(vByteArray, index, _data.bloodFlowRate )) - if (GetValue(vByteArray, index, _data.dialysateFlowRate )) - if (GetValue(vByteArray, index, _data.duration )) - if (GetValue(vByteArray, index, _data.heparinStopTime )) - if (GetValue(vByteArray, index, _data.salineBolus )) - if (GetValue(vByteArray, index, _data.acidConcentrate )) - if (GetValue(vByteArray, index, _data.bicarbonateConcentrate )) - if (GetValue(vByteArray, index, _data.dialyzerType )) - if (GetValue(vByteArray, index, _data.heparinType )) - if (GetValue(vByteArray, index, _data.bloodPressureMeasureInterval )) - if (GetValue(vByteArray, index, _data.rinsebackFlowRate )) - if (GetValue(vByteArray, index, _data.arterialPressureLimitLow )) - if (GetValue(vByteArray, index, _data.arterialPressureLimitHigh )) - if (GetValue(vByteArray, index, _data.venousPressureLimitLow )) - if (GetValue(vByteArray, index, _data.venousPressureLimitHigh )) - if (GetValue(vByteArray, index, _data.heparinDispensingRate )) - if (GetValue(vByteArray, index, _data.heparinBolusVolume )) - if (GetValue(vByteArray, index, _data.dialysateTemp )) + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mBloodFlowRate )) + if (GetValue(vByteArray, index, _data.mDialysateFlowRate )) + if (GetValue(vByteArray, index, _data.mDuration )) + if (GetValue(vByteArray, index, _data.mHeparinStopTime )) + if (GetValue(vByteArray, index, _data.mSalineBolus )) + if (GetValue(vByteArray, index, _data.mAcidConcentrate )) + if (GetValue(vByteArray, index, _data.mBicarbonateConcentrate )) + if (GetValue(vByteArray, index, _data.mDialyzerType )) + if (GetValue(vByteArray, index, _data.mHeparinType )) + if (GetValue(vByteArray, index, _data.mBloodPressureMeasureInterval )) + if (GetValue(vByteArray, index, _data.mRinsebackFlowRate )) + if (GetValue(vByteArray, index, _data.mArterialPressureLimitWindow )) + if (GetValue(vByteArray, index, _data.mVenousPressureLimitWindow )) + if (GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrc )) + if (GetValue(vByteArray, index, _data.mHeparinDispensingRate )) + if (GetValue(vByteArray, index, _data.mHeparinBolusVolume )) + if (GetValue(vByteArray, index, _data.mDialysateTemp )) return true; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -80,29 +78,27 @@ 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; } } MAdjustParametersValidationResponse::Data MAdjustParametersValidationResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.bloodFlowRate = _data.bloodFlowRate .value; - data.dialysateFlowRate = _data.dialysateFlowRate .value; - data.duration = _data.duration .value; - data.heparinStopTime = _data.heparinStopTime .value; - data.salineBolus = _data.salineBolus .value; - data.acidConcentrate = _data.acidConcentrate .value; - data.bicarbonateConcentrate = _data.bicarbonateConcentrate .value; - data.dialyzerType = _data.dialyzerType .value; - data.heparinType = _data.heparinType .value; - data.bloodPressureMeasureInterval = _data.bloodPressureMeasureInterval .value; - data.rinsebackFlowRate = _data.rinsebackFlowRate .value; - data.arterialPressureLimitLow = _data.arterialPressureLimitLow .value; - data.arterialPressureLimitHigh = _data.arterialPressureLimitHigh .value; - data.venousPressureLimitLow = _data.venousPressureLimitLow .value; - data.venousPressureLimitHigh = _data.venousPressureLimitHigh .value; - data.heparinDispensingRate = _data.heparinDispensingRate .value; - data.heparinBolusVolume = _data.heparinBolusVolume .value; - data.dialysateTemp = _data.dialysateTemp .value; + data.mAccepted = _data.mAccepted .value; + data.mBloodFlowRate = _data.mBloodFlowRate .value; + data.mDialysateFlowRate = _data.mDialysateFlowRate .value; + data.mDuration = _data.mDuration .value; + data.mHeparinStopTime = _data.mHeparinStopTime .value; + data.mSalineBolus = _data.mSalineBolus .value; + data.mAcidConcentrate = _data.mAcidConcentrate .value; + data.mBicarbonateConcentrate = _data.mBicarbonateConcentrate .value; + data.mDialyzerType = _data.mDialyzerType .value; + data.mHeparinType = _data.mHeparinType .value; + data.mBloodPressureMeasureInterval = _data.mBloodPressureMeasureInterval .value; + data.mRinsebackFlowRate = _data.mRinsebackFlowRate .value; + data.mArterialPressureLimitWindow = _data.mArterialPressureLimitWindow .value; + data.mVenousPressureLimitWindow = _data.mVenousPressureLimitWindow .value; + data.mVenousPressureLimitAsymtrc = _data.mVenousPressureLimitAsymtrc .value; + data.mHeparinDispensingRate = _data.mHeparinDispensingRate .value; + data.mHeparinBolusVolume = _data.mHeparinBolusVolume .value; + data.mDialysateTemp = _data.mDialysateTemp .value; return data; }