Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -18,29 +18,31 @@ QVariantList MAdjustParametersValidationResponse::parameters() const { return { - _data.mAccepted .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 + _data.mAccepted .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.mAcidConcentrateConversionFactorRejectionReason .value, + _data.mUFVolumeRejectionReason .value, + _data.mUFPreWeightRejectionReason .value, + _data.mUFEstimatedTargetWeightRejectionReason .value }; } @@ -67,8 +69,10 @@ 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; + if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateConversionFactorRejectionReason)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolumeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFPreWeightRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFEstimatedTargetWeightRejectionReason )) goto lError; return true ; @@ -101,7 +105,9 @@ 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; + data.mAcidConcentrateConversionFactorRejectionReason = _data.mAcidConcentrateConversionFactorRejectionReason .value; + data.mUFVolumeRejectionReason = _data.mUFVolumeRejectionReason .value; + data.mUFPreWeightRejectionReason = _data.mUFPreWeightRejectionReason .value; + data.mUFEstimatedTargetWeightRejectionReason = _data.mUFEstimatedTargetWeightRejectionReason .value; return data; }