Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rd929dd86763aece93f6248d34b41bfe64a7ced28 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision d929dd86763aece93f6248d34b41bfe64a7ced28) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -155,29 +155,29 @@ // ---- {Gui::GuiActionType::ID_AdjustBolusVolumeReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustBolusVolumeRsp , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustBolusVolumeRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustDurationEditReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustDurationEditRsp , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_AdjustDurationConfirmReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustDurationConfirmRsp , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDurationConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustSetPointsReq , 5 * 4 }, // 5 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustSetPointsRsp , 7 * 4 }, // 7 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustSetPointsRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustBloodFlowRateReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustBloodFlowRateRsp , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustBloodFlowRateRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustDialysateFlowRateReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustDialysateFlowRateRsp , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDialysateFlowRateRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustDialysateTemperatureReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustDialysateTemperatureRsp , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustDialysateTemperatureRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq , 1 * 4 }, // 1 parameter each 4bytes @@ -189,11 +189,11 @@ // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_AdjustPressuresLimitsReq , 4 * 4 }, // 4 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 6 * 4 }, // 6 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment // Create Parameters Index: sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp (.../MTreatmentAdjustBloodFlowRateResponse.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp (.../MTreatmentAdjustBloodFlowRateResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -20,15 +20,13 @@ return { _data.mAccepted .value, _data.mReason .value, - _data.mBloodFlowRate .value, }; } bool MAdjustBloodFlowRateResponse::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.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate )) goto lError; return true ; @@ -47,6 +45,5 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; - data.mBloodFlowRate = _data.mBloodFlowRate .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h =================================================================== diff -u -r3000579296b1baa02f21dbe44e27f1c7e56e3821 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h (.../MTreatmentAdjustBloodFlowRateResponse.h) (revision 3000579296b1baa02f21dbe44e27f1c7e56e3821) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h (.../MTreatmentAdjustBloodFlowRateResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -38,7 +38,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mBloodFlowRate | * * \sa Data * \sa MAdjustBloodFlowRateReq : BloodFlowRate Bolus Request @@ -62,7 +61,6 @@ struct { Types::U32 mAccepted ; Types::U32 mReason ; - Types::U32 mBloodFlowRate ; } _data; public: @@ -74,7 +72,6 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mBloodFlowRate = 0; /*!< Blood Flow Rate value of type quint32 extracted out */ }; MAdjustBloodFlowRateResponse () { } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp (.../MTreatmentAdjustBolusVolumeResponse.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp (.../MTreatmentAdjustBolusVolumeResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -20,15 +20,13 @@ return { _data.mAccepted .value, _data.mReason .value, - _data.mBolusVolume .value, }; } bool MAdjustBolusVolumeResponse::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.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBolusVolume )) goto lError; return true ; @@ -47,6 +45,5 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; - data.mBolusVolume = _data.mBolusVolume .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h =================================================================== diff -u -r668af9bede196ac963bc39a75575dd38cfb93548 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h (.../MTreatmentAdjustBolusVolumeResponse.h) (revision 668af9bede196ac963bc39a75575dd38cfb93548) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h (.../MTreatmentAdjustBolusVolumeResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -38,7 +38,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mBolusVolume | * * \sa Data * \sa MAdjustBolusVolumeReq : Adjust Bolus Volume Request @@ -62,7 +61,6 @@ struct { Types::U32 mAccepted ; Types::U32 mReason ; - Types::U32 mBolusVolume ; } _data; public: @@ -74,7 +72,6 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mBolusVolume = 0; /*!< Bolus Volume value of type quint32 extracted out */ }; MAdjustBolusVolumeResponse () { } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp (.../MTreatmentAdjustDialysateFlowRateResponse.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp (.../MTreatmentAdjustDialysateFlowRateResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -20,15 +20,13 @@ return { _data.mAccepted .value, _data.mReason .value, - _data.mDialysateFlowRate .value, }; } bool MAdjustDialysateFlowRateResponse::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.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate )) goto lError; return true ; @@ -47,6 +45,5 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; - data.mDialysateFlowRate = _data.mDialysateFlowRate .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h =================================================================== diff -u -r3000579296b1baa02f21dbe44e27f1c7e56e3821 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h (.../MTreatmentAdjustDialysateFlowRateResponse.h) (revision 3000579296b1baa02f21dbe44e27f1c7e56e3821) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h (.../MTreatmentAdjustDialysateFlowRateResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -38,7 +38,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mDialysateFlowRate | * * \sa Data * \sa MAdjustDialysateFlowRateReq : Adjust Dialysate Flow Rate Request @@ -62,7 +61,6 @@ struct { Types::U32 mAccepted ; Types::U32 mReason ; - Types::U32 mDialysateFlowRate ; } _data; public: @@ -74,7 +72,6 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mDialysateFlowRate = 0; /*!< Dialysate Flow Rate value of type quint32 extracted out */ }; MAdjustDialysateFlowRateResponse () { } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp (.../MTreatmentAdjustDialysateTemperatureResponse.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp (.../MTreatmentAdjustDialysateTemperatureResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -20,15 +20,13 @@ return { _data.mAccepted .value, _data.mReason .value, - _data.mDialysateTemperature .value, }; } bool MAdjustDialysateTemperatureResponse::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.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialysateTemperature )) goto lError; return true ; @@ -47,6 +45,5 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; - data.mDialysateTemperature = _data.mDialysateTemperature .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h =================================================================== diff -u -r3000579296b1baa02f21dbe44e27f1c7e56e3821 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h (.../MTreatmentAdjustDialysateTemperatureResponse.h) (revision 3000579296b1baa02f21dbe44e27f1c7e56e3821) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h (.../MTreatmentAdjustDialysateTemperatureResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -38,7 +38,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mDialysateTemperature | * * \sa Data * \sa MAdjustDialysateTemperatureReq : Adjust Dialysate Temperature Request @@ -62,7 +61,6 @@ struct { Types::U32 mAccepted ; Types::U32 mReason ; - Types::F32 mDialysateTemperature ; } _data; public: @@ -74,7 +72,6 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mDialysateTemperature = 0; /*!< Dialysate Temperature value of type quint32 extracted out */ }; MAdjustDialysateTemperatureResponse () { } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp =================================================================== diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -19,27 +19,18 @@ QString MAdjustDurationConfirmResponse::toString() const { return QString(stringPrefix + ",%1,%2,%3,%4,%5") .arg(_data.mAccepted .value) - .arg(_data.mReason .value) - .arg(_data.mDuration .value) - .arg(_data.mUFVolumeGoal .value) - .arg(_data.mUFRate .value); + .arg(_data.mReason .value); } void MAdjustDurationConfirmResponse::toVariantList(QVariantList &vData) const { vData += _data.mAccepted .value; vData += _data.mReason .value; - vData += _data.mDuration .value; - vData += _data.mUFVolumeGoal .value; - vData += _data.mUFRate .value; } bool MAdjustDurationConfirmResponse::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.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFVolumeGoal )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; return true ; @@ -59,8 +50,5 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; - data.mDuration = _data.mDuration .value; - data.mUFVolumeGoal = _data.mUFVolumeGoal .value; - data.mUFRate = _data.mUFRate .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h =================================================================== diff -u -r3000579296b1baa02f21dbe44e27f1c7e56e3821 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h (.../MTreatmentAdjustDurationConfirmResponse.h) (revision 3000579296b1baa02f21dbe44e27f1c7e56e3821) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h (.../MTreatmentAdjustDurationConfirmResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -37,10 +37,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | | | - * | #4:(U32) | \ref Data::mDuration | - * | #3:(F32) | \ref Data::mUFVolumeGoal | - * | #5:(F32) | \ref Data::mUFRate | * * \sa Data * @@ -62,20 +58,12 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - - quint32 mDuration = 0; /*!< duration value of type quint32 extracted out */ - float mUFVolumeGoal = 0; /*!< UF volume goal value of type float extracted out */ - float mUFRate = 0; /*!< UF rate value of type float extracted out */ }; protected: struct _Data { Types::U32 mAccepted ; Types::U32 mReason ; - - Types::U32 mDuration ; - Types::F32 mUFVolumeGoal ; - Types::F32 mUFRate ; } _data; public: Index: sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp (.../MTreatmentAdjustPressuresLimitsResponse.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp (.../MTreatmentAdjustPressuresLimitsResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -19,20 +19,14 @@ QVariantList MAdjustPressuresLimitsResponse::parameters() const { return { _data.mAccepted .value, - _data.mReason .value, - _data.mArterialPressureLimitWindow .value, - _data.mVenousPressureLimitWindow .value, - _data.mVenousPressureLimitAsymtrc .value + _data.mReason .value }; } bool MAdjustPressuresLimitsResponse::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.mReason )) 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; return true ; @@ -51,8 +45,5 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; - data.mArterialPressureLimitWindow = _data.mArterialPressureLimitWindow .value; - data.mVenousPressureLimitWindow = _data.mVenousPressureLimitWindow .value; - data.mVenousPressureLimitAsymtrc = _data.mVenousPressureLimitAsymtrc .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (.../MTreatmentAdjustPressuresLimitsResponse.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (.../MTreatmentAdjustPressuresLimitsResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -38,10 +38,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #3:(S32) | \ref Data::mArterialPressureLimitWindow | - * | #4:(S32) | \ref Data::mVenousPressureLimitWindow | - * | #5:(S32) | \ref Data::mVenousPressureLimitAsymtrc | - * | #6:(S32) | \ref Data::mTmpLimitWindow | * * \sa Data * \sa MAdjustPressureLimitsReq : Pressures limits adjustment request @@ -65,10 +61,6 @@ struct { Types::U32 mAccepted ; Types::U32 mReason ; - Types::S32 mArterialPressureLimitWindow ; - Types::S32 mVenousPressureLimitWindow ; - Types::S32 mVenousPressureLimitAsymtrc ; - Types::S32 mTmpLimitWindow ; } _data; public: @@ -80,10 +72,6 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - qint32 mArterialPressureLimitWindow = 0; /*!< ArterialLimitWindow value of type qint32 extracted out */ - qint32 mVenousPressureLimitWindow = 0; /*!< VenousLimitWindow value of type qint32 extracted out */ - qint32 mVenousPressureLimitAsymtrc = 0; /*!< VenousLimitAsymmetric value of type qint32 extracted out */ - qint32 mTmpLimitWindow = 0; /*!< TmpLimitWindow value of type qint32 extracted out */ }; MAdjustPressuresLimitsResponse () { } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp (.../MTreatmentAdjustSetPointsResponse.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp (.../MTreatmentAdjustSetPointsResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -20,23 +20,13 @@ return { _data.mAccepted .value, _data.mReason .value, - _data.mBloodFlowRate .value, - _data.mDialysateFlowRate .value, - _data.mDialysateTemperature .value, - _data.mAcidConcentrate .value, - _data.mBicarbConcentrate .value, }; } bool MAdjustSetPointsResponse::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.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialysateTemperature )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mAcidConcentrate )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBicarbConcentrate )) goto lError; return true ; @@ -55,10 +45,5 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; - data.mBloodFlowRate = _data.mBloodFlowRate .value; - data.mDialysateFlowRate = _data.mDialysateFlowRate .value; - data.mDialysateTemperature = _data.mDialysateTemperature .value; - data.mAcidConcentrate = _data.mAcidConcentrate .value; - data.mBicarbConcentrate = _data.mBicarbConcentrate .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h =================================================================== diff -u -r3000579296b1baa02f21dbe44e27f1c7e56e3821 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h (.../MTreatmentAdjustSetPointsResponse.h) (revision 3000579296b1baa02f21dbe44e27f1c7e56e3821) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h (.../MTreatmentAdjustSetPointsResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -38,11 +38,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #1:(U32) | \ref Data::mBloodFlowRate | - * | #2:(U32) | \ref Data::mDialysateFlowRate | - * | #3:(F32) | \ref Data::mDialysateTemperature | - * | #4:(U32) | \ref Data::mAcidConcentrate | - * | #5:(U32) | \ref Data::mBicarbConcentrate | * * \sa Data * \sa MAdjustSetPointsReq : Adjust Set Points Request @@ -66,11 +61,6 @@ struct { Types::U32 mAccepted ; Types::U32 mReason ; - Types::U32 mBloodFlowRate ; - Types::U32 mDialysateFlowRate ; - Types::F32 mDialysateTemperature ; - Types::U32 mAcidConcentrate ; - Types::U32 mBicarbConcentrate ; } _data; public: @@ -82,11 +72,6 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mBloodFlowRate = 0; /*!< Blood Flow Rate value of type quint32 extracted out */ - quint32 mDialysateFlowRate = 0; /*!< Dialysate Flow Rate value of type quint32 extracted out */ - float mDialysateTemperature = 0; /*!< Dialysate Temperature value of type float extracted out */ - quint32 mAcidConcentrate = 0; /*!< Acid Concentrate value of type quint32 extracted out */ - quint32 mBicarbConcentrate = 0; /*!< Bicarbonate Concentrate value of type quint32 extracted out */ }; MAdjustSetPointsResponse () { } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp (.../MTreatmentAdjustUltrafiltrationConfirmResponse.cpp) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp (.../MTreatmentAdjustUltrafiltrationConfirmResponse.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -19,28 +19,18 @@ QString MAdjustUltrafiltrationConfirmResponse::toString() const { return QString(stringPrefix + ",%1,%2,%3,%4,%5") .arg(_data.mAccepted .value) - .arg(_data.mReason .value) - .arg(_data.mVolume .value) - .arg(_data.mDuration .value) - .arg(_data.mRate .value) - ; + .arg(_data.mReason .value); } void MAdjustUltrafiltrationConfirmResponse::toVariantList(QVariantList &vData) const { vData += _data.mAccepted .value; vData += _data.mReason .value; - vData += _data.mVolume .value; - vData += _data.mDuration .value; - vData += _data.mRate .value; } bool MAdjustUltrafiltrationConfirmResponse::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.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVolume )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRate )) goto lError; return true ; @@ -60,8 +50,5 @@ Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; - data.mVolume = _data.mVolume .value; - data.mDuration = _data.mDuration .value; - data.mRate = _data.mRate .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h (.../MTreatmentAdjustUltrafiltrationConfirmResponse.h) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h (.../MTreatmentAdjustUltrafiltrationConfirmResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -37,10 +37,6 @@ * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | | | - * | #3:(F32) | \ref Data::mVolume | - * | #4:(U32) | \ref Data::mDuration | - * | #5:(F32) | \ref Data::mRate | * * \sa Data * @@ -62,20 +58,12 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - - float mVolume = 0; /*!< volume value of type float extracted out */ - quint32 mDuration = 0; /*!< duration value of type quint32 extracted out */ - float mRate = 0; /*!< rate value of type float extracted out */ }; protected: struct _Data { Types::U32 mAccepted ; Types::U32 mReason ; - - Types::F32 mVolume ; - Types::U32 mDuration ; - Types::F32 mRate ; } _data; public: Index: sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h (.../MTreatmentAdjustUltrafiltrationEditResponse.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -18,7 +18,6 @@ #include // Project -#include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" #include "types.h" // forward declarations @@ -30,9 +29,9 @@ * \brief The MAdjustUltrafiltrationEditResponse class * \details The UF vol. change response model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x4200| 0x040 | 6 | Rsp | Y | HD | UI | UF Vol. Change Response | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4200| 0x040 | Rsp | Y | HD | UI | UF Vol. Change Response | * * | Payload || * | || @@ -57,7 +56,7 @@ * | infoText | AdjustUFEdit | * */ -class MAdjustUltrafiltrationEditResponse : public MAdjustUltrafiltrationConfirmResponse +class MAdjustUltrafiltrationEditResponse { // friends @@ -68,15 +67,25 @@ //NOTE: The correct order is followed in cpp to fill in the values regarding the payload byte orders. // The struct here is just the values not in correct order // since has been inherited from the confirm to borrow some struct variables. - struct Data : public MAdjustUltrafiltrationConfirmResponse::Data { + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + float mVolume = 0; /*!< volume value of type float extracted out */ + quint32 mDuration = 0; /*!< duration value of type quint32 extracted out */ qint32 mDurationDiff= 0; /*!< durationDiff value of type quint32 extracted out */ + float mRate = 0; /*!< rate value of type float extracted out */ float mRateDiff = 0; /*!< rateDiff value of type float extracted out */ float mRateOld = 0; /*!< rateOld value of type float extracted out */ }; private: - struct : public MAdjustUltrafiltrationConfirmResponse::_Data { + struct _Data { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::F32 mVolume ; + Types::U32 mDuration ; Types::S32 mDurationDiff ; + Types::F32 mRate ; Types::F32 mRateDiff ; Types::F32 mRateOld ; } _data; Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp =================================================================== diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp (.../VTreatmentAdjustmentDurationConfirm.cpp) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp (.../VTreatmentAdjustmentDurationConfirm.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -37,7 +37,7 @@ } /*! - * \brief doAdjustment + * \brief doConfirm * \details the invocable slot to adjust the treatment duration * \param vDuration - treatment duration */ @@ -51,9 +51,6 @@ { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - duration ( vData.mDuration ); - ufVolumeGoal ( vData.mUFVolumeGoal / 1000 ); // mL => L - ufRate ( vData.mUFRate ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h =================================================================== diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h (.../VTreatmentAdjustmentDurationConfirm.h) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h (.../VTreatmentAdjustmentDurationConfirm.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -43,11 +43,6 @@ // and to always trigger the change event to work as a notifier for GUI TRIGGER( bool , adjustment , 0) - // Treatment Duration data - READONLY( quint32 , duration , 0) - READONLY( float , ufVolumeGoal , 0) - READONLY( float , ufRate , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDurationConfirm, AdjustDurationConfirmResponseData) // ----- Adjust Duration Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -55,10 +55,6 @@ { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - arterialPressureLimitWindow ( vData.mArterialPressureLimitWindow ); - venousPressureLimitWindow ( vData.mVenousPressureLimitWindow ); - venousPressureLimitAsymtrc ( vData.mVenousPressureLimitAsymtrc ); - tmpLimitWindow ( vData.mTmpLimitWindow ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -r48343520806859178923efdcca8a95f6af8599e9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -44,12 +44,6 @@ // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // ----- Adjust Pressures Limits - PROPERTY( qint32 , arterialPressureLimitWindow , 0) - PROPERTY( qint32 , venousPressureLimitWindow , 0) - PROPERTY( qint32 , venousPressureLimitAsymtrc , 0) - PROPERTY( qint32 , tmpLimitWindow , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) public slots: Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -37,10 +37,6 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - volume ( vData.mVolume / 1000 ); // mL => L - duration ( vData.mDuration ); - rate ( vData.mRate ); - // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustment ( true ); Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r48343520806859178923efdcca8a95f6af8599e9 --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision 48343520806859178923efdcca8a95f6af8599e9) @@ -43,11 +43,6 @@ // and to always trigger the change event to work as a notifier for GUI TRIGGER( bool , adjustment , 0) - // Treatment Ultrafiltration data - PROPERTY( float , volume , 0) - PROPERTY( quint32 , duration , 0) - PROPERTY( float , rate , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData) // ----------- Adjust Ultrafiltration