Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -rb1462640e36df3f567c42aa8c8cbd6dafe865625 -r56381aae237db191956aff493907cd1f0801216b --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 56381aae237db191956aff493907cd1f0801216b) @@ -19,50 +19,56 @@ QVariantList MAdjustParametersValidationResponse::parameters() const { return { _data.mAccepted .value, - _data.mBloodFlowRateRejectReason .value, - _data.mDialysateFlowRateRejectReason .value, - _data.mTreatmentDurationRejectReason .value, - _data.mSalineBolusVolumeRejectReason .value, - _data.mHeparinStopTimeRejectReason .value, - _data.mHeparinTypeRejectReason .value, - _data.mAcidConcentrateRejectReason .value, - _data.mBicarbonateConcentrateRejectReason .value, - _data.mDialyzerTypeRejectReason .value, - _data.mBloodPressureMeasureIntervalRejectReason .value, - _data.mRinsebackFlowRateRejectReason .value, - _data.mRinsebackVolumeRejectReason .value, - _data.mArterialPressureLimitWindowRejectReason .value, - _data.mVenousPressureLimitWindowRejectReason .value, - _data.mVenousPressureLimitAsymtrcRejectReason .value, - _data.mTransmembranePressureLimitWindowRejectReason .value, - _data.mDialysateTempRejectReason .value, - _data.mHeparinDispensingRateRejectReason .value, - _data.mHeparinBolusVolumeRejectReason .value + _data.mTreatmentModalityRejectionReason .value, + _data.mHDFTreatmentModeRejectionReason .value, + _data.mBloodFlowRateRejectionReason .value, + _data.mDialysateFlowRateRejectionReason .value, + _data.mTreatmentDurationRejectionReason .value, + _data.mHeparinDeliveryDurationRejectionReason .value, + _data.mHeparinTypeRejectionReason .value, + _data.mDryBicarbCartSizeRejectionReason .value, + _data.mSodiumRejectionReason .value, + _data.mBicarbonateRejectionReason .value, + _data.mDialyzerTypeRejectionReason .value, + _data.mFluidBolusVolumeRejectionReason .value, + _data.mBloodPressureMeasureIntervalRejectionReason .value, + _data.mPrimeDiscardVolumeRejectionReason .value, + _data.mRinsebackVolumeRejectionReason .value, + _data.mHepatitusBStatusRejectionReason .value, + _data.mSubstitutionFluidVolumeRejectionReason .value, + _data.mHeparinBolusVolumeRejectionReason .value, + _data.mHeparinDispensingRateRejectionReason .value, + _data.mDialysateTempRejectionReason .value, + _data.mPotassiumRejectionReason .value, + _data.mCalciumRejectionReason .value }; } bool MAdjustParametersValidationResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodFlowRateRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRateRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTreatmentDurationRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mSalineBolusVolumeRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHeparinStopTimeRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHeparinTypeRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrateRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialyzerTypeRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodPressureMeasureIntervalRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRinsebackFlowRateRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRinsebackVolumeRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialPressureLimitWindowRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitWindowRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrcRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTransmembranePressureLimitWindowRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialysateTempRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHeparinDispensingRateRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolumeRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTreatmentModalityRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHDFTreatmentModeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodFlowRateRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRateRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTreatmentDurationRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveryDurationRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinTypeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDryBicarbCartSizeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSodiumRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbonateRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialyzerTypeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFluidBolusVolumeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodPressureMeasureIntervalRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPrimeDiscardVolumeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mRinsebackVolumeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHepatitusBStatusRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSubstitutionFluidVolumeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolumeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinDispensingRateRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateTempRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPotassiumRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalciumRejectionReason )) goto lError; return true ; @@ -75,24 +81,27 @@ MAdjustParametersValidationResponse::Data MAdjustParametersValidationResponse::data() const { Data data; data.mAccepted = _data.mAccepted .value; - data.mBloodFlowRateRejectReason = _data.mBloodFlowRateRejectReason .value; - data.mDialysateFlowRateRejectReason = _data.mDialysateFlowRateRejectReason .value; - data.mTreatmentDurationRejectReason = _data.mTreatmentDurationRejectReason .value; - data.mSalineBolusVolumeRejectReason = _data.mSalineBolusVolumeRejectReason .value; - data.mHeparinStopTimeRejectReason = _data.mHeparinStopTimeRejectReason .value; - data.mHeparinTypeRejectReason = _data.mHeparinTypeRejectReason .value; - data.mAcidConcentrateRejectReason = _data.mAcidConcentrateRejectReason .value; - data.mBicarbonateConcentrateRejectReason = _data.mBicarbonateConcentrateRejectReason .value; - data.mDialyzerTypeRejectReason = _data.mDialyzerTypeRejectReason .value; - data.mBloodPressureMeasureIntervalRejectReason = _data.mBloodPressureMeasureIntervalRejectReason .value; - data.mRinsebackFlowRateRejectReason = _data.mRinsebackFlowRateRejectReason .value; - data.mRinsebackVolumeRejectReason = _data.mRinsebackVolumeRejectReason .value; - data.mArterialPressureLimitWindowRejectReason = _data.mArterialPressureLimitWindowRejectReason .value; - data.mVenousPressureLimitWindowRejectReason = _data.mVenousPressureLimitWindowRejectReason .value; - data.mVenousPressureLimitAsymtrcRejectReason = _data.mVenousPressureLimitAsymtrcRejectReason .value; - data.mTransmembranePressureLimitWindowRejectReason = _data.mTransmembranePressureLimitWindowRejectReason .value; - data.mDialysateTempRejectReason = _data.mDialysateTempRejectReason .value; - data.mHeparinDispensingRateRejectReason = _data.mHeparinDispensingRateRejectReason .value; - data.mHeparinBolusVolumeRejectReason = _data.mHeparinBolusVolumeRejectReason .value; + data.mTreatmentModalityRejectionReason = _data.mTreatmentModalityRejectionReason .value; + data.mHDFTreatmentModeRejectionReason = _data.mHDFTreatmentModeRejectionReason .value; + data.mBloodFlowRateRejectionReason = _data.mBloodFlowRateRejectionReason .value; + data.mDialysateFlowRateRejectionReason = _data.mDialysateFlowRateRejectionReason .value; + data.mTreatmentDurationRejectionReason = _data.mTreatmentDurationRejectionReason .value; + data.mHeparinDeliveryDurationRejectionReason = _data.mHeparinDeliveryDurationRejectionReason .value; + data.mHeparinTypeRejectionReason = _data.mHeparinTypeRejectionReason .value; + data.mDryBicarbCartSizeRejectionReason = _data.mDryBicarbCartSizeRejectionReason .value; + data.mSodiumRejectionReason = _data.mSodiumRejectionReason .value; + data.mBicarbonateRejectionReason = _data.mBicarbonateRejectionReason .value; + data.mDialyzerTypeRejectionReason = _data.mDialyzerTypeRejectionReason .value; + data.mFluidBolusVolumeRejectionReason = _data.mFluidBolusVolumeRejectionReason .value; + data.mBloodPressureMeasureIntervalRejectionReason = _data.mBloodPressureMeasureIntervalRejectionReason .value; + data.mPrimeDiscardVolumeRejectionReason = _data.mPrimeDiscardVolumeRejectionReason .value; + data.mRinsebackVolumeRejectionReason = _data.mRinsebackVolumeRejectionReason .value; + data.mHepatitusBStatusRejectionReason = _data.mHepatitusBStatusRejectionReason .value; + data.mSubstitutionFluidVolumeRejectionReason = _data.mSubstitutionFluidVolumeRejectionReason .value; + data.mHeparinBolusVolumeRejectionReason = _data.mHeparinBolusVolumeRejectionReason .value; + data.mHeparinDispensingRateRejectionReason = _data.mHeparinDispensingRateRejectionReason .value; + data.mDialysateTempRejectionReason = _data.mDialysateTempRejectionReason .value; + data.mPotassiumRejectionReason = _data.mPotassiumRejectionReason .value; + data.mCalciumRejectionReason = _data.mCalciumRejectionReason .value; return data; }