Index: leahi.pro =================================================================== diff -u -re07cde120d7476c4add90c4f86cf55af9ea830de -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- leahi.pro (.../leahi.pro) (revision e07cde120d7476c4add90c4f86cf55af9ea830de) +++ leahi.pro (.../leahi.pro) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -180,6 +180,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/MTreatmentAdjustDryBicartDisconnectResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ @@ -195,6 +196,7 @@ sources/model/td/data/MWaterSampleData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \ + sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.h \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ @@ -263,6 +265,7 @@ sources/view/fp/data/VFPTemperatureData.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ @@ -280,6 +283,7 @@ sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ sources/view/td/data/treatment/VTreatmentBloodPrimeData.h \ + sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.h \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ @@ -552,6 +556,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/MTreatmentAdjustDryBicartDisconnectResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ @@ -566,6 +571,7 @@ sources/model/td/data/MWaterSampleData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ + sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ @@ -741,6 +747,7 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ @@ -758,6 +765,7 @@ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \ + sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -222,8 +222,22 @@ // ---------------------------------------------------------------------------------------------------- + /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Dry Bicart DisconnectCommand message. + * \param vData - Data model contains Dry Bicart Disconnect Command + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDryBicartDisconnectRequestData &vData) +{ + QVariantList mData; + mData += vData.command; + actionTransmit(GuiActionType::ID_AdjustDryBicartDisconnectReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Blood Prime Command message. * \param vData - Data model contains Blood Prime Command * \return void @@ -1109,6 +1123,8 @@ QVariantList mData; actionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); } + + // ---------------------------------------------------------------------------------------------------- /*! Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r5335f246461dfd5b9a48dcc8c01aa97778ae773b -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 5335f246461dfd5b9a48dcc8c01aa97778ae773b) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -150,6 +150,7 @@ GuiActionType::ID_AdjustHeparinReq , GuiActionType::ID_AdjustPressuresLimitsReq , GuiActionType::ID_AdjustPressuresWideningReq , + GuiActionType::ID_AdjustDryBicartDisconnectReq , // End-Treatment GuiActionType::ID_AdjustRinsebackReq , GuiActionType::ID_AdjustRecirculateReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r718a3ed0b0693f0bc36e11931f41ccd0f49d7251 -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 718a3ed0b0693f0bc36e11931f41ccd0f49d7251) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -270,6 +270,11 @@ {Gui::GuiActionType::ID_AdjustHeparinReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustHeparinRsp , 2 * 4 }, // 3 parameters each 4bytes + // ---- Dry Bicarb Disconnect + {Gui::GuiActionType::ID_DryBicartDisconnectData , 5 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp , 2 * 4 }, // 2 parameter each 4bytes + // ---- Rinseback {Gui::GuiActionType::ID_AdjustRinsebackReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustRinsebackRsp , 2 * 4 }, // 2 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -260,6 +260,7 @@ 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; + case Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData ); break; // in-treatment - ultrafiltration case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; @@ -539,6 +540,7 @@ case Gui::GuiActionType::ID_Ultrafiltration : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration ); break; case Gui::GuiActionType::ID_IsolatedUF : ok = notify(vMessage, vData, Gui::GuiActionType::ID_IsolatedUF ); break; case Gui::GuiActionType::ID_TreatmentParametersSetPointData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData ); break; + case Gui::GuiActionType::ID_DryBicartDisconnectData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DryBicartDisconnectData ); break; // ----- In-Treatment Adjust case Gui::GuiActionType::ID_AdjustBloodPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodPrimeRsp ); break; case Gui::GuiActionType::ID_AdjustDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationEditRsp ); break; @@ -562,6 +564,7 @@ case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp ); break; + case Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp ); break; // ----- Post-Treatment Adjust case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -104,6 +104,7 @@ #include "VTDEjectorData.h" #include "VTDTemperatureData.h" #include "VTreatmentTrends.h" +#include "VTreatmentDryBicartDisconnect.h" #include "VWaterSampleData.h" // DG data #include "VDGDrainPumpData.h" @@ -160,6 +161,7 @@ #include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h" #include "VTreatmentAdjustmentSetPoints.h" #include "VTreatmentAdjustmentVitalsAlarmLimits.h" +#include "VTreatmentAdjustmentDryBicartDisconnect.h" // ----- Post-Treatment Adjustments #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h" #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -280,6 +280,10 @@ ID_AdjustHeparinReq = 0x8A00, // 138 ID_AdjustHeparinRsp = 0x8B00, // 139 + ID_DryBicartDisconnectData = 0xC400, // 196 + ID_AdjustDryBicartDisconnectReq = 0xC500, // 197 + ID_AdjustDryBicartDisconnectRsp = 0xC600, // 198 + ID_AdjustPressuresWideningReq = 0xA400, // 114 //// ----- @LEAHIZED ID_AdjustPressuresWideningRsp = 0xA500, // 115 //// ----- @LEAHIZED @@ -346,8 +350,9 @@ // RO Water Input Mode ID_DuetRoWaterStatDGq = 0xC300, // 195 DG -> UI // DG initiates Status query ID_DuetRoWaterModeUIi = 0xBC00, // 188 UI -> DG // UI initiates Mode Set || responses to status query - ID_DuetRoWaterModeDGr = 0xC400, // 196 UI <- DG // DG responses Mode Set + ID_DuetRoWaterModeDGr = 0xC40F, // 196 //// ----- @CRAPIZED: had to change to avoid duplication + // Institutional record request and response ID_InstitutionalRecordReq = 0x8200, // 130 UI -> TD request institutional record ID_InstitutionalRecordRsp = 0x8300, // 131 TD -> UI response institutional record Index: sources/gui/qml/main.qml =================================================================== diff -u -re255d4633b338f4f46c3a2fad5a62f982ebfcd18 -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/gui/qml/main.qml (.../main.qml) (revision e255d4633b338f4f46c3a2fad5a62f982ebfcd18) +++ sources/gui/qml/main.qml (.../main.qml) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -86,6 +86,7 @@ import VTreatmentRanges 0.1 import VTreatmentHeparin 0.1 import VTreatmentTrends 0.1 +import VTreatmentDryBicartDisconnect 0.1 // Pre-Treatment import VPreTreatmentAdjustmentInitTreatment 0.1 @@ -153,6 +154,7 @@ import VTreatmentAdjustmentRinseback 0.1 import VTreatmentAdjustmentRecirculate 0.1 import VTreatmentAdjustmentEnd 0.1 +import VTreatmentAdjustmentDryBicartDisconnect 0.1 // Post-Treatmnt import VPostTreatmentAdjustmentPatientDisconnectionConfirm 0.1 import VPostTreatmentAdjustmentDisposablesRemovalConfirm 0.1 @@ -258,6 +260,7 @@ VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } VTreatmentHeparin { id: vTreatmentHeparin } + VTreatmentDryBicartDisconnect { id: vTreatmentDryBicartDisconnect } // ---- DD VDGDrainPump { id: vDGDrainPump } @@ -330,6 +333,7 @@ VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd } + VTreatmentAdjustmentDryBicartDisconnect { id: vTreatmentAdjustmenDryBicartDisconnect } // --- Post Treatment VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm } Index: sources/model/MModel.h =================================================================== diff -u -rd17a7a6adf72a6224280548e2341dfce22bf72c7 -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/model/MModel.h (.../MModel.h) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) +++ sources/model/MModel.h (.../MModel.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -52,6 +52,7 @@ #include "MTreatmentRangesData.h" #include "MTreatmentSalineData.h" #include "MTreatmentVitalsData.h" +#include "MTreatmentDryBicartDisconnectData.h" #include "MTreatmentHeparinData.h" #include "MTreatmentRinsebackData.h" #include "MTreatmentRecirculateData.h" @@ -172,6 +173,7 @@ #include "MTreatmentAdjustEndResponse.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" #include "MTreatmentAdjustPressuresWideningResponse.h" +#include "MTreatmentAdjustDryBicartDisconnectResponse.h" // Post-Treatment #include "MPostTreatmentAdjustRequests.h" @@ -370,6 +372,7 @@ REGISTER_METATYPE( TreatmentSalineData ) \ REGISTER_METATYPE( TreatmentVitalsData ) \ REGISTER_METATYPE( TreatmentHeparinData ) \ + REGISTER_METATYPE( TreatmentDryBicartDisconnectData ) \ REGISTER_METATYPE( TreatmentRinsebackData ) \ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ @@ -485,6 +488,7 @@ REGISTER_METATYPE( AdjustRecirculateRequestData ) \ REGISTER_METATYPE( AdjustTreatmentEndRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ + REGISTER_METATYPE( AdjustDryBicartDisconnectRequestData ) \ REGISTER_METATYPE( AdjustPressuresWideningRequestData ) \ REGISTER_METATYPE( AdjustVersionsResponseData ) \ REGISTER_METATYPE( AdjustVersionsRequestData ) \ @@ -533,6 +537,7 @@ REGISTER_METATYPE( AdjustSalineResponseData ) \ REGISTER_METATYPE( AdjustVitalsResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ + REGISTER_METATYPE( AdjustDryBicartDisconnectResponseData ) \ REGISTER_METATYPE( AdjustRinsebackResponseData ) \ REGISTER_METATYPE( AdjustRecirculateResponseData ) \ REGISTER_METATYPE( AdjustTreatmentEndResponseData ) \ @@ -608,6 +613,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentVitalsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHeparinData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ @@ -710,6 +716,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndResponseData ) \ @@ -767,6 +774,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) \ @@ -857,6 +865,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSalineData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentVitalsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHeparinData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ @@ -959,6 +968,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRinsebackResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentEndResponseData ) \ @@ -1038,6 +1048,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ @@ -1112,6 +1123,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsResponseData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ @@ -1180,6 +1192,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFVolumeEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDryBicartDisconnectRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresWideningRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVitalsRequestData ) \ @@ -1238,6 +1251,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentSalineData ) \ ACTION_RECEIVE_SIGNAL( TreatmentVitalsData ) \ ACTION_RECEIVE_SIGNAL( TreatmentHeparinData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentDryBicartDisconnectData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ @@ -1341,6 +1355,7 @@ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVitalsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHeparinResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDryBicartDisconnectResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustRinsebackResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustTreatmentEndResponseData ) \ Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -rd17a7a6adf72a6224280548e2341dfce22bf72c7 -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision d17a7a6adf72a6224280548e2341dfce22bf72c7) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -735,6 +735,31 @@ } }; +/*! + * \brief The MAdjustryBicartDisconnectReq class + * \details The model to request the Dry Bicart Disconnect + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: | + * |0xC500| 0x100 | Req | Y | UI | HD | Dry Bicart Disconnect Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref command | + * + */ +class MAdjustryBicartDisconnectReq : public MModel { +public: + quint32 command = 0; + + QString toString() { + return toString({command}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDryBicartDisconnect", vParameters); + } +}; + //// ---------- Alarms /*! @@ -807,8 +832,9 @@ typedef Model:: MAdjustTreatmentEndReq AdjustTreatmentEndRequestData; typedef Model:: MAdjustBloodPrimeReq AdjustBloodPrimeRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -typedef Model:: MAdjustPressuresWideningReq AdjustPressuresWideningRequestData; +typedef Model:: MAdjustPressuresWideningReq AdjustPressuresWideningRequestData; typedef Model:: MAdjustBolusVolumeReq AdjustBolusVolumeRequestData; +typedef Model:: MAdjustryBicartDisconnectReq AdjustDryBicartDisconnectRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -0,0 +1,47 @@ +#include "MTreatmentAdjustDryBicartDisconnectResponse.h" + +using namespace Model; + +/*! + * \brief MAdjustDryBicartDisconnectResponse::parameters + * \details Returns the response parameters. + * \return QVariantList containing the response parameters. + */ +QVariantList MAdjustDryBicartDisconnectResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +/*! + * \brief MAdjustDryBicartDisconnectResponse::fromByteArray + * \details Parses the response from a byte array. + * \param vByteArray Input data + * \param vIndex Position where parsing failed. + * \return true if parsing was successful, otherwise false. + */ +bool MAdjustDryBicartDisconnectResponse::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 MAdjustDryBicartDisconnectResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDryBicartDisconnectResponseData MAdjustDryBicartDisconnectResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -0,0 +1,66 @@ +#pragma once + +// Project +#include "MAbstract.h" +#include "MAdjustRequestsBase.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MTreatmentAdjustDryBicartDisconnectResponse class + * \details The Saline Bolus adjustment response model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * |0xC600| 0x020 | 6 | Rsp | Y | TD | UI | HDF State Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * \sa MAdjustDryBicartDisconnectReq + * \sa MTreatmentAdjustDryBicartDisconnectResponse: Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | TD | + * | infoText | AdjustDryBicartDisconnect | + * + */ +class MAdjustDryBicartDisconnectResponse : public MAbstract { + + 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("AdjustDryBicartDisconnect") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustDryBicartDisconnectResponse () {}; + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} +typedef Model::MAdjustDryBicartDisconnectResponse::Data AdjustDryBicartDisconnectResponseData; Index: sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp =================================================================== diff -u --- sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp (revision 0) +++ sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -0,0 +1,58 @@ +#include "MTreatmentDryBicartDisconnectData.h" + +using namespace Model; + +/*! + * \brief MTreatmentHDF::parameters + * \details Returns the response parameters. + * \return QVariantList containing the response parameters. + */ +QVariantList MTreatmentDryBicartDisconnect::parameters() const { + return { + _data.mShowDialog .value, + _data.mTotal .value, + _data.mProgress .value, + _data.mDrainInProgress .value, + _data.mDepressurizeInProgress.value, + + }; +} + +/*! + * \brief MTreatmentDryBicartDisconnect::fromByteArray + * \details Parses the response from a byte array. + * \param vByteArray Input data + * \param vIndex Position where parsing failed. + * \return true if parsing was successful, otherwise false. + */ +bool MTreatmentDryBicartDisconnect::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mShowDialog )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTotal )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mProgress )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDrainInProgress )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDepressurizeInProgress )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MTreatmentDryBicartDisconnect::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +MTreatmentDryBicartDisconnect::Data MTreatmentDryBicartDisconnect::data() const { + Data data; + data.mShowDialog = _data.mShowDialog .value; + data.mTotal = _data.mTotal .value; + data.mProgress = _data.mProgress .value; + data.mDrainInProgress = _data.mDrainInProgress .value; + data.mDepressurizeInProgress = _data.mDepressurizeInProgress.value; + + return data; +} Index: sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.h =================================================================== diff -u --- sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.h (revision 0) +++ sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.h (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -0,0 +1,70 @@ +#pragma once +// Project +#include "MAbstract.h" +#include "types.h" + +namespace Model { + +/*! + * \brief The MTreatmentDryBicartDisconnectData class + * \details The HDF Data model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| + * |0xC400| 0x100 | 7 | 1 Hz | N | TD | All | Dry Bicart Disconnect Data| + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mShowDialog | + * | #2:(U32) | \ref Data::mTotal | + * | #3:(U32) | \ref Data::mProgress | + * | #4:(U32) | \ref Data::mDrainInProgress | + * | #5:(U32) | \ref Data::mDepressurizeInProgress | + * + * \sa Data + + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | TD | + * | infoText | Dry Bicart Disconnect | + * + */ + +class MTreatmentDryBicartDisconnect : public MAbstract { + QVariantList parameters() const override; + + struct { + Types::U32 mShowDialog ; + Types::U32 mTotal ; + Types::U32 mProgress ; + Types::U32 mDrainInProgress ; + Types::U32 mDepressurizeInProgress; + + } _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("DryBicartDisconnect"); } + + struct Data { + quint32 mShowDialog = 0; + quint32 mTotal = 0; + quint32 mProgress = 0; + quint32 mDrainInProgress = 0; + quint32 mDepressurizeInProgress= 0; + }; + + MTreatmentDryBicartDisconnect () {} + + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MTreatmentDryBicartDisconnect::Data TreatmentDryBicartDisconnectData; Index: sources/view/VView.h =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r4926ab6d9b90ebf8c94246f8f99a174f433541ee --- sources/view/VView.h (.../VView.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/view/VView.h (.../VView.h) (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -167,6 +167,7 @@ REGISTER_TYPE( VTreatmentRanges ) \ REGISTER_TYPE( VTreatmentSaline ) \ REGISTER_TYPE( VTreatmentHeparin ) \ + REGISTER_TYPE( VTreatmentDryBicartDisconnect ) \ /* End-Treatment */ \ REGISTER_TYPE( VTreatmentRinseback ) \ REGISTER_TYPE( VTreatmentRecirculate ) \ @@ -250,6 +251,7 @@ REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentSetPoints ) \ REGISTER_TYPE( VTreatmentAdjustmentVitalsAlarmLimits ) \ + REGISTER_TYPE( VTreatmentAdjustmentDryBicartDisconnect ) \ REGISTER_TYPE( VTreatmentCreate ) \ REGISTER_TYPE( VTreatmentIsolatedUF ) \ REGISTER_TYPE( VTreatmentTrends ) \ Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.cpp =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.cpp (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.cpp (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -0,0 +1,67 @@ +#include "VTreatmentAdjustmentDryBicartDisconnect.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDryBicartDisconnect) + +void VTreatmentAdjustmentDryBicartDisconnect::initConnections() { + ACTION_VIEW_CONNECTION(AdjustDryBicartDisconnectResponseData); + ADJUST_VIEW_CONNECTION( AdjustDryBicartDisconnectRequestData); +} + +void VTreatmentAdjustmentDryBicartDisconnect::onActionReceive(const AdjustDryBicartDisconnectResponseData &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. *** + // *** use this trigger to make sure you have all the properties with updated values *** + adjustment ( true ); +} + +/*! + * \brief View::VTreatmentAdjustmentDryBicartDisconnect::doAdjustment + * \details request command + */ +void View::VTreatmentAdjustmentDryBicartDisconnect::doDrain () +{ + AdjustDryBicartDisconnectRequestData mData; + mData.command = 0; // update later with FW common enum + emit didAdjustment(mData); // notify the controllers to do the adjustment +} + +/*! + * \brief View::VTreatmentAdjustmentDryBicartDisconnect::doAdjustment + * \details request command + */ +void View::VTreatmentAdjustmentDryBicartDisconnect::doDepressurize () +{ + AdjustDryBicartDisconnectRequestData mData; + mData.command = 1; // update later with FW common enum + emit didAdjustment(mData); // notify the controllers to do the adjustment +} + +/*! + * \brief View::VTreatmentAdjustmentDryBicartDisconnect::doAdjustment + * \details request command + */ +void View::VTreatmentAdjustmentDryBicartDisconnect::doCancel () +{ + AdjustDryBicartDisconnectRequestData mData; + mData.command = 2; // update later with FW common enum + emit didAdjustment(mData); // notify the controllers to do the adjustment +} + +/*! + * \brief View::VTreatmentAdjustmentDryBicartDisconnect::doAdjustment + * \details request command + */ +void View::VTreatmentAdjustmentDryBicartDisconnect::doDone () +{ + AdjustDryBicartDisconnectRequestData mData; + mData.command = 3; // update later with FW common enum + emit didAdjustment(mData); // notify the controllers to do the adjustment +} + Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.h =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.h (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.h (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -0,0 +1,42 @@ + +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MTreatmentAdjustDryBicartDisconnectResponse.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentDryBicartDisconnect class + * \details View for Model's Data representation. + * + * \sa Model::MTreatmentAdjustDryBicartDisconnectResponse + * + */ +class VTreatmentAdjustmentDryBicartDisconnect : 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 + TRIGGER( bool , adjustment , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDryBicartDisconnect, AdjustDryBicartDisconnectResponseData) + +public slots: + void doDrain (); + void doDepressurize (); + void doCancel (); + void doDone (); + +signals: + void didAdjustment(const AdjustDryBicartDisconnectRequestData &vData); +}; +} Index: sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp =================================================================== diff -u --- sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp (revision 0) +++ sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -0,0 +1,16 @@ +#include "VTreatmentDryBicartDisconnect.h" + +// Project +#include "GuiController.h" +#include "GuiGlobals.h" + +VIEW_DEF(VTreatmentDryBicartDisconnect, TreatmentDryBicartDisconnectData) + +void VTreatmentDryBicartDisconnect::onActionReceive(const TreatmentDryBicartDisconnectData &vData) +{ + showDialog ( vData.mShowDialog ); + total ( vData.mTotal ); + progress ( vData.mProgress ); + drainInProgress ( vData.mDrainInProgress ); + depressurizeInProgress ( vData.mDepressurizeInProgress ); +} Index: sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.h =================================================================== diff -u --- sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.h (revision 0) +++ sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.h (revision 4926ab6d9b90ebf8c94246f8f99a174f433541ee) @@ -0,0 +1,34 @@ + +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VView.h" +#include "MTreatmentDryBicartDisconnectData.h" + +// namespace +namespace View { + +/*! + * \brief The VTreatmentDryBicartDisconnect class + * \details View for Model's data representation. + * + * \sa Model::VTreatmentDryBicartDisconnect + * + */ +class VTreatmentDryBicartDisconnect : public QObject +{ + Q_OBJECT + + PROPERTY( quint32 , showDialog , 0) + PROPERTY( quint32 , total , 0) + PROPERTY( quint32 , progress , 0) + PROPERTY( quint32 , drainInProgress , 0) + PROPERTY( quint32 , depressurizeInProgress , 0) + + VIEW_DEC(VTreatmentDryBicartDisconnect, TreatmentDryBicartDisconnectData) +}; +}