Index: leahi.pro =================================================================== diff -u -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- leahi.pro (.../leahi.pro) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c) +++ leahi.pro (.../leahi.pro) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -177,6 +177,7 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ sources/model/td/data/MTDAirBubbleData.h \ sources/model/td/data/MTDAirPumpData.h \ @@ -247,6 +248,7 @@ sources/view/fp/data/VFPTemperatureData.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ sources/view/td/data/VTDAirTrapData.h \ @@ -539,6 +541,7 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ sources/model/td/data/MTDAirPumpData.cpp \ sources/model/td/data/MTDAirTrapData.cpp \ @@ -724,6 +727,7 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ sources/view/td/data/VTDAirTrapData.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -621,6 +621,17 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Pressures widening request + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustPressuresWideningRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustPressuresWideningReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the InitTreatment request message. * \param vData - Data model contains the init treatment request information. * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -144,6 +144,7 @@ GuiActionType::ID_AdjustVitalsReq , GuiActionType::ID_AdjustHeparinReq , GuiActionType::ID_AdjustPressuresLimitsReq , + GuiActionType::ID_AdjustPressuresWideningReq , // End-Treatment GuiActionType::ID_AdjustRinsebackReq , GuiActionType::ID_AdjustRecirculateReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r726dc38cf98a8f0a827b2efeecfd32996d0eee90 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 726dc38cf98a8f0a827b2efeecfd32996d0eee90) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -211,6 +211,10 @@ {Gui::GuiActionType::ID_AdjustPressuresLimitsReq , 4 * 4 }, // 4 parameter each 4bytes {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 2 * 4 }, // 2 parameters each 4bytes + // ---- + {Gui::GuiActionType::ID_AdjustPressuresWideningReq , 0 * 4 }, // 0 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustPressuresWideningRsp , 2 * 4 }, // 2 parameters each 4bytes + // Pre-Treatment // Create Parameters // Pre-Treatment Initiate Treatment Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -259,6 +259,7 @@ case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodDialysateRequestData ); break; case Gui::GuiActionType::ID_AdjustPressuresLimitsReq : INTERPRET_TRANSMIT_MESSAGE(AdjustPressuresLimitsRequestData ); break; + case Gui::GuiActionType::ID_AdjustPressuresWideningReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPressuresWideningRequestData ); break; case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData ); break; case Gui::GuiActionType::ID_AdjustVitalsReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData ); break; case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData ); break; @@ -553,6 +554,7 @@ case Gui::GuiActionType::ID_AdjustBolusVolumeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBolusVolumeRsp ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break; + case Gui::GuiActionType::ID_AdjustPressuresWideningRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresWideningRsp ); break; case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; case Gui::GuiActionType::ID_AdjustVitalsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVitalsRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -143,6 +143,7 @@ #include "VTreatmentAdjustmentRinseback.h" #include "VTreatmentAdjustmentRecirculate.h" #include "VTreatmentAdjustmentPressuresLimits.h" +#include "VTreatmentAdjustmentPressuresWidening.h" #include "VTreatmentAdjustmentBloodFlowRate.h" #include "VTreatmentAdjustmentBolusVolume.h" #include "VTreatmentAdjustmentDialysateFlowRate.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -72,8 +72,8 @@ ID_TDDebugText = 0xF1FF, ID_DDDebugText = 0xF2FF, - ID_HDGeneralEvent = 0xA400, - ID_DGGeneralEvent = 0xA500, + ID_HDGeneralEvent = 0xA40F, //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGGeneralEvent = 0xA50F, //// ----- @CRAPIZED: had to change to avoid duplication ID_TDCheckIn = 0x1000, // 16 //// ----- @LEAHIZED @@ -277,6 +277,9 @@ ID_AdjustHeparinReq = 0x8A00, // 138 ID_AdjustHeparinRsp = 0x8B00, // 139 + ID_AdjustPressuresWideningReq = 0xA400, // 114 //// ----- @LEAHIZED + ID_AdjustPressuresWideningRsp = 0xA500, // 115 //// ----- @LEAHIZED + // Ultrafiltration ID_AdjustUltrafiltrationStateReq = 0x4700, // 71 //// ----- @LEAHIZED ID_AdjustUltrafiltrationStateRsp = 0x4800, // 72 //// ----- @LEAHIZED Index: sources/gui/qml/main.qml =================================================================== diff -u -rf0e262920199d1d5ebdbe3f1bf0c58c58a82d363 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/gui/qml/main.qml (.../main.qml) (revision f0e262920199d1d5ebdbe3f1bf0c58c58a82d363) +++ sources/gui/qml/main.qml (.../main.qml) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -139,6 +139,7 @@ import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 import VTreatmentAdjustmentPressuresLimits 0.1 +import VTreatmentAdjustmentPressuresWidening 0.1 import VTreatmentAdjustmentSaline 0.1 import VTreatmentAdjustmentVitals 0.1 import VTreatmentAdjustmentHeparin 0.1 @@ -310,6 +311,7 @@ VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } + VTreatmentAdjustmentPressuresWidening { id: vTreatmentAdjustmentPressuresWidening } VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -192,6 +192,20 @@ } } + Connections { target: vTreatmentAdjustmentPressuresWidening + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentPressuresWidening.adjustment_Accepted) { + if (_notification.source === 3) { + _notification.text = "" + } + } + else { + _notification.text = vTreatmentAdjustmentPressuresWidening.text() + _notification.source = 3 + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rb1462640e36df3f567c42aa8c8cbd6dafe865625 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -112,6 +112,6 @@ expandingArrow : true - onClicked : print ("Expanding Arrows clicked") + onClicked : vTreatmentAdjustmentPressuresWidening.doAdjustment() } } Index: sources/model/MModel.h =================================================================== diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/model/MModel.h (.../MModel.h) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781) +++ sources/model/MModel.h (.../MModel.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -170,6 +170,7 @@ #include "MTreatmentAdjustRecirculateResponse.h" #include "MTreatmentAdjustEndResponse.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" +#include "MTreatmentAdjustPressuresWideningResponse.h" // Post-Treatment #include "MPostTreatmentAdjustRequests.h" @@ -482,6 +483,7 @@ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ + REGISTER_METATYPE( AdjustPressuresWideningRequestData ) \ REGISTER_METATYPE( AdjustVersionsResponseData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ REGISTER_METATYPE( AdjustServiceModeRequestData ) \ @@ -532,6 +534,7 @@ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ + REGISTER_METATYPE( AdjustPressuresWideningResponseData ) \ REGISTER_METATYPE( AdjustVersionsTDRequestData ) \ REGISTER_METATYPE( AdjustVersionsTDResponseData ) \ REGISTER_METATYPE( AdjustVersionsDDResponseData ) \ @@ -705,6 +708,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsDDResponseData ) \ @@ -757,6 +761,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustServiceModeRequestData ) \ @@ -950,6 +955,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresWideningResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVersionsDDResponseData ) \ @@ -1025,6 +1031,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustServiceModeRequestData ) \ @@ -1099,6 +1106,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustServiceModeRequestData ) \ @@ -1167,6 +1175,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFVolumeEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVitalsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHeparinRequestData ) \ @@ -1328,6 +1337,7 @@ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPressuresLimitsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustPressuresWideningResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDRequestData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsTDResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVersionsDDResponseData ) \ Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -570,6 +570,28 @@ }; /*! + * \brief The MAdjustPressuresWideningReq class + * \details The model to request the pressures widening + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | + * |0xA400| 0x041 | Req | Y | UI | TD | Pressures Widening | + * + * | Payload || + * | || + * | None || + * + * \sa Options + * + */ +class MAdjustPressuresWideningReq : public MModel { +public: + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustPressuresWidening", vParameters); + } +}; + +/*! * \brief The MAdjustBolusVolumeReq class * \details The model to request bolus volume adjustment * @@ -748,6 +770,8 @@ typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; typedef Model:: MAdjustBloodPrimeReq AdjustBloodPrimeRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; +typedef Model:: MAdjustPressuresWideningReq AdjustPressuresWideningRequestData; + typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -0,0 +1,36 @@ + +#include "MTreatmentAdjustPressuresWideningResponse.h" + +using namespace Model; + +QVariantList MAdjustPressuresWideningResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value + }; +} + +bool MAdjustPressuresWideningResponse::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; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustPressuresWideningResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustPressuresWideningResponseData MAdjustPressuresWideningResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -0,0 +1,69 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustPressuresWideningResponse class + * \details The pressures widening adjustment response model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------:| + * |0xA500| 0x020 | 6 | Rsp | Y | TD | UI | Pressures widening Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * \sa MAdjustPressuresWideningReq : Pressures widening adjustment request + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | TD | + * | infoText | AdjustPressuresWidening | + * + */ +class MAdjustPressuresWideningResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustPressuresWidening"); } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustPressuresWideningResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustPressuresWideningResponse::Data AdjustPressuresWideningResponseData; Index: sources/view/VView.h =================================================================== diff -u -r5a505f86c26c8e1fd6d584cd53a3765c25120781 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/view/VView.h (.../VView.h) (revision 5a505f86c26c8e1fd6d584cd53a3765c25120781) +++ sources/view/VView.h (.../VView.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -234,6 +234,7 @@ REGISTER_TYPE( VTreatmentAdjustmentRecirculate ) \ REGISTER_TYPE( VTreatmentAdjustmentEnd ) \ REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits ) \ + REGISTER_TYPE( VTreatmentAdjustmentPressuresWidening ) \ REGISTER_TYPE( VTreatmentAdjustmentBloodFlowRate ) \ REGISTER_TYPE( VTreatmentAdjustmentBolusVolume ) \ REGISTER_TYPE( VTreatmentAdjustmentDialysateFlowRate ) \ Index: sources/view/dd/data/VDDValvesStatesData.cpp =================================================================== diff -u -r9760eecfc557430078d5ef4ec6f9bc2ec423bfc1 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/view/dd/data/VDDValvesStatesData.cpp (.../VDDValvesStatesData.cpp) (revision 9760eecfc557430078d5ef4ec6f9bc2ec423bfc1) +++ sources/view/dd/data/VDDValvesStatesData.cpp (.../VDDValvesStatesData.cpp) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -48,11 +48,11 @@ balancingChamberValve7 ( vData.mValvesStatus.at( GuiDDValves::D26_VALV )); balancingChamberValve8 ( vData.mValvesStatus.at( GuiDDValves::D22_VALV )); - spareValve0 ( vData.mValvesStatus.at( GuiDDValves::D79_PMP_VALV )); // Start of spare valve group + spareValve0 ( vData.mValvesStatus.at( GuiDDValves::D88_79_VALV )); // Start of spare valve group spareValve1 ( vData.mValvesStatus.at( GuiDDValves::D83_VALV )); spareValve2 ( vData.mValvesStatus.at( GuiDDValves::D91_VALV )); - spareValve3 ( vData.mValvesStatus.at( GuiDDValves::SPARE3_VALV )); - spareValve4 ( vData.mValvesStatus.at( GuiDDValves::SPARE4_VALV )); + spareValve3 ( vData.mValvesStatus.at( GuiDDValves::D104_VALV )); + spareValve4 ( vData.mValvesStatus.at( GuiDDValves::D95_VALV )); spareValve5 ( vData.mValvesStatus.at( GuiDDValves::SPARE5_VALV )); spareValve6 ( vData.mValvesStatus.at( GuiDDValves::D100_VALV )); spareValve7 ( vData.mValvesStatus.at( GuiDDValves::SPARE7_VALV )); Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -0,0 +1,37 @@ +#include "VTreatmentAdjustmentPressuresWidening.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresWidening) + +void VTreatmentAdjustmentPressuresWidening::initConnections() { + ACTION_VIEW_CONNECTION(AdjustPressuresWideningResponseData); + ADJUST_VIEW_CONNECTION( AdjustPressuresWideningRequestData); +} + +/*! + * \brief View::VTreatmentAdjustmentPressuresWidening::doAdjustment + * \details the request for widening pressure limits + */ +void VTreatmentAdjustmentPressuresWidening::doAdjustment() +{ + AdjustPressuresWideningRequestData data; + emit didAdjustment(data); +} + +/*! + * \brief VTreatmentAdjustmentPressuresWidening::onActionReceive + * \details Model data received message handler. + * When signal received this method is called to update the view properties. + * \param vData - Model data + */ +void VTreatmentAdjustmentPressuresWidening::onActionReceive(const AdjustPressuresWideningResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // *** 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/VTreatmentAdjustmentPressuresWidening.h =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -0,0 +1,42 @@ +#pragma once + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MTreatmentAdjustPressuresWideningResponse.h" + + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentPressuresWidening class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustPressuresWideningResponse + * + */ +class VTreatmentAdjustmentPressuresWidening : public VAdjustmentResponseBase +{ + Q_OBJECT + // friends + friend class ::tst_views; + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustment , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresWidening, AdjustPressuresWideningResponseData) + +public slots: + void doAdjustment(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the pressures limits + * \param vData - data model for the pressures limits adjustment request + */ + void didAdjustment(const AdjustPressuresWideningRequestData &vData); +}; +}