Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -286,7 +286,6 @@ { QVariantList mData; mData += vData.volume; - mData += vData.option; onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r47b25a76644ca44b81b5a4a728346f8e72e1dc3b -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 47b25a76644ca44b81b5a4a728346f8e72e1dc3b) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -149,14 +149,14 @@ // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 3 * 4 }, // 3 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 2 * 4 }, // 2 parameter each 4bytes // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 8 * 4 }, // 8 parameters each 4bytes // ---- - {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 5 * 4 }, // 5 parameters each 4bytes // ---- Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r47b25a76644ca44b81b5a4a728346f8e72e1dc3b -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 47b25a76644ca44b81b5a4a728346f8e72e1dc3b) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -231,8 +231,8 @@ ID_AdjustBloodDialysateReq = 0x1700, // 23 ID_AdjustBloodDialysateRsp = 0x1800, // 24 - ID_AdjustPressuresLimitsReq = 0x4600, // 70 - ID_AdjustPressuresLimitsRsp = 0x4700, // 71 + ID_AdjustPressuresLimitsReq = 0x470F, // 70 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustPressuresLimitsRsp = 0x480F, // 71 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustSalineReq = 0x1200, // 18 ID_AdjustSalineRsp = 0x1400, // 20 @@ -241,8 +241,8 @@ ID_AdjustHeparinRsp = 0x4C00, // 76 // Ultrafiltration - ID_AdjustUltrafiltrationStateReq = 0x100F, // 16 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 + ID_AdjustUltrafiltrationStateReq = 0x4700, // 71 //// ----- @LEAHIZED + ID_AdjustUltrafiltrationStateRsp = 0x4800, // 72 //// ----- @LEAHIZED ID_AdjustUltrafiltrationEditReq = 0x110F, // 17 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationEditRsp = 0x1300, // 19 Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -86,12 +86,9 @@ close() _treatmentAdjustmentUltrafiltrationEdit.open () } - onConfirmRateClicked : { - vTreatmentAdjustmentUltrafiltrationConfirm.doOptionRate(vVolume) + onConfirmVolumeClicked : { + vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume) } - onConfirmDurationClicked: { - vTreatmentAdjustmentUltrafiltrationConfirm.doOptionDuration(vVolume) - } } Connections { target: vTreatmentUltrafiltration Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -38,8 +38,7 @@ property int decimalRate : 0 } - signal confirmRateClicked (real vVolume) - signal confirmDurationClicked(real vVolume) + signal confirmVolumeClicked(real vVolume) closeVisible : false confirmVisible : false @@ -173,6 +172,6 @@ font.pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton } - onClicked: confirmClicked() + onClicked: confirmVolumeClicked(ultrafiltrationVolume) } } Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -145,7 +145,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1000| 0x100 | 9 | Req | Y | UI | HD | UF Pause/Resume | + * |0x4700| 0x041 | 9 | Req | Y | UI | HD | UF Pause/Resume | * * | Payload || * | || @@ -194,27 +194,20 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1500| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change User Confirm | + * |0x4100| 0x041 | 9 | Req | Y | UI | HD | UF Vol. Change User Confirm | * * | Payload || * | || * | #1:(F32) | \ref volume | - * | #2:(U32) | \ref option | * * \sa Options * */ class MAdjustUltrafiltrationConfirmReq : public MModel { public: - enum Options : quint32 { - eDuration = Gui::GuiActions::UF_ADJ_TREATMENT_TIME, - eRate = Gui::GuiActions::UF_ADJ_UF_RATE, - }; - float volume = 0; - Options option = eDuration; QString toString() { - return toString({volume , option}); + return toString({volume}); } static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFConfirm", vParameters); Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp (.../MTreatmentAdjustUltrafiltrationStateResponse.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp (.../MTreatmentAdjustUltrafiltrationStateResponse.cpp) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -20,15 +20,13 @@ return { _data.mAccepted.value, _data.mReason .value, - _data.mUFState .value, }; } bool MAdjustUltrafiltrationStateResponse::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.mUFState )) goto lError; return true ; @@ -47,6 +45,5 @@ Data data; data.mAccepted = _data.mAccepted.value; data.mReason = _data.mReason .value; - data.mUFState = _data.mUFState .value; return data; } Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h (.../MTreatmentAdjustUltrafiltrationStateResponse.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h (.../MTreatmentAdjustUltrafiltrationStateResponse.h) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -32,13 +32,12 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:------------------------:| - * |0x4100| 0x020 | 6 | Rsp | Y | HD | UI | UF Pause/Resume Response | + * |0x4800| 0x020 | 6 | Rsp | Y | HD | UI | UF Pause/Resume Response | * * | Payload || * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mState | * * \sa Data * \sa MAdjustUltrafiltrationStateReq : Ultrafiltration state change Request @@ -61,7 +60,6 @@ struct { Types::U32 mAccepted; Types::U32 mReason ; - Types::U32 mUFState ; } _data; public: @@ -72,7 +70,6 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mUFState = 0; /*!< UF State value of type quint32 extracted out */ }; MAdjustUltrafiltrationStateResponse() { } Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -48,24 +48,11 @@ /*! * \brief View::VTreatmentAdjustmentUltrafiltrationConfirm::doOptionRate - * \details the invocable slot to adjust the ultrafiltration by rate modification - * \param vVolume - the ultrafiltration volume + * \details the invocable slot to adjust the ultrafiltration set volume + * \param vVolume - the new ultrafiltration volume */ -void View::VTreatmentAdjustmentUltrafiltrationConfirm::doOptionRate(float vVolume) +void View::VTreatmentAdjustmentUltrafiltrationConfirm::doConfirm(float vVolume) { _data.volume = int(vVolume * 1000); // cast to int to truncate the float after convert to mL - _data.option = AdjustUltrafiltrationConfirmRequestData::eRate; emit didAdjustment(_data); } - -/*! - * \brief View::VTreatmentAdjustmentUltrafiltrationConfirm::doOptionDuration - * \details the invocable slot to adjust the ultrafiltration by duration modification - * \param vVolume - the ultrafiltration volume - */ -void View::VTreatmentAdjustmentUltrafiltrationConfirm::doOptionDuration(float vVolume) -{ - _data.volume = int(vVolume * 1000); // cast to int to truncate the float after convert to mL - _data.option = AdjustUltrafiltrationConfirmRequestData::eDuration; - emit didAdjustment(_data); -} Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r9f558b81ef69d1b43a75c390b5faadce0a891df1 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision 9f558b81ef69d1b43a75c390b5faadce0a891df1) @@ -52,8 +52,7 @@ // ----------- Adjust Ultrafiltration public slots: - void doOptionRate (float vVolume); - void doOptionDuration(float vVolume); + void doConfirm (float vVolume); signals: /*!