Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r11c9e7b76125f24a08ed6c66175af20025ac5458 -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) @@ -656,6 +656,7 @@ void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) { QVariantList mData; + mData += vData.mFinalConfirmation ; mData += vData.mTreatmentModality ; mData += vData.mHDFTreatmentMode ; mData += vData.mBloodFlowRate ; @@ -672,7 +673,6 @@ mData += vData.mRinsebackVolume ; mData += vData.mHepatitusBStatus ; mData += vData.mAcidConcentrateIndex ; - mData += vData.mFinalConfirmation ; mData += vData.mSubstitutionFluidVolume ; mData += vData.mHeparinBolusVolume ; mData += vData.mHeparinDispensingRate ; Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r11c9e7b76125f24a08ed6c66175af20025ac5458 -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) @@ -222,7 +222,7 @@ {Gui::GuiActionType::ID_AdjustInitTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Treatment Parameters Validation/Confirm {Gui::GuiActionType::ID_AdjustParametersValidationReq , 25 * 4 }, //25 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 26 * 4 }, //26 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 25 * 4 }, //25 parameters each 4bytes {Gui::GuiActionType::ID_AdjustParametersConfirmReq , 1 * 4 }, // 1 parameters each 4bytes // Pre-Treatment Water Sample {Gui::GuiActionType::ID_DGFilterFlushData , 2 * 4 }, // 2 parameters each 4bytes Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -r11c9e7b76125f24a08ed6c66175af20025ac5458 -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) @@ -35,7 +35,6 @@ _data.mRinsebackVolumeRejectionReason .value, _data.mHepatitusBStatusRejectionReason .value, _data.mAcidConcentrateIndexRejectionReason .value, - _data.mFinalConfirmationRejectionReason .value, _data.mSubstitutionFluidVolumeRejectionReason .value, _data.mHeparinBolusVolumeRejectionReason .value, _data.mHeparinDispensingRateRejectionReason .value, @@ -66,7 +65,6 @@ if ( ! GetValue(vByteArray, index, _data.mRinsebackVolumeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHepatitusBStatusRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateIndexRejectionReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mFinalConfirmationRejectionReason )) 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; Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h =================================================================== diff -u -r11c9e7b76125f24a08ed6c66175af20025ac5458 -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) @@ -52,15 +52,14 @@ * | #15:(U32) | \ref Data::mRinsebackVolumeRejectionReason | * | #16:(U32) | \ref Data::mHepatitusBStatusRejectionReason | * | #17:(U32) | \ref Data::mAcidConcentrateIndexRejectionReason | - * | #18:(U32) | \ref Data::mFinalConfirmationRejectionReason | - * | #19:(U32) | \ref Data::mSubstitutionFluidVolumeRejectionReason | - * | #20:(U32) | \ref Data::mHeparinBolusVolumeRejectionReason | - * | #21:(U32) | \ref Data::mHeparinDispensingRateRejectionReason | - * | #22:(U32) | \ref Data::mDialysateTempRejectionReason | - * | #23:(U32) | \ref Data::mAcidConcentrateConversionFactorRejectionReason | - * | #24:(U32) | \ref Data::mUFPreWeightRejectionReason | - * | #25:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | - * | #26:(U32) | \ref Data::mUFVolumeRejectionReason | + * | #18:(U32) | \ref Data::mSubstitutionFluidVolumeRejectionReason | + * | #19:(U32) | \ref Data::mHeparinBolusVolumeRejectionReason | + * | #20:(U32) | \ref Data::mHeparinDispensingRateRejectionReason | + * | #21:(U32) | \ref Data::mDialysateTempRejectionReason | + * | #22:(U32) | \ref Data::mAcidConcentrateConversionFactorRejectionReason | + * | #23:(U32) | \ref Data::mUFPreWeightRejectionReason | + * | #24:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | + * | #25:(U32) | \ref Data::mUFVolumeRejectionReason | * \sa Data * @@ -96,7 +95,6 @@ Types::U32 mRinsebackVolumeRejectionReason ; Types::U32 mHepatitusBStatusRejectionReason ; Types::U32 mAcidConcentrateIndexRejectionReason ; - Types::U32 mFinalConfirmationRejectionReason ; Types::U32 mSubstitutionFluidVolumeRejectionReason ; Types::U32 mHeparinBolusVolumeRejectionReason ; Types::U32 mHeparinDispensingRateRejectionReason ; @@ -131,7 +129,6 @@ quint32 mRinsebackVolumeRejectionReason = 0; quint32 mHepatitusBStatusRejectionReason = 0; quint32 mAcidConcentrateIndexRejectionReason = 0; - quint32 mFinalConfirmationRejectionReason = 0; quint32 mSubstitutionFluidVolumeRejectionReason = 0; quint32 mHeparinBolusVolumeRejectionReason = 0; quint32 mHeparinDispensingRateRejectionReason = 0; Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r11c9e7b76125f24a08ed6c66175af20025ac5458 -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) @@ -72,23 +72,23 @@ * * | Payload || * | || - * | #01:(U32) | \ref mTreatmentModality | - * | #02:(U32) | \ref mHDFTreatmentMode | - * | #03:(U32) | \ref mBloodFlowRate | - * | #04:(U32) | \ref mDialysateFlowRate | - * | #05:(U32) | \ref mTreatmentDuration | - * | #06:(U32) | \ref mHeparinDeliveryDuration | - * | #07:(U32) | \ref mHeparinType | - * | #08:(U32) | \ref mDryBicarbCartSize | - * | #09:(U32) | \ref mSodium | - * | #10:(U32) | \ref mBicarbonate | - * | #11:(U32) | \ref mDialyzerType | - * | #12:(U32) | \ref mFluidBolusVolume | - * | #13:(U32) | \ref mBloodPressureMeasureInterval | - * | #14:(U32) | \ref mRinsebackVolume | - * | #15:(U32) | \ref mHepatitusBStatus | - * | #16:(U32) | \ref mAcidConcentrateIndex | - * | #17:(U32) | \ref mFinalConfirmation | + * | #01:(U32) | \ref mFinalConfirmation | + * | #02:(U32) | \ref mTreatmentModality | + * | #03:(U32) | \ref mHDFTreatmentMode | + * | #04:(U32) | \ref mBloodFlowRate | + * | #05:(U32) | \ref mDialysateFlowRate | + * | #06:(U32) | \ref mTreatmentDuration | + * | #07:(U32) | \ref mHeparinDeliveryDuration | + * | #08:(U32) | \ref mHeparinType | + * | #09:(U32) | \ref mDryBicarbCartSize | + * | #10:(U32) | \ref mSodium | + * | #11:(U32) | \ref mBicarbonate | + * | #12:(U32) | \ref mDialyzerType | + * | #13:(U32) | \ref mFluidBolusVolume | + * | #14:(U32) | \ref mBloodPressureMeasureInterval | + * | #15:(U32) | \ref mRinsebackVolume | + * | #16:(U32) | \ref mHepatitusBStatus | + * | #17:(U32) | \ref mAcidConcentrateIndex | * | #18:(F32) | \ref mSubstitutionFluidVolume | * | #19:(F32) | \ref mHeparinBolusVolume | * | #20:(F32) | \ref mHeparinDispensingRate | @@ -102,6 +102,7 @@ */ class MAdjustParametersValidationReq : public MModel { public: + quint32 mFinalConfirmation = 0; // flag quint32 mTreatmentModality = 0; // quint32 mHDFTreatmentMode = 0; // quint32 mBloodFlowRate = 0; // mL/min @@ -118,7 +119,6 @@ quint32 mRinsebackVolume = 0; // mL quint32 mHepatitusBStatus = 0; // quint32 mAcidConcentrateIndex = 0; // - quint32 mFinalConfirmation = 0; // flag float mSubstitutionFluidVolume = 0; // L float mHeparinBolusVolume = 0; // mL float mHeparinDispensingRate = 0; // mL/hr @@ -130,6 +130,7 @@ QString toString() { return toString({ + mFinalConfirmation , mTreatmentModality , mHDFTreatmentMode , mBloodFlowRate , @@ -146,7 +147,6 @@ mRinsebackVolume , mHepatitusBStatus , mAcidConcentrateIndex , - mFinalConfirmation , mSubstitutionFluidVolume , mHeparinBolusVolume , mHeparinDispensingRate , Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r11c9e7b76125f24a08ed6c66175af20025ac5458 -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) @@ -41,7 +41,7 @@ void VTreatmentCreate::doValidation() { AdjustParametersValidationRequestData data; - + data.mFinalConfirmation = _finalConfirmation ; data.mTreatmentModality = _treatmentModality ; data.mHDFTreatmentMode = _hdfTreatmentMode ; data.mBloodFlowRate = _bloodFlowRate ; @@ -58,7 +58,6 @@ data.mRinsebackVolume = _rinsebackVolume ; data.mHepatitusBStatus = _hepatitusBStatus ; data.mAcidConcentrateIndex = _acidConcentrate ; - data.mFinalConfirmation = _finalConfirmation ; data.mSubstitutionFluidVolume = _substitutionFluidVolume ; data.mHeparinBolusVolume = _heparinBolusVolume ; data.mHeparinDispensingRate = _heparinDispensingRate ; @@ -133,7 +132,6 @@ rinsebackVolumeRejectReason (data.mRinsebackVolumeRejectionReason ); hepatitusBStatusRejectReason (data.mHepatitusBStatusRejectionReason ); acidConcentrateIndexRejectionReason (data.mAcidConcentrateIndexRejectionReason ); - finalConfirmationRejectionReason (data.mFinalConfirmationRejectionReason ); substitutionFluidVolumeRejectReason (data.mSubstitutionFluidVolumeRejectionReason ); heparinBolusVolumeRejectReason (data.mHeparinBolusVolumeRejectionReason ); heparinDispensingRateRejectReason (data.mHeparinDispensingRateRejectionReason ); Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r1413a8547193b66d3ad76243fea9d94bd2865483 -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 1413a8547193b66d3ad76243fea9d94bd2865483) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) @@ -136,7 +136,6 @@ TRIGGER(quint32 , ufPreWeightRejectionReason , 0) TRIGGER(quint32 , ufEstimatedTargetWeightRejectionReason , 0) TRIGGER(quint32 , acidConcentrateIndexRejectionReason , 0) - TRIGGER(quint32 , finalConfirmationRejectionReason , 0) VIEW_DEC_CLASS(VTreatmentCreate) VIEW_DEC_SLOT(AdjustParametersValidationResponseData)