Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rf2e4eba6e85c5d36537be782926f23cc9dc01037 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) @@ -18,75 +18,81 @@ QVariantList MAdjustParametersValidationResponse::parameters() const { return { - _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 + _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.mTrancembrncPressureLimitWindowRejectReason .value, + _data.mDialysateTempRejectReason .value, + _data.mHeparinDispensingRateRejectReason .value, + _data.mHeparinBolusVolumeRejectReason .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.mBloodFlowRate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHeparinStopTime )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mSalineBolus )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mAcidConcentrate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialyzerType )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHeparinType )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodPressureMeasureInterval )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRinsebackFlowRate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialPressureLimitWindow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitWindow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrc )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHeparinDispensingRate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolume )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialysateTemp )) goto lError; + 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.mTrancembrncPressureLimitWindowRejectReason )) 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; return true ; - + lError: if(vIndex) { *vIndex = index; } - + return false ; } MAdjustParametersValidationResponse::Data MAdjustParametersValidationResponse::data() const { Data data; - 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; + 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.mTrancembrncPressureLimitWindowRejectReason = _data.mTrancembrncPressureLimitWindowRejectReason .value; + data.mDialysateTempRejectReason = _data.mDialysateTempRejectReason .value; + data.mHeparinDispensingRateRejectReason = _data.mHeparinDispensingRateRejectReason .value; + data.mHeparinBolusVolumeRejectReason = _data.mHeparinBolusVolumeRejectReason .value; return data; }