Index: denali.pro =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- denali.pro (.../denali.pro) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ denali.pro (.../denali.pro) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -79,9 +79,9 @@ sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.h \ sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.h \ sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustDisposablePrimeResponse.h \ - sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ + sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ + sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \ sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment @@ -105,7 +105,7 @@ \ # ---------- Models - HD - Data - Pre-Treatment - Progress sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h \ sources/model/hd/data/MPreTreatmentSelfTestDryData.h \ - sources/model/hd/data/MPreTreatmentDisposablePrimeData.h \ + sources/model/hd/data/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDAccelerometerData.h \ sources/model/hd/data/MTreatmentTimeData.h \ @@ -156,11 +156,20 @@ sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h \ + \ # ---------- Views - HD - Adjustment - Pre-Treatment + sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ @@ -178,7 +187,7 @@ \ # ---------- Views - HD - Data - Pre-Treatment - Progress sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h \ sources/view/hd/data/VPreTreatmentSelfTestDryData.h \ - sources/view/hd/data/VPreTreatmentDisposablePrimeData.h \ + sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.h \ sources/view/hd/data/VTreatmentTime.h \ @@ -246,9 +255,9 @@ sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.cpp \ sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustDisposablePrimeResponse.cpp \ - sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ + sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ + sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \ sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment @@ -266,7 +275,7 @@ sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \ \ # ---------- Models - HD - Data \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/MPreTreatmentDisposablePrimeData.cpp \ + sources/model/hd/data/MPreTreatmentDisposablesPrimeData.cpp \ sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp \ sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp \ \ # ---------- Models - HD - Data - States @@ -321,11 +330,20 @@ sources/view/hd/alarm/VAlarmStatus.cpp \ \ # ---------- Views - HD - Adjustment sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \ + \ # ---------- Views - HD - Adjustment - Pre-Treatment + sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.cpp \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.cpp \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ + sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ @@ -336,16 +354,17 @@ sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \ - \ # ---------- Views - HD - Data - Pre-Treatment - Progress - sources/view/hd/data/VPreTreatmentDisposablePrimeData.cpp \ - sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \ - sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \ \ # ---------- Views - HD - States Data sources/view/hd/data/VHDOperationModeData.cpp \ sources/view/hd/data/VPreTreatmentStatesData.cpp \ sources/view/hd/data/VHDTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ + \ # ---------- Views - HD - Data - Pre-Treament + sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \ + sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \ + sources/view/hd/data/VPreTreatmentDisposablesPrimeData.cpp \ + \ # ---------- Views - HD - Data - In-Treament sources/view/hd/data/VTreatmentTime.cpp \ sources/view/hd/data/VTreatmentBloodFlow.cpp \ sources/view/hd/data/VTreatmentDialysateFlow.cpp \ @@ -354,9 +373,10 @@ sources/view/hd/data/VTreatmentPressureOcclusion.cpp \ sources/view/hd/data/VTreatmentSalineData.cpp \ sources/view/hd/data/VTreatmentHeparinData.cpp \ + \ # ---------- Views - HD - Data - Post-Treament + sources/view/hd/data/VTreatmentBloodPrimeData.cpp \ sources/view/hd/data/VTreatmentRinsebackData.cpp \ sources/view/hd/data/VTreatmentRecirculateData.cpp \ - sources/view/hd/data/VTreatmentBloodPrimeData.cpp \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress sources/view/dg/data/VDGFilterFlushData.cpp \ \ # ---------- Views - DG - Data Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -537,28 +537,28 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume + * \details This method transmits the Patient Connection Begin Adjustment Denali message. + * \param vData - Data model contains Patient Connection Begin adjustment. * \return void */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &vData) { + Q_UNUSED(vData) QVariantList mData; - mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); + onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData); } /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Connection Begin Adjustment Denali message. - * \param vData - Data model contains Patient Connection Begin adjustment. + * \details This method transmits the Ultrafiltration Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration adjustment volume * \return void */ -void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData) { - Q_UNUSED(vData) QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData); + mData += vData.volume; + onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); } /*! Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -117,8 +117,8 @@ GuiActionType::ID_AdjustConsumablesConfirmReq , GuiActionType::ID_AdjustDisposablesConfirmReq , GuiActionType::ID_AdjustDisposablesPrimeReq , - GuiActionType::ID_AdjustUltrafiltrationInitReq , GuiActionType::ID_AdjustPatientConnectionBeginReq , + GuiActionType::ID_AdjustUltrafiltrationInitReq , GuiActionType::ID_AdjustPatientConnectionConfirmReq , GuiActionType::ID_AdjustStartTreatmentReq , // In-Treatment Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -141,12 +141,12 @@ {Gui::GuiActionType::ID_AdjustDisposablesPrimeReq , 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_DisposablesPrimeData , 2 * 4 }, // 2 parameters each 4bytes - // Pre-Treatment Ultrafiltration initial volume - {Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp , 3 * 4 }, // 3 parameters each 4bytes // Pre-Treatment Patient Connection Begin {Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq , 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp , 2 * 4 }, // 2 parameters each 4bytes + // Pre-Treatment Ultrafiltration initial volume + {Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp , 3 * 4 }, // 3 parameters each 4bytes // Pre-Treatment Patient Connection Confirm {Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq, 0 * 4 }, // 0 parameters each 4bytes {Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp, 2 * 4 }, // 2 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -253,13 +253,13 @@ case Gui::GuiActionType::ID_AdjustParametersConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustWaterSampleReq : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleRequestData ); break; case Gui::GuiActionType::ID_AdjustWaterSampleResultReq : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleResultRequestData ); break; - case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustConsumablesConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisposablesConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustDisposablesPrimeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisposablesPrimeRequestData ); break; + case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustConsumablesConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustDisposablesPrimeReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesPrimeRequestData ); break; + case Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionBeginRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationInitRequestData ); break; - case Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq : INTERPRET_TRANSMIT_MESSAGE(AdjustPatientConnectionBeginRequestData ); break; - case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustPatientConnectionConfirmRequestData ); break; - case Gui::GuiActionType::ID_AdjustStartTreatmentReq : INTERPRET_TRANSMIT_MESSAGE(AdjustStartTreatmentRequestData ); break; + case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustStartTreatmentReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustStartTreatmentRequestData ); break; // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; @@ -350,14 +350,14 @@ // ----- Pre-Treatment - Datum - Progress case Gui::GuiActionType::ID_SelfTestNoCartridgeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridgeData ); break; case Gui::GuiActionType::ID_SelfTestDryData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_SelfTestDryData ); break; - case Gui::GuiActionType::ID_DisposablesPrimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData ); break; + case Gui::GuiActionType::ID_DisposablesPrimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData ); break; // ----- Pre-Treatment - Adjust case Gui::GuiActionType::ID_AdjustInitTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInitTreatmentRsp ); break; case Gui::GuiActionType::ID_AdjustParametersValidationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustParametersValidationRsp ); break; case Gui::GuiActionType::ID_AdjustWaterSampleRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleRsp ); break; - case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp ); break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp ); break; + case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp ); break; case Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp ); break; case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break; case Gui::GuiActionType::ID_AdjustStartTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -33,10 +33,19 @@ #include "VPreTreatmentStatesData.h" #include "VHDTreatmentStatesData.h" // Pre-treatment +#include "VPreTreatmentAdjustmentInitTreatment.h" #include "VDGFilterFlushData.h" +#include "VPreTreatmentAdjustmentWaterSample.h" +#include "VPreTreatmentAdjustmentConsumablesConfirm.h" #include "VPreTreatmentSelfTestNoCartridgeData.h" +#include "VPreTreatmentAdjustmentDisposablesConfirm.h" #include "VPreTreatmentSelfTestDryData.h" -#include "VPreTreatmentDisposablePrimeData.h" +#include "VPreTreatmentAdjustmentDisposablesPrime.h" +#include "VPreTreatmentDisposablesPrimeData.h" +#include "VPreTreatmentAdjustmentPatientConnectionBegin.h" +#include "VPreTreatmentAdjustmentUltrafiltrationInit.h" +#include "VPreTreatmentAdjustmentPatientConnectionConfirm.h" +#include "VPreTreatmentAdjustmentStartTreatment.h" // In-treatment - Data #include "VTreatmentBloodFlow.h" #include "VTreatmentDialysateFlow.h" @@ -67,7 +76,6 @@ // ----- In-Treatment Adjustments #include "VTreatmentAdjustmentDuration.h" #include "VTreatmentAdjustmentFlows.h" -#include "VTreatmentAdjustmentUltrafiltrationInit.h" #include "VTreatmentAdjustmentUltrafiltrationState.h" #include "VTreatmentAdjustmentUltrafiltrationEdit.h" #include "VTreatmentAdjustmentUltrafiltrationConfirm.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -129,12 +129,12 @@ ID_AdjustDisposablesPrimeReq = 0x3C00, // 60 ID_AdjustDisposablesPrimeRsp = 0x3D00, // 61 ID_DisposablesPrimeData = 0x4300, // 67 - // Pre-Treatment Ultrafiltration initial volume - ID_AdjustUltrafiltrationInitReq = 0x4F00, // 79 - ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 // Pre-Treatment Patient Connection Begin ID_AdjustPatientConnectionBeginReq = 0x6400, // 100 ID_AdjustPatientConnectionBeginRsp = 0x6500, // 101 + // Pre-Treatment Ultrafiltration initial volume + ID_AdjustUltrafiltrationInitReq = 0x4F00, // 79 + ID_AdjustUltrafiltrationInitRsp = 0x5000, // 80 // Pre-Treatment Patient Connection Confirm ID_AdjustPatientConnectionConfirmReq= 0x6600, // 102 ID_AdjustPatientConnectionConfirmRsp= 0x6700, // 103 Index: sources/gui/qml/main.qml =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/main.qml (.../main.qml) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/gui/qml/main.qml (.../main.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -22,10 +22,14 @@ import Gui.Actions 0.1 // View classes +import VHDAccelerometer 0.1 +import VTreatmentAdjustmentVersions 0.1 + +// States views import VHDOperationMode 0.1 import VPreTreatmentStates 0.1 import VHDTreatmentStates 0.1 - +// In-Treatment - Data import VTreatmentBloodFlow 0.1 import VTreatmentDialysateFlow 0.1 import VTreatmentPressureOcclusion 0.1 @@ -35,12 +39,20 @@ import VTreatmentRecirculate 0.1 import VTreatmentBloodPrime 0.1 import VTreatmentRanges 0.1 -import VHDAccelerometer 0.1 -// Pre-Treatment Progress Data +// Pre-Treatment +import VPreTreatmentAdjustmentInitTreatment 0.1 import VDGFilterFlush 0.1 +import VPreTreatmentAdjustmentWaterSample 0.1 +import VPreTreatmentAdjustmentConsumablesConfirm 0.1 import VPreTreatmentSelfTestNoCartridge 0.1 +import VPreTreatmentAdjustmentDisposablesConfirm 0.1 import VPreTreatmentSelfTestDry 0.1 -import VPreTreatmentDisposablePrime 0.1 +import VPreTreatmentAdjustmentDisposablesPrime 0.1 +import VPreTreatmentDisposablesPrime 0.1 +import VPreTreatmentAdjustmentPatientConnectionBegin 0.1 +import VPreTreatmentAdjustmentUltrafiltrationInit 0.1 +import VPreTreatmentAdjustmentPatientConnectionConfirm 0.1 +import VPreTreatmentAdjustmentStartTreatment 0.1 // --- import VDGDrainPump 0.1 import VDGHeaters 0.1 @@ -54,11 +66,10 @@ import VTreatmentBegin 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 - +// In-Treatment - Adjustemnt import VTreatmentAdjustmentDuration 0.1 import VTreatmentAdjustmentFlows 0.1 import VTreatmentAdjustmentUltrafiltrationState 0.1 -import VTreatmentAdjustmentUltrafiltrationInit 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 import VTreatmentAdjustmentPressuresLimits 0.1 @@ -67,8 +78,8 @@ import VTreatmentAdjustmentRinseback 0.1 import VTreatmentAdjustmentRecirculate 0.1 import VTreatmentAdjustmentEnd 0.1 -import VTreatmentAdjustmentVersions 0.1 + // Qml imports import "qrc:/globals" import "qrc:/pages" @@ -107,17 +118,27 @@ VDGTemperatures { id: vDGTemperatures } VDGValvesStates { id: vDGValvesStates } VDGAccelerometer { id: vDGAccelerometer } + // --- Pre-Treatment Progress Data - VDGFilterFlush { id: vDGFilterFlush } - VPreTreatmentSelfTestNoCartridge { id: vPreTreatmentSelfTestNoCartridge } - VPreTreatmentSelfTestDry { id: vPreTreatmentSelfTestDry } - VPreTreatmentDisposablePrime { id: vPreTreatmentDisposablePrime } + VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } + VDGFilterFlush { id: vDGFilterFlush } + VPreTreatmentAdjustmentWaterSample { id: vPreTreatmentAdjustmentWaterSample } + VPreTreatmentAdjustmentConsumablesConfirm { id: vPreTreatmentAdjustmentConsumablesConfirm } + VPreTreatmentSelfTestNoCartridge { id: vPreTreatmentSelfTestNoCartridge } + VPreTreatmentAdjustmentDisposablesConfirm { id: vPreTreatmentAdjustmentDisposablesConfirm } + VPreTreatmentSelfTestDry { id: vPreTreatmentSelfTestDry } + VPreTreatmentAdjustmentDisposablesPrime { id: vPreTreatmentAdjustmentDisposablesPrime } + VPreTreatmentDisposablesPrime { id: vPreTreatmentDisposablesPrime } + VPreTreatmentAdjustmentPatientConnectionBegin { id: vPreTreatmentAdjustmentPatientConnectionBegin } + VPreTreatmentAdjustmentUltrafiltrationInit { id: vPreTreatmentAdjustmentUltrafiltrationInit } + VPreTreatmentAdjustmentPatientConnectionConfirm { id: vPreTreatmentAdjustmentPatientConnectionConfirm } + VPreTreatmentAdjustmentStartTreatment { id: vPreTreatmentAdjustmentStartTreatment } + // --- VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } VTreatmentBegin { id: vTreatmentBegin } - VTreatmentAdjustmentUltrafiltrationInit { id: vTreatmentAdjustmentUltrafiltrationInit } VTreatmentRanges { id: vTreatmentRanges } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -54,7 +54,7 @@ MainHome { id: _mainHome onTreatmentStarted : _root.page ( _treatmentStack ) - onTreatmentCreated : vTreatmentCreate.doSelectParameters() + onTreatmentCreated : vPreTreatmentAdjustmentInitTreatment.doInitiate() } Connections { target: vHDOperationMode Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -41,7 +41,7 @@ } PreTreatmentBase { id: _preTreatmentConsumablesSelfTest - header.confirmVisible : true + header.confirmVisible : false /* the state shall automatically change after user confirms the consumables installation */ header.confirmEnabeled : vPreTreatmentStates.selfTestConsumables_complete isComplete : vPreTreatmentStates.selfTestConsumables_complete title.text : qsTr("Consumables Self Test") @@ -61,11 +61,14 @@ } Connections { target: _preTreatmentConsumablesInstall - onConfirmClicked : { page( _preTreatmentConsumablesSelfTest )} + onConfirmClicked : { + vPreTreatmentAdjustmentConsumablesConfirm.doConfirm() + page( _preTreatmentConsumablesSelfTest ) + } } Connections { target: _preTreatmentConsumablesSelfTest - onConfirmClicked : {} + onConfirmClicked : { /* the state shall automatically change after user confirms the consumables installation */ } } onVisibleChanged: { Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -84,15 +84,13 @@ instructionStepNames : testStepNames instructionStepImages : testStepImages onBackClicked : { page( _preTreatmentDisposablesHeparinSyringe )} - onConfirmClicked : { } + onConfirmClicked : { vPreTreatmentAdjustmentDisposablesConfirm.doConfirm()} } Connections { target: vPreTreatmentStates onSelfTestNoCartridge_startChanged : { if ( vselfTestNoCartridge_start ) page( _preTreatmentDisposablesSelfTest )} onInstallationChanged : { if ( vinstallation ) page( _preTreatmentDisposablesCartridgeInstallation )} } - Connections { target: _preTreatmentDisposablesHeparinSyringe - } onVisibleChanged: { if (visible) { Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -33,7 +33,7 @@ property int stackStepIndex : 4 PreTreatmentBase { id: _preTreatmentDrySelfTest - header.confirmVisible : true + header.confirmVisible : false /* the state shall automatically change */ header.confirmEnabeled : vPreTreatmentStates.selfTestDry_complete isComplete : vPreTreatmentStates.selfTestDry_complete title.text : qsTr("Begin Prime") @@ -62,9 +62,9 @@ hasTimeCircle : true timeCircleMinimum : 0 - timeCircleMaximum : vPreTreatmentDisposablePrime.total - timeCircleProgressValue : vPreTreatmentDisposablePrime.elapsed - timeCircleTimeTextValue : vPreTreatmentDisposablePrime.remaining * 60 + timeCircleMaximum : vPreTreatmentDisposablesPrime.total + timeCircleProgressValue : vPreTreatmentDisposablesPrime.elapsed + timeCircleTimeTextValue : vPreTreatmentDisposablesPrime.remaining * 60 hasCheckList : true checkListStepNames : [ @@ -104,12 +104,12 @@ } Connections { target: _preTreatmentDrySelfTest - onConfirmClicked : {} + onConfirmClicked : { /* the state shall automatically change */ } } Connections { target: _preTreatmentDisposablesPrime - onConfirmClicked : {} - onBackClicked : { vTreatmentCreate.doRequestPop() } + onBackClicked : { vTreatmentCreate.doRequestPop() } + onConfirmClicked : { vPreTreatmentAdjustmentPatientConnectionBegin.doBegin() } //onContinueClicked : { vTreatmentCreate.doFinishedPrime() } } Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -115,8 +115,11 @@ onBackClicked : { page( _preTreatmentWaterSample )} } - onFailClicked : { page( _preTreatmentWaterSampleResultFail )} - onPassClicked : { } + onSamplePressed : { vPreTreatmentAdjustmentWaterSample.doSample( true )} + onSampleReleased : { vPreTreatmentAdjustmentWaterSample.doSample( false )} + onPassClicked : { vPreTreatmentAdjustmentWaterSample.doResult( true )} + onFailClicked : { vPreTreatmentAdjustmentWaterSample.doResult( false ) + page( _preTreatmentWaterSampleResultFail )} onEndTreatmentClicked : { } onVisibleChanged: { Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -64,35 +64,34 @@ onPatientConnectionChanged : { if ( vpatientConnection ) { page( _preTreatmentUltrafiltration )}} } - Connections { target: vTreatmentAdjustmentUltrafiltrationInit + Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit onAdjustmentTriggered : { // the maximum ultrafiltration volume has to be set/revert regardless - vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationInit.volume - _preTreatmentUltrafiltration.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume + vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume + _preTreatmentUltrafiltration.ufVolume = vPreTreatmentAdjustmentUltrafiltrationInit.volume // but only if it has been accepted it will navigate - if ( vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) { + if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) { page( _preTreatmentPatientConnection ) } else { - _preTreatmentUltrafiltration.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text() + _preTreatmentUltrafiltration.reasonText = vPreTreatmentAdjustmentUltrafiltrationInit.text() } } } Connections { target: _preTreatmentUltrafiltration - onConfirmClicked : { vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_preTreatmentUltrafiltration.ufVolume) - // TEST: page( _preTreatmentPatientConnection ) - } + onConfirmClicked : { vPreTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_preTreatmentUltrafiltration.ufVolume)} } Connections { target: _preTreatmentPatientConnection onBackClicked : { page( _preTreatmentUltrafiltration )} - onConfirmClicked : { page( _preTreatmentStartTreatment )} + onConfirmClicked : { vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm() + page( _preTreatmentStartTreatment )} } - Connections { target: _preTreatmentPatientConnection + Connections { target: _preTreatmentStartTreatment onBackClicked : { page( _preTreatmentPatientConnection )} - onConfirmClicked : { vTreatmentCreate.doStartTreatment() } + onConfirmClicked : { vPreTreatmentAdjustmentStartTreatment.doStart() } } onVisibleChanged: { Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -30,15 +30,7 @@ PreTreatmentBase { id: _root objectName: "_PreTreatmentCreate" // SquishQt testability - signal continueClicked() - header.confirmEnabeled: vTreatmentCreate.continueEnabled - onConfirmClicked: { - vTreatmentCreate.saveTreatmentProfile = false - if (vTreatmentCreate.continueEnabled) { - _root.continueClicked() - } - } function setInteractive(isInteractive) { _flickable.interactive = isInteractive Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -r4f87126626b76aa04ddcf2ae92e04e118cdcbe01 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 4f87126626b76aa04ddcf2ae92e04e118cdcbe01) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -45,31 +45,27 @@ header.confirmVisible : true title.text : qsTr("Confirm Treatment") - onBackClicked : {vTreatmentCreate.doCancelConfirmParameters() } - onConfirmClicked : {vTreatmentCreate.doFinishedConfirm() } + onBackClicked : { vTreatmentCreate.doCancelConfirmParameters() } + onConfirmClicked : { vTreatmentCreate.doFinishedConfirm() } } Connections { target: vHDOperationMode - onValidateParametersChanged : { if ( vvalidateParameters) { page( _pretreatmentCreate )}} + onValidateParametersChanged : { if ( vvalidateParameters) { page( _pretreatmentCreate )}} } Connections { target: vTreatmentCreate - onFwValidationSuccess : { push( _pretreatmentConfirm ) } + onFwValidationSuccess : { push( _pretreatmentConfirm )} } Connections { target: _pretreatmentCreate - onBackClicked : { - vTreatmentCreate.doCancelSelectingParameters() - } - onContinueClicked : {vTreatmentCreate.doFinishedCreate(); } + onBackClicked : { vTreatmentCreate.doCancelSelectingParameters()} + onConfirmClicked : { vTreatmentCreate.doFinishedCreate() } } Connections { target: _pretreatmentConfirm - onBackClicked : { - vTreatmentCreate.doCancelConfirmParameters() - page( _pretreatmentCreate ) - } - onConfirmClicked : {vTreatmentCreate.doFinishedConfirm() } + onBackClicked : { vTreatmentCreate.doCancelConfirmParameters() + page( _pretreatmentCreate )} + onConfirmClicked : { vTreatmentCreate.doFinishedConfirm() } } onVisibleChanged: { Index: sources/model/MModel.h =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/model/MModel.h (.../MModel.h) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/model/MModel.h (.../MModel.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -59,10 +59,10 @@ #include "MPreTreatmentAdjustWaterSampleResponse.h" #include "MPreTreatmentSelfTestNoCartridgeData.h" #include "MPreTreatmentSelfTestDryData.h" -#include "MPreTreatmentAdjustDisposablePrimeResponse.h" -#include "MPreTreatmentDisposablePrimeData.h" -#include "MPreTreatmentAdjustUltrafiltrationInitResponse.h" +#include "MPreTreatmentAdjustDisposablesPrimeResponse.h" +#include "MPreTreatmentDisposablesPrimeData.h" #include "MPreTreatmentAdjustPatientConnectionBeginResponse.h" +#include "MPreTreatmentAdjustUltrafiltrationInitResponse.h" #include "MPreTreatmentAdjustPatientConnectionConfirmResponse.h" #include "MPreTreatmentAdjustStartTreatmentResponse.h" @@ -246,7 +246,7 @@ REGISTER_METATYPE( DGFilterFlushData ) \ REGISTER_METATYPE( PreTreatmentSelfTestNoCartridgeData ) \ REGISTER_METATYPE( PreTreatmentSelfTestDryData ) \ - REGISTER_METATYPE( PreTreatmentDisposablePrimeData ) \ + REGISTER_METATYPE( PreTreatmentDisposablesPrimeData ) \ \ /* Request */ \ /* Pre-Treatment */ \ @@ -258,8 +258,8 @@ REGISTER_METATYPE( AdjustConsumablesConfirmRequestData ) \ REGISTER_METATYPE( AdjustDisposablesConfirmRequestData ) \ REGISTER_METATYPE( AdjustDisposablesPrimeRequestData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationInitRequestData ) \ REGISTER_METATYPE( AdjustPatientConnectionBeginRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationInitRequestData ) \ REGISTER_METATYPE( AdjustPatientConnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ \ @@ -286,9 +286,9 @@ REGISTER_METATYPE( AdjustInitTreatmentResponseData ) \ REGISTER_METATYPE( AdjustParametersValidationResponseData ) \ REGISTER_METATYPE( AdjustWaterSampleResponseData ) \ - REGISTER_METATYPE( AdjustDisposablePrimeResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ + REGISTER_METATYPE( AdjustDisposablesPrimeResponseData ) \ REGISTER_METATYPE( AdjustPatientConnectionBeginResponseData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ REGISTER_METATYPE( AdjustPatientConnectionConfirmResponseData ) \ REGISTER_METATYPE( AdjustStartTreatmentResponseData ) \ \ @@ -362,15 +362,15 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGFilterFlushData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentSelfTestDryData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentDisposablePrimeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentDisposablesPrimeData ) \ /* Response */ \ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablePrimeResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionBeginResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentResponseData ) \ \ @@ -412,8 +412,8 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesPrimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionBeginRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentRequestData ) \ /* Alarms */ \ @@ -482,15 +482,15 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGFilterFlushData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentSelfTestDryData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentDisposablePrimeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( PreTreatmentDisposablesPrimeData ) \ /* Response */ \ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustWaterSampleResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablePrimeResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionBeginResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustStartTreatmentResponseData ) \ \ @@ -519,8 +519,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesPrimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionBeginRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustStartTreatmentRequestData ) \ \ @@ -554,8 +554,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesPrimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionBeginRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustStartTreatmentRequestData ) \ \ @@ -589,8 +589,8 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesPrimeRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionBeginRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationInitRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustStartTreatmentRequestData ) \ \ @@ -655,15 +655,15 @@ ACTION_RECEIVE_SIGNAL( DGFilterFlushData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestNoCartridgeData ) \ ACTION_RECEIVE_SIGNAL( PreTreatmentSelfTestDryData ) \ - ACTION_RECEIVE_SIGNAL( PreTreatmentDisposablePrimeData ) \ + ACTION_RECEIVE_SIGNAL( PreTreatmentDisposablesPrimeData ) \ /* Response */ \ /* Pre-Treatment */ \ ACTION_RECEIVE_SIGNAL( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustWaterSampleResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDisposablePrimeResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationInitResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionBeginResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationInitResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustStartTreatmentResponseData ) \ \ Fisheye: Tag 695e95aa2ec5e6e1c395567449ac0f671ecd61ed refers to a dead (removed) revision in file `sources/model/hd/adjustment/MPreTreatmentAdjustDisposablePrimeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 695e95aa2ec5e6e1c395567449ac0f671ecd61ed refers to a dead (removed) revision in file `sources/model/hd/adjustment/MPreTreatmentAdjustDisposablePrimeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp (revision 0) +++ sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,45 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MPreTreatmentAdjustDisposablesPrimeResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 18-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 18-Mar-2021 + * + */ +#include "MPreTreatmentAdjustDisposablesPrimeResponse.h" + +using namespace Model; + +QVariantList MAdjustDisposablesPrimeResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustDisposablesPrimeResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mReason )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MAdjustDisposablesPrimeResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDisposablesPrimeResponseData MAdjustDisposablesPrimeResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.h (revision 0) +++ sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,84 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MPreTreatmentAdjustDisposablesPrimeResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 18-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 18-Mar-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDisposablesPrimeResponse class + * \details The DisposablesPrime adjustment response model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------: | + * |0x3D00| 0x020 | 6 | Rsp | Y | HD | UI | DisposablesPrime Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * \sa MAdjustDisposablesPrimeReq : DisposablesPrime Request + * \sa MTreatmentDisposablesPrime : DisposablesPrime Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustDisposablesPrime | + * + */ +class MAdjustDisposablesPrimeResponse : 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::eHD ; } + QString infoText () const override { return QString("AdjustDisposablesPrime") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustDisposablesPrimeResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDisposablesPrimeResponse::Data AdjustDisposablesPrimeResponseData; Index: sources/model/hd/adjustment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/model/hd/adjustment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/model/hd/adjustment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -343,55 +343,55 @@ }; /*! - * \brief The MAdjustPatientConnectionConfirmReq class - * \details The model to Confirm Disposables Installation + * \brief The MAdjustUltrafiltrationInitReq class + * \details The ultrafiltration volume change request model * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------------:| - * |0x6600| 0x100 | 9 | Req | Y | UI | HD | Patient Connection Confirm Request | + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4F00| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Initial Adjustment Request | * * | Payload || * | || - * | None || + * | #1:(F32) | \ref volume | * */ -class MAdjustPatientConnectionConfirmReq : public MModel { +class MAdjustUltrafiltrationInitReq : public MModel { public: + float volume = 0; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { - return toString({}); + return toString({volume}); } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("PatientConnectionConfirm", vParameters); + return MModel::toString("AdjustUFInit", vParameters); } }; /*! - * \brief The MAdjustUltrafiltrationInitReq class - * \details The ultrafiltration volume change request model + * \brief The MAdjustPatientConnectionConfirmReq class + * \details The model to Confirm Disposables Installation * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x4F00| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Initial Adjustment Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------------:| + * |0x6600| 0x100 | 9 | Req | Y | UI | HD | Patient Connection Confirm Request | * * | Payload || * | || - * | #1:(F32) | \ref volume | + * | None || * */ -class MAdjustUltrafiltrationInitReq : public MModel { +class MAdjustPatientConnectionConfirmReq : public MModel { public: - float volume = 0; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { - return toString({volume}); + return toString({}); } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("AdjustUFInit", vParameters); + return MModel::toString("PatientConnectionConfirm", vParameters); } }; @@ -432,6 +432,6 @@ typedef Model:: MAdjustDisposablesConfirmReq AdjustDisposablesConfirmRequestData; typedef Model:: MAdjustDisposablesPrimeReq AdjustDisposablesPrimeRequestData; typedef Model:: MAdjustPatientConnectionBeginReq AdjustPatientConnectionBeginRequestData; -typedef Model:: MAdjustPatientConnectionConfirmReq AdjustPatientConnectionConfirmRequestData; typedef Model:: MAdjustUltrafiltrationInitReq AdjustUltrafiltrationInitRequestData; +typedef Model:: MAdjustPatientConnectionConfirmReq AdjustPatientConnectionConfirmRequestData; typedef Model:: MAdjustStartTreatmentReq AdjustStartTreatmentRequestData; Index: sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.cpp =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.cpp (.../MPreTreatmentAdjustStartTreatmentResponse.cpp) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.cpp (.../MPreTreatmentAdjustStartTreatmentResponse.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -27,7 +27,7 @@ int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mAccepted )) if (GetValue(vByteArray, index, _data.mReason )) - return true ; + return true; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } } Fisheye: Tag 695e95aa2ec5e6e1c395567449ac0f671ecd61ed refers to a dead (removed) revision in file `sources/model/hd/data/MPreTreatmentDisposablePrimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 695e95aa2ec5e6e1c395567449ac0f671ecd61ed refers to a dead (removed) revision in file `sources/model/hd/data/MPreTreatmentDisposablePrimeData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/data/MPreTreatmentDisposablesPrimeData.cpp =================================================================== diff -u --- sources/model/hd/data/MPreTreatmentDisposablesPrimeData.cpp (revision 0) +++ sources/model/hd/data/MPreTreatmentDisposablesPrimeData.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,45 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MPreTreatmentPrime.cpp + * \author (last) Behrouz NematiPour + * \date (last) 02-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Mar-2021 + * + */ +#include "MPreTreatmentDisposablesPrimeData.h" + +using namespace Model; + +QVariantList MPreTreatmentDisposablesPrime::parameters() const { + return { + _data.mTimeout .value, + _data.mCountdown .value, + }; +} + +bool MPreTreatmentDisposablesPrime::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mTimeout )) + if (GetValue(vByteArray, index, _data.mCountdown )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MPreTreatmentPrime::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +MPreTreatmentDisposablesPrime::Data MPreTreatmentDisposablesPrime::data() const { + Data data; + data.mTimeout = _data.mTimeout .value; + data.mCountdown = _data.mCountdown .value; + return data; +} Index: sources/model/hd/data/MPreTreatmentDisposablesPrimeData.h =================================================================== diff -u --- sources/model/hd/data/MPreTreatmentDisposablesPrimeData.h (revision 0) +++ sources/model/hd/data/MPreTreatmentDisposablesPrimeData.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,79 @@ +/*! + * + * Copyright (c) 2020-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MPreTreatmentDisposablesPrimeData.h + * \author (last) Behrouz NematiPour + * \date (last) 02-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Mar-2021 + * + */ + +#pragma once + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; +namespace Model { + +/*! + * \brief The MPreTreatmentPrime class + * \details The progress and state data model + * + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:--------------: | + * |0x4300| 0x020 | 9 | 1 Hz | N | HD | UI | Pre-Treatment Disposable Priming Progress Data | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mTimeout | + * | #2:(U32) | \ref Data::mCountdown | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | HD | + * | infoText | DisposablesPrime | + * + */ +class MPreTreatmentDisposablesPrime : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mTimeout ; + Types::U32 mCountdown ; + } _data; + +public: + Type_Enum typeText () const override { return Type_Enum::eDatum ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("DisposablesPrime"); } + + struct Data { + quint32 mTimeout = 0; ///< Timeout Total time in sec */ + quint32 mCountdown = 0; ///< Countdown current time countdown in sec */ + }; + +public: + MPreTreatmentDisposablesPrime() { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MPreTreatmentDisposablesPrime::Data PreTreatmentDisposablesPrimeData; Index: sources/view/VView.h =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/VView.h (.../VView.h) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/view/VView.h (.../VView.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -88,7 +88,7 @@ VIEW_DEC_CLASS(vCLASS) \ VIEW_DEC_SLOT(vDATATYPE) \ //--------------------------------------------------------------------------------// -#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ +#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS) \ using namespace View; \ vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentResponseBase(parent) { \ initConnections(); \ @@ -135,14 +135,22 @@ REGISTER_TYPE( VDGValvesStates ) \ REGISTER_TYPE( VDGAccelerometer ) \ /* Pre-Treatment */ \ + REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ REGISTER_TYPE( VDGFilterFlush ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentWaterSample ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentConsumablesConfirm ) \ REGISTER_TYPE( VPreTreatmentSelfTestNoCartridge ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesConfirm ) \ REGISTER_TYPE( VPreTreatmentSelfTestDry ) \ - REGISTER_TYPE( VPreTreatmentDisposablePrime ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesPrime ) \ + REGISTER_TYPE( VPreTreatmentDisposablesPrime ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionBegin) \ + REGISTER_TYPE( VPreTreatmentAdjustmentUltrafiltrationInit ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionConfirm ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentStartTreatment ) \ /* In-Treatment */ \ REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ - REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationInit ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \ Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,36 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentConsumablesConfirm.cpp + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#include "VPreTreatmentAdjustmentConsumablesConfirm.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentConsumablesConfirm) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentConsumablesConfirm::initConnections() { + ADJUST_VIEW_CONNECTION(AdjustConsumablesConfirmRequestData); +} + +/*! + * \brief View::VPreTreatmentAdjustmentConsumablesConfirm::doConfirm + * \details the invocable slot to send user's consumables installation confirm + */ +void View::VPreTreatmentAdjustmentConsumablesConfirm::doConfirm() { + AdjustConsumablesConfirmRequestData data; + emit didAdjustment(data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentConsumablesConfirm.h + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentConsumablesConfirm class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustConsumablesConfirmResponse + * + */ +class VPreTreatmentAdjustmentConsumablesConfirm : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // 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) + // coco end + + VIEW_DEC_CLASS(VPreTreatmentAdjustmentConsumablesConfirm) + +public slots: + void doConfirm(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's consumables installation confirm + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustConsumablesConfirmRequestData &vData); +}; +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,36 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentDisposablesConfirm.cpp + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#include "VPreTreatmentAdjustmentDisposablesConfirm.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesConfirm) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentDisposablesConfirm::initConnections() { + ADJUST_VIEW_CONNECTION(AdjustDisposablesConfirmRequestData); +} + +/*! + * \brief View::VPreTreatmentAdjustmentDisposablesConfirm::doConfirm + * \details the invocable slot to send user's Disposables installation confirm + */ +void View::VPreTreatmentAdjustmentDisposablesConfirm::doConfirm() { + AdjustDisposablesConfirmRequestData data; + emit didAdjustment(data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentDisposablesConfirm.h + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentDisposablesConfirm class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustDisposablesConfirmResponse + * + */ +class VPreTreatmentAdjustmentDisposablesConfirm : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // 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) + // coco end + + VIEW_DEC_CLASS(VPreTreatmentAdjustmentDisposablesConfirm) + +public slots: + void doConfirm(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Disposables installation confirm + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustDisposablesConfirmRequestData &vData); +}; +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentDisposablesPrime.cpp + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#include "VPreTreatmentAdjustmentDisposablesPrime.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesPrime) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentDisposablesPrime::initConnections() { + ACTION_VIEW_CONNECTION(AdjustDisposablesPrimeResponseData); + ADJUST_VIEW_CONNECTION(AdjustDisposablesPrimeRequestData ); +} + +/*! + * \brief VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentDisposablesPrime::onActionReceive(const AdjustDisposablesPrimeResponseData &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 ); +} + +/*! + * \brief View::VPreTreatmentAdjustmentDisposablesPrime::doPrime + * \details the invocable slot to send user's Disposables installation Prime + */ +void View::VPreTreatmentAdjustmentDisposablesPrime::doPrime() { + AdjustDisposablesPrimeRequestData data; + emit didAdjustment(data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentDisposablesPrime.h + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentDisposablesPrime class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustDisposablesPrimeResponse + * + */ +class VPreTreatmentAdjustmentDisposablesPrime : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // 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) + // coco end + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesPrime, AdjustDisposablesPrimeResponseData) + +public slots: + void doPrime(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Disposables installation Prime + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustDisposablesPrimeRequestData &vData); +}; +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,63 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentInitTreatment.cpp + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#include "VPreTreatmentAdjustmentInitTreatment.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentInitTreatment) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentInitTreatment::initConnections() { + ADJUST_VIEW_CONNECTION(AdjustInitTreatmentRequestData ); + ACTION_VIEW_CONNECTION(AdjustInitTreatmentResponseData ); +} + +/*! + * \brief VPreTreatmentAdjustmentInitTreatment::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentInitTreatment::onActionReceive(const AdjustInitTreatmentResponseData &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 ); +} + +/*! + * \brief View::VPreTreatmentAdjustmentInitTreatment::doInitiate + * \details requests to initiate a treatment and starting to set treatment parameters. + */ +void View::VPreTreatmentAdjustmentInitTreatment::doInitiate() { + AdjustInitTreatmentRequestData data; + data.requestedState = AdjustInitTreatmentRequestData::eInitiate; + emit didAdjustment(data); +} + +/*! + * \brief View::VPreTreatmentAdjustmentInitTreatment::doCancel + * \details requests to cancel the initiation of a treatment and goes back (typically to standby state) + */ +void View::VPreTreatmentAdjustmentInitTreatment::doCancel() { + AdjustInitTreatmentRequestData data; + data.requestedState = AdjustInitTreatmentRequestData::eCancel; + emit didAdjustment(data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,62 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentInitTreatment.h + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentInitTreatment class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustInitTreatmentResponse + * + */ +class VPreTreatmentAdjustmentInitTreatment : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // 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) + // coco end + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentInitTreatment, AdjustInitTreatmentResponseData) + + // ----------- Adjust Ultrafiltration +public slots: + void doInitiate(); + void doCancel (); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send user request of start/stop the water sample. + * \param vData - data model that contains the request data. + */ + void didAdjustment(const AdjustInitTreatmentRequestData &vData); +}; +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentPatientConnectionBegin.cpp + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#include "VPreTreatmentAdjustmentPatientConnectionBegin.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentPatientConnectionBegin) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentPatientConnectionBegin::initConnections() { + ACTION_VIEW_CONNECTION(AdjustPatientConnectionBeginResponseData); + ADJUST_VIEW_CONNECTION(AdjustPatientConnectionBeginRequestData ); +} + +/*! + * \brief VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentPatientConnectionBegin::onActionReceive(const AdjustPatientConnectionBeginResponseData &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 ); +} + +/*! + * \brief View::VPreTreatmentAdjustmentPatientConnectionBegin::doPrime + * \details the invocable slot to send user's Disposables installation Prime + */ +void View::VPreTreatmentAdjustmentPatientConnectionBegin::doBegin() { + AdjustPatientConnectionBeginRequestData data; + emit didAdjustment(data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentPatientConnectionBegin.h + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentPatientConnectionBegin class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustPatientConnectionBeginResponse + * + */ +class VPreTreatmentAdjustmentPatientConnectionBegin : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // 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) + // coco end + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentPatientConnectionBegin, AdjustPatientConnectionBeginResponseData) + +public slots: + void doBegin(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Disposables installation Prime + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustPatientConnectionBeginRequestData &vData); +}; +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentPatientConnectionConfirm.cpp + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#include "VPreTreatmentAdjustmentPatientConnectionConfirm.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentPatientConnectionConfirm) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentPatientConnectionConfirm::initConnections() { + ACTION_VIEW_CONNECTION(AdjustPatientConnectionConfirmResponseData); + ADJUST_VIEW_CONNECTION(AdjustPatientConnectionConfirmRequestData ); +} + +/*! + * \brief VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentPatientConnectionConfirm::onActionReceive(const AdjustPatientConnectionConfirmResponseData &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 ); +} + +/*! + * \brief View::VPreTreatmentAdjustmentPatientConnectionConfirm::doPrime + * \details the invocable slot to send user's Disposables installation Prime + */ +void View::VPreTreatmentAdjustmentPatientConnectionConfirm::doConfirm() { + AdjustPatientConnectionConfirmRequestData data; + emit didAdjustment(data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentPatientConnectionConfirm.h + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentPatientConnectionConfirm class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustPatientConnectionConfirmResponse + * + */ +class VPreTreatmentAdjustmentPatientConnectionConfirm : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // 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) + // coco end + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentPatientConnectionConfirm, AdjustPatientConnectionConfirmResponseData) + +public slots: + void doConfirm(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Disposables installation Prime + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustPatientConnectionConfirmRequestData &vData); +}; +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentStartTreatment.cpp + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#include "VPreTreatmentAdjustmentStartTreatment.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentStartTreatment) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentStartTreatment::initConnections() { + ACTION_VIEW_CONNECTION(AdjustStartTreatmentResponseData); + ADJUST_VIEW_CONNECTION(AdjustStartTreatmentRequestData ); +} + +/*! + * \brief VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentStartTreatment::onActionReceive(const AdjustStartTreatmentResponseData &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 ); +} + +/*! + * \brief View::VPreTreatmentAdjustmentStartTreatment::doPrime + * \details the invocable slot to send user's Disposables installation Prime + */ +void View::VPreTreatmentAdjustmentStartTreatment::doStart() { + AdjustStartTreatmentRequestData data; + emit didAdjustment(data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentStartTreatment.h + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentStartTreatment class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustStartTreatmentResponse + * + */ +class VPreTreatmentAdjustmentStartTreatment : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // 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) + // coco end + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentStartTreatment, AdjustStartTreatmentResponseData) + +public slots: + void doStart(); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send the user's Disposables installation Prime + * \param vData - data model includes request information + */ + void didAdjustment(const AdjustStartTreatmentRequestData &vData); +}; +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,56 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentUltrafiltrationInit.cpp + * \author (last) Behrouz NematiPour + * \date (last) 08-Dec-2020 + * \author (original) Behrouz NematiPour + * \date (original) 08-Dec-2020 + * + */ +#include "VPreTreatmentAdjustmentUltrafiltrationInit.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentUltrafiltrationInit) + +/*! + * \brief Connection Initializer + * \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentUltrafiltrationInit::initConnections() { + ACTION_VIEW_CONNECTION(AdjustUltrafiltrationInitResponseData); + ADJUST_VIEW_CONNECTION(AdjustUltrafiltrationInitRequestData ); +} + +/*! + * \brief VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive(const AdjustUltrafiltrationInitResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + volume ( vData.mVolume / 1000 ); // mL => L + + // *** 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 ); +} + +/*! + * \brief View::VPreTreatmentAdjustmentUltrafiltrationInit::doAdjustment + * \details the invocable slot to adjust the treatment ultrafiltration volume + * \param vVolume - requested ultrafiltration volume + */ +void View::VPreTreatmentAdjustmentUltrafiltrationInit::doAdjustment(float vVolume) { + _data.volume = vVolume * 1000; // L => mL + emit didAdjustment(_data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,66 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentUltrafiltrationInit.h + * \author (last) Behrouz NematiPour + * \date (last) 08-Dec-2020 + * \author (original) Behrouz NematiPour + * \date (original) 08-Dec-2020 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentUltrafiltrationInit class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustUltrafiltrationInitResponse + * + */ +class VPreTreatmentAdjustmentUltrafiltrationInit : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustUltrafiltrationInitRequestData _data; + + // coco begin validated: + // 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) + // coco end + + // Treatment Ultrafiltration data + PROPERTY( float , volume , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentUltrafiltrationInit, AdjustUltrafiltrationInitResponseData) + + // ----------- Adjust Ultrafiltration +public slots: + void doAdjustment(float vVolume); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the treatment ultrafiltration volume + * \param vData - data model for edit the treatment ultrafiltration volume adjustment request + */ + void didAdjustment(const AdjustUltrafiltrationInitRequestData &vData); +}; +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.cpp (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,70 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentWaterSample.cpp + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#include "VPreTreatmentAdjustmentWaterSample.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentWaterSample) + +/*! \brief Connection Initializer + \details All the class signal/slot connections are defined here. +*/ +void View::VPreTreatmentAdjustmentWaterSample::initConnections() { + ADJUST_VIEW_CONNECTION(AdjustWaterSampleRequestData ); + ADJUST_VIEW_CONNECTION(AdjustWaterSampleResultRequestData ); + ACTION_VIEW_CONNECTION(AdjustWaterSampleResponseData ); +} + +/*! + * \brief VPreTreatmentAdjustmentWaterSample::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentWaterSample::onActionReceive(const AdjustWaterSampleResponseData &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 ); +} + +/*! + * \brief View::VPreTreatmentAdjustmentWaterSample::doSample + * \details requests to start or stop the water sample + * \param vStart - the boolean value to indicate the request. + */ +void View::VPreTreatmentAdjustmentWaterSample::doSample(bool vStart) { + AdjustWaterSampleRequestData data; + data.requestedState = vStart ? + AdjustWaterSampleRequestData::eStart: + AdjustWaterSampleRequestData::eStop ; + emit didAdjustment(data); +} + +/*! + * \brief View::VPreTreatmentAdjustmentWaterSample::doResult + * \details requests to send the user result of the water sample. + * \param vPassed - the boolean value to indicate the result if passed is true, false otherwise. + */ +void View::VPreTreatmentAdjustmentWaterSample::doResult(bool vPassed) { + AdjustWaterSampleResultRequestData data; + data.requestedState = vPassed ? + AdjustWaterSampleResultRequestData::ePassed : + AdjustWaterSampleResultRequestData::eFailed ; + emit didAdjustment(data); +} Index: sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h =================================================================== diff -u --- sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h (revision 0) +++ sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,70 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentAdjustmentWaterSample.h + * \author (last) Behrouz NematiPour + * \date (last) 22-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2021 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "VView.h" +#include "VTreatmentAdjustmentResponseBase.h" + +namespace View { + +/*! + * \brief The VPreTreatmentAdjustmentWaterSample class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustWaterSampleResponse + * + */ +class VPreTreatmentAdjustmentWaterSample : public VTreatmentAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // 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) + // coco end + + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentWaterSample, AdjustWaterSampleResponseData) + + // ----------- Adjust Ultrafiltration +public slots: + void doSample (bool vStart); + void doResult (bool vPassed); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to send user request of start/stop the water sample. + * \param vData - data model that contains the request data. + */ + void didAdjustment(const AdjustWaterSampleRequestData &vData); + + /*! + * \brief didAdjustment + * \details the notification signal to request to send the user water sample result. + * \param vData - data model that contains the request data. + */ + void didAdjustment(const AdjustWaterSampleResultRequestData &vData); + +}; +} Index: sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp (.../VTreatmentAdjustmentDuration.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp (.../VTreatmentAdjustmentDuration.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDuration, AdjustDurationResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDuration) void VTreatmentAdjustmentDuration::initConnections() { ACTION_VIEW_CONNECTION(AdjustDurationResponseData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp =================================================================== diff -u -r81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp (.../VTreatmentAdjustmentEnd.cpp) (revision 81999ff346ffc8e3f9c4dd1c948b4b7fc577de2c) +++ sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp (.../VTreatmentAdjustmentEnd.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentEnd, AdjustTreatmentEndResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentEnd) void VTreatmentAdjustmentEnd::initConnections() { ACTION_VIEW_CONNECTION(AdjustTreatmentEndResponseData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp (.../VTreatmentAdjustmentFlows.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp (.../VTreatmentAdjustmentFlows.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,8 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentFlows, AdjustBloodDialysateResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentFlows) + void VTreatmentAdjustmentFlows::initConnections() { ACTION_VIEW_CONNECTION(AdjustBloodDialysateResponseData); ADJUST_VIEW_CONNECTION( AdjustBloodDialysateRequestData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp (.../VTreatmentAdjustmentHeparin.cpp) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp (.../VTreatmentAdjustmentHeparin.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentHeparin, AdjustHeparinResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentHeparin) void VTreatmentAdjustmentHeparin::initConnections() { ACTION_VIEW_CONNECTION(AdjustHeparinResponseData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp =================================================================== diff -u -r5c15c47de2e809f385e91e6136526020d227cb43 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision 5c15c47de2e809f385e91e6136526020d227cb43) +++ sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp (.../VTreatmentAdjustmentPressuresLimits.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,8 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits) + void VTreatmentAdjustmentPressuresLimits::initConnections() { ACTION_VIEW_CONNECTION(AdjustPressuresLimitsResponseData); ADJUST_VIEW_CONNECTION( AdjustPressuresLimitsRequestData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp =================================================================== diff -u -r2d2917978a4e25eb79a0fb71851b6124171d8072 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp (.../VTreatmentAdjustmentRecirculate.cpp) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) +++ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp (.../VTreatmentAdjustmentRecirculate.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentRecirculate, AdjustRecirculateResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentRecirculate) void VTreatmentAdjustmentRecirculate::initConnections() { ACTION_VIEW_CONNECTION(AdjustRecirculateResponseData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp =================================================================== diff -u -rfd25d67f37410037f22be9c6e958b100e3790de9 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp (.../VTreatmentAdjustmentRinseback.cpp) (revision fd25d67f37410037f22be9c6e958b100e3790de9) +++ sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp (.../VTreatmentAdjustmentRinseback.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentRinseback, AdjustRinsebackResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentRinseback) void VTreatmentAdjustmentRinseback::initConnections() { ACTION_VIEW_CONNECTION(AdjustRinsebackResponseData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp =================================================================== diff -u -r4bbec52d2257cfdef37604e3453846e501a2af91 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) +++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentSaline, AdjustSalineResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentSaline) void VTreatmentAdjustmentSaline::initConnections() { ACTION_VIEW_CONNECTION(AdjustSalineResponseData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp (.../VTreatmentAdjustmentUltrafiltrationConfirm.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm) /*! \brief Connection Initializer \details All the class signal/slot connections are defined here. Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp (.../VTreatmentAdjustmentUltrafiltrationEdit.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp (.../VTreatmentAdjustmentUltrafiltrationEdit.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationEdit, AdjustUltrafiltrationEditResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationEdit) /*! \brief Connection Initializer \details All the class signal/slot connections are defined here. Fisheye: Tag 695e95aa2ec5e6e1c395567449ac0f671ecd61ed refers to a dead (removed) revision in file `sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 695e95aa2ec5e6e1c395567449ac0f671ecd61ed refers to a dead (removed) revision in file `sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp (.../VTreatmentAdjustmentUltrafiltrationState.cpp) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp (.../VTreatmentAdjustmentUltrafiltrationState.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationState) void VTreatmentAdjustmentUltrafiltrationState::initConnections() { ACTION_VIEW_CONNECTION(AdjustUltrafiltrationStateResponseData); Index: sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp =================================================================== diff -u -r2d2917978a4e25eb79a0fb71851b6124171d8072 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp (.../VTreatmentAdjustmentVersions.cpp) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) +++ sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp (.../VTreatmentAdjustmentVersions.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentVersions, AdjustVersionsResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentVersions) void VTreatmentAdjustmentVersions::initConnections() { ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData); Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r7777127f3b60d5f884cd07adc9d586353d914f69 -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 7777127f3b60d5f884cd07adc9d586353d914f69) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -17,7 +17,7 @@ // Project #include "GuiController.h" -VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData) +VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus) void VAlarmStatus::initConnections() { ACTION_VIEW_CONNECTION(AlarmStatusData ); Fisheye: Tag 695e95aa2ec5e6e1c395567449ac0f671ecd61ed refers to a dead (removed) revision in file `sources/view/hd/data/VPreTreatmentDisposablePrimeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 695e95aa2ec5e6e1c395567449ac0f671ecd61ed refers to a dead (removed) revision in file `sources/view/hd/data/VPreTreatmentDisposablePrimeData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/hd/data/VPreTreatmentDisposablesPrimeData.cpp =================================================================== diff -u --- sources/view/hd/data/VPreTreatmentDisposablesPrimeData.cpp (revision 0) +++ sources/view/hd/data/VPreTreatmentDisposablesPrimeData.cpp (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,27 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentDisposablesPrimeData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 02-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Mar-2021 + * + */ +#include "VPreTreatmentDisposablesPrimeData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VPreTreatmentDisposablesPrime, PreTreatmentDisposablesPrimeData) + +void VPreTreatmentDisposablesPrime::onActionReceive(const PreTreatmentDisposablesPrimeData &vData) +{ + total (vData.mTimeout ); + remaining (vData.mCountdown ); + elapsed (vData.mTimeout - vData.mCountdown ); +} Index: sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h =================================================================== diff -u --- sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h (revision 0) +++ sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -0,0 +1,45 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file VPreTreatmentDisposablesPrimeData.h + * \author (last) Behrouz NematiPour + * \date (last) 02-Mar-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Mar-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : don't remove +#include "MModel.h" +#include "VView.h" + +// namespace +namespace View { + +/*! + * \brief The VPreTreatmentDisposablesPrime class + * \details View for Model's data representation. + * + * \sa Model::MTreatmentTime + * + */ +class VPreTreatmentDisposablesPrime : public QObject +{ + Q_OBJECT + + PROPERTY( quint32 , total , 0) + PROPERTY( quint32 , remaining , 0) + PROPERTY( quint32 , elapsed , 0) + + VIEW_DEC(VPreTreatmentDisposablesPrime, PreTreatmentDisposablesPrimeData) +}; +} Index: unittests/tst_models.cpp =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- unittests/tst_models.cpp (.../tst_models.cpp) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -39,7 +39,7 @@ #include "MTreatmentTimeData.h" #include "MTreatmentPressureOcclusionData.h" #include "MTreatmentSalineData.h" -#include "MPreTreatmentDisposablePrimeData.h" +#include "MPreTreatmentDisposablesPrimeData.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" @@ -1743,7 +1743,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPreTreatmentPrime test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MPreTreatmentPrime() { - Model::MPreTreatmentDisposablePrime mData; + Model::MPreTreatmentDisposablesPrime mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); Index: unittests/tst_views.cpp =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- unittests/tst_views.cpp (.../tst_views.cpp) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -21,7 +21,7 @@ #include "VTreatmentAdjustmentUltrafiltrationState.h" #include "FileHandler.h" #include "VTreatmentBegin.h" -#include "VPreTreatmentDisposablePrimeData.h" +#include "VPreTreatmentDisposablesPrimeData.h" #include "VAlarmStatus.h" tst_views::tst_views(QObject *parent) : QObject(parent) { }