Index: leahi.pro =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- leahi.pro (.../leahi.pro) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ leahi.pro (.../leahi.pro) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -174,10 +174,6 @@ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ - sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h \ - sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h \ - sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h \ - sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ sources/model/td/data/MTDAirBubbleData.h \ sources/model/td/data/MTDAirPumpData.h \ sources/model/td/data/MTDAirTrapData.h \ @@ -208,9 +204,19 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED + sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ \ # ---------- Views - TD - Data - States //// ----- @LEAHIZED sources/view/dd/data/VDDBloodLeakData.h \ sources/view/dd/data/VDDConcentratePumpData.h \ @@ -238,13 +244,20 @@ sources/view/td/data/VTDEjectorData.h \ sources/view/td/data/VTDOpModeData.h \ \ # ---------- Views - TD - Adjustment - In-Treatment + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.h \ - \ # ---------- Models - TD - Adjustment - In-Treatment - sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -293,7 +306,6 @@ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ \ # ---------- Models - HD - Adjustment - End-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \ @@ -386,10 +398,6 @@ sources/view/settings/VCloudSync.h \ sources/view/settings/VHDUsageInfo.h \ sources/view/settings/VAdjustmentInstitutionalRecord.h \ - \ # ---------- Views - TD - Adjustment - In-Treatment - sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ sources/view/hd/alarm/VAlarmActiveList.h \ @@ -408,9 +416,7 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ \ # ---------- Views - HD - Adjustment - End-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h \ @@ -508,10 +514,6 @@ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \ - sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp \ - sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp \ - sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp \ - sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ sources/model/td/data/MTDAirPumpData.cpp \ sources/model/td/data/MTDAirTrapData.cpp \ @@ -561,9 +563,19 @@ \ # ---------- Models - TD - Data - States sources/model/td/data/MTDOpModeData.cpp \ \ # ---------- Models - TD - Adjustment - In-Treatment - sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ - sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \ \ # ---------- Models - CONFIRM sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST @@ -589,8 +601,6 @@ \ # ---------- Models - Data - States sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ - \ # ---------- Models - TD - Adjustment - In-Treatment - sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings @@ -609,7 +619,6 @@ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ - sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ \ # ---------- Models - HD - Adjustment - End-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ @@ -686,14 +695,20 @@ sources/view/td/data/VTDEjectorData.cpp \ sources/view/td/data/VTDOpModeData.cpp \ \ # ---------- Views - TD - Adjustment - In-Treatment + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp \ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST @@ -730,9 +745,7 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ - sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ \ # ---------- Views - HD - Adjustment - End-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp \ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp \ Index: leahi.qrc =================================================================== diff -u -rd5e9940fa96373f6cc118dfa9761d95f361689a5 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- leahi.qrc (.../leahi.qrc) (revision d5e9940fa96373f6cc118dfa9761d95f361689a5) +++ leahi.qrc (.../leahi.qrc) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -267,17 +267,17 @@ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml - sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml - sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSaline.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml - sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -164,6 +164,22 @@ {Gui::GuiActionType::ID_AdjustDurationConfirmRsp , 5 * 4 }, // 4 parameters each 4bytes // ---- + {Gui::GuiActionType::ID_AdjustSetPointsReq , 5 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustSetPointsRsp , 7 * 4 }, // 4 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustBloodFlowRateReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustBloodFlowRateRsp , 3 * 4 }, // 4 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustDialysateFlowRateReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDialysateFlowRateRsp , 3 * 4 }, // 4 parameters each 4bytes + + // ---- + {Gui::GuiActionType::ID_AdjustDialysateTemperatureReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustDialysateTemperatureRsp , 3 * 4 }, // 4 parameters each 4bytes + + // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 2 * 4 }, // 2 parameter each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -248,6 +248,11 @@ case Gui::GuiActionType::ID_AdjustBolusVolumeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustBolusVolumeRequestData ); break; case Gui::GuiActionType::ID_AdjustDurationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationEditRequestData ); break; case Gui::GuiActionType::ID_AdjustDurationConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustSetPointsReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSetPointsRequestData ); break; + case Gui::GuiActionType::ID_AdjustBloodFlowRateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodFlowRateRequestData ); break; + case Gui::GuiActionType::ID_AdjustDialysateFlowRateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDialysateFlowRateRequestData ); break; + case Gui::GuiActionType::ID_AdjustDialysateTemperatureReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDialysateTemperatureRequestData ); break; + case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodDialysateRequestData ); break; case Gui::GuiActionType::ID_AdjustPressuresLimitsReq : INTERPRET_TRANSMIT_MESSAGE(AdjustPressuresLimitsRequestData ); break; case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData ); break; @@ -527,6 +532,10 @@ // ----- In-Treatment Adjust case Gui::GuiActionType::ID_AdjustDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationEditRsp ); break; case Gui::GuiActionType::ID_AdjustDurationConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationConfirmRsp ); break; + case Gui::GuiActionType::ID_AdjustSetPointsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSetPointsRsp ); break; + case Gui::GuiActionType::ID_AdjustBloodFlowRateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodFlowRateRsp ); break; + case Gui::GuiActionType::ID_AdjustDialysateFlowRateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDialysateFlowRateRsp ); break; + case Gui::GuiActionType::ID_AdjustDialysateTemperatureRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDialysateTemperatureRsp ); break; case Gui::GuiActionType::ID_AdjustBolusVolumeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBolusVolumeRsp ); break; case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break; case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -237,20 +237,32 @@ ID_TreatmentParametersSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED // In-Treatment Adjustables - ID_AdjustDurationEditReq = 0x8300, // 124 //// ----- @LEAHIZED - ID_AdjustDurationEditRsp = 0x8400, // 125 //// ----- @LEAHIZED - ID_AdjustDurationConfirmReq = 0x8500, // 126 //// ----- @LEAHIZED - ID_AdjustDurationConfirmRsp = 0x8600, // 127 //// ----- @LEAHIZED + ID_AdjustBolusVolumeReq = 0x8100, // 122 //// ----- @LEAHIZED + ID_AdjustBolusVolumeRsp = 0x8200, // 123 //// ----- @LEAHIZED + ID_AdjustDurationEditReq = 0x8300, // 131 //// ----- @LEAHIZED + ID_AdjustDurationEditRsp = 0x8400, // 132 //// ----- @LEAHIZED + ID_AdjustDurationConfirmReq = 0x8500, // 133 //// ----- @LEAHIZED + ID_AdjustDurationConfirmRsp = 0x8600, // 134 //// ----- @LEAHIZED + + ID_AdjustSetPointsReq = 0x9300, // 147 //// ----- @LEAHIZED + ID_AdjustSetPointsRsp = 0x9400, // 148 //// ----- @LEAHIZED + + ID_AdjustBloodFlowRateReq = 0x9500, // 149 //// ----- @LEAHIZED + ID_AdjustBloodFlowRateRsp = 0x9600, // 150 //// ----- @LEAHIZED + + ID_AdjustDialysateFlowRateReq = 0x9700, // 151 //// ----- @LEAHIZED + ID_AdjustDialysateFlowRateRsp = 0x9800, // 152 //// ----- @LEAHIZED + + ID_AdjustDialysateTemperatureReq = 0x9900, // 153 //// ----- @LEAHIZED + ID_AdjustDialysateTemperatureRsp = 0x9A00, // 154 //// ----- @LEAHIZED + ID_AdjustBloodDialysateReq = 0x1700, // 23 ID_AdjustBloodDialysateRsp = 0x1800, // 24 ID_AdjustPressuresLimitsReq = 0x7800, // 120 //// ----- @LEAHIZED ID_AdjustPressuresLimitsRsp = 0x7900, // 121 //// ----- @LEAHIZED - ID_AdjustBolusVolumeReq = 0x8100, // 122 //// ----- @LEAHIZED - ID_AdjustBolusVolumeRsp = 0x8200, // 123 //// ----- @LEAHIZED - ID_AdjustSalineReq = 0x5F00, // 95 ID_AdjustSalineRsp = 0x6000, // 96 Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -33,10 +33,10 @@ objectName: "TreatmentStack" onVisibleChanged : { // this should never happen by design, but in tests it can easily happen and will block the screen touch. - _treatmentAdjustmentFlow .close() + _treatmentAdjustmentSetPoints .close() _treatmentAdjustmentVitals .close() _treatmentAdjustmentPressuresLimits .close() - _treatmentAdjustmentSaline .close() + _treatmentAdjustmentBolusVolume .close() _treatmentAdjustmentDuration .close() _treatmentAdjustmentUltrafiltration .close() @@ -65,7 +65,7 @@ Connections { target: _treatmentHome function onSectionFlowClicked ( vValue ) { - _treatmentAdjustmentFlow.open() + _treatmentAdjustmentSetPoints.open() } function onSectionVitalsClicked ( vValue ) { _treatmentAdjustmentVitalsInterval.open() @@ -74,7 +74,7 @@ _treatmentAdjustmentPressuresLimits.open() } function onSectionSalineClicked ( vValue ) { - _treatmentAdjustmentSaline.open() + _treatmentAdjustmentBolusVolume.open() } function onSectionTimeClicked ( vValue ) { _treatmentAdjustmentDuration.open() @@ -88,15 +88,17 @@ ScreenItem { id: _treatmentHeparin } // TODO: make me! //// Treatment Adjustment Dialogs - TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow } + TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } - TreatmentAdjustmentSaline { id: _treatmentAdjustmentSaline } + TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } TreatmentAdjustmentUltrafiltration { id: _treatmentAdjustmentUltrafiltration } - Connections { target: _treatmentAdjustmentFlow - function onConfirmClicked ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment( - _treatmentAdjustmentFlow.bloodFlowRateValue , - _treatmentAdjustmentFlow.dialysateFlowRateValue ) + Connections { target: _treatmentAdjustmentSetPoints + function onConfirmClicked ( vValue ) { + vTreatmentAdjustmentSetPointss.doAdjustment( + _treatmentAdjustmentSetPoints.bloodFlowRateValue , + _treatmentAdjustmentSetPoints.dialysateFlowRateValue + ) } } Connections { target: _treatmentAdjustmentPressuresLimits @@ -109,9 +111,9 @@ ) } } - Connections { target: _treatmentAdjustmentSaline + Connections { target: _treatmentAdjustmentBolusVolume function onConfirmClicked ( vValue ) { - vTreatmentAdjustmentBolusVolume.doAdjustment(_treatmentAdjustmentSaline.fluidBolusVolume) + vTreatmentAdjustmentBolusVolume.doAdjustment(_treatmentAdjustmentBolusVolume.fluidBolusVolume) } } @@ -123,10 +125,10 @@ Connections { target: vTreatmentAdjustmentBolusVolume function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentBolusVolume.adjustment_Accepted ) { - _treatmentAdjustmentSaline.close() + _treatmentAdjustmentBolusVolume.close() } else { - _treatmentAdjustmentSaline.notification.text = vTreatmentAdjustmentBolusVolume.adjustment_ReasonText + _treatmentAdjustmentBolusVolume.notification.text = vTreatmentAdjustmentBolusVolume.adjustment_ReasonText } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml (revision 0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBolusVolume.qml (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,98 @@ +/*! + * + * Copyright (c) 2020-2025 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 TreatmentAdjustmentBolusVolume.qml + * \author (last) Stephen Quong + * \date (last) 11-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 11-Nov-2025 + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" +import "qrc:/compounds" + +/*! + * \brief TreatmentAdjustmentBolusVolume.qml is the screen + * To adjust the treatment saline + */ +TreatmentAdjustmentBase { id: _root + objectName: "_TreatmentAdjustmentBolusVolume" // SquishQt testability + + readonly property alias fluidBolusVolume: _fluidBolusVolume.value + + titleText: qsTr("Fluid Delivery Settings") + + onAboutToShow: { + _fluidBolusVolume.value = vTreatmentCreate.salineBolusVolume + } + + Item { id: _contentItem + objectName: "_contentItem" + anchors { + top: parent.top + bottom: notification.top + left: parent.left + right: parent.right + } + + Item { id: _contentArea + objectName: "_contentArea" + anchors { + top: parent.top + bottom: _confirmButton.top + left: parent.left + right: parent.right + } + + Column { id: _controlColumn + objectName: "_controlColumn" + anchors.centerIn: parent + spacing: Variables.defaultMargin + + LabelUnitValueAdjuster { id: _fluidBolusVolume + objectName : "_fluidBolusVolume" + text : qsTr("Fluid Bolus Volume") + unitText : Variables.unitTextSaline + isActive : true + minimum : vTreatmentRanges.salineBolusVolumeMin + maximum : vTreatmentRanges.salineBolusVolumeMax + step : vTreatmentRanges.salineBolusVolumeRes + + onDidChange : function(vValue) { value = vValue } + } + } + } + + TouchRect { id: _confirmButton + objectName : "_confirmButton" + anchors { + bottom : parent.bottom + bottomMargin : Variables.defaultMargin + horizontalCenter: parent.horizontalCenter + } + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight + text { + text : qsTr("Confirm") + font.weight : Font.Medium + } + isDefault : true + + onClicked : { + _root.confirmClicked() + } + } + } +} Fisheye: Tag 62797b3c6e0539e22a04404e16daa7c4465e178f refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 62797b3c6e0539e22a04404e16daa7c4465e178f refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSaline.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml (revision 0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentSetPoints.qml (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,265 @@ +/*! + * + * Copyright (c) 2020-2024 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 TreatmentAdjustmentFlow.qml + * \author (last) Behrouz NematiPour + * \date (last) 11-Apr-2023 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" +import "qrc:/compounds" + +/*! + * \brief TreatmentAdjustmentFlow.qml is the screen + * To adjust the treatment blood/dialysate flow + */ +TreatmentAdjustmentBase { id: _root + objectName: "_TreatmentAdjustmentFlow" // SquishQt testability + + QtObject { id: _private + objectName: "_private" + readonly property int containerWidth: (_root.width - (Variables.defaultMargin * 5))/2 + readonly property int titleFontPixelSize: Fonts.fontPixelContainerTitleSmall + readonly property int unitFontPixelSize: Fonts.fontPixelContainerUnitSmall + } + + titleText: qsTr("Treatment Parameters") + + onAboutToShow: { + _bloodFlowRate.value = vTreatmentParametersSetPoint.bloodFlow + _dialysateFlowRate.value = vTreatmentParametersSetPoint.dialysateFlow.toFixed(Variables.dialysateFlowPrecision) + _dialysateTemperature.value = Variables.notSetVariable(vTreatmentParametersSetPoint.dialysateTemp.toFixed(Variables.dialysateTempPrecision)) + } + + Connections { target: _acidConcentrateAdjustment + function onAccepted () { + vTreatmentCreate.acidConcentrate = _acidConcentrateComboBox.find(_acidConcentrateAdjustment.adjustment) + _acidConcentrateComboBox.currentIndex = vTreatmentCreate.acidConcentrate + } + } + + Item { id: _contentItem + objectName: "_contentItem" + anchors { + top: parent.top + bottom: notification.top + left: parent.left + right: parent.right + } + + Item { id: _contentArea + objectName: "_contentArea" + anchors { + top: parent.top + bottom: _confirmButton.top + left: parent.left + leftMargin: Variables.defaultMargin * 2 + right: parent.right + rightMargin: anchors.leftMargin + } + + Row { id: _controlRow + objectName: "_controlRow" + anchors.centerIn: parent + spacing: Variables.defaultMargin + + Column { id: _controlLeftColumn + objectName: "_controlLeftColumn" + spacing: Variables.defaultMargin + + LabelUnitValueAdjuster { id: _bloodFlowRate + objectName : "_bloodFlowRate" + width : _private.containerWidth + text : qsTr("Blood Flow Rate") + titleFontPixelSize : _private.titleFontPixelSize + unitText : Variables.unitTextFlowRate + unitFontPixelSize : _private.unitFontPixelSize + isActive : true + decimal : Variables.bloodFlowPrecision + minimum : vTreatmentRanges.bloodFlowRateMin + maximum : vTreatmentRanges.bloodFlowRateMax + step : vTreatmentRanges.bloodFlowRateRes + + onDidChange : function(vValue) { value = vValue } + } + + LabelUnitValueAdjuster { id: _dialysateFlowRate + objectName : "_dialysateFlowRate" + width : _private.containerWidth + text : qsTr("Dialysate Flow Rate") + titleFontPixelSize : _private.titleFontPixelSize + unitText : Variables.unitTextFlowRate + unitFontPixelSize : _private.unitFontPixelSize + isActive : true + decimal : Variables.dialysateFlowPrecision + minimum : vTreatmentRanges.dialysateFlowRateMin + maximum : vTreatmentRanges.dialysateFlowRateMax + step : vTreatmentRanges.dialysateFlowRateRes + + onDidChange : function(vValue) { value = vValue } + } + + LabelUnitValueAdjuster { id: _dialysateTemperature + objectName : "_dialysateTemperature" + width : _private.containerWidth + text : qsTr("Dialysate Temperature") + titleFontPixelSize : _private.titleFontPixelSize + unitText : Variables.unitTextTemperature + unitFontPixelSize : _private.unitFontPixelSize + isActive : true + decimal : Variables.dialysateTempPrecision + minimum : vTreatmentRanges.dialysateTempMin + maximum : vTreatmentRanges.dialysateTempMax + step : vTreatmentRanges.dialysateTempRes + + onDidChange : function(vValue) { value = vValue } + } + } + + Column { id: _controlRightColumn + objectName: "_controlRightColumn" + spacing: Variables.defaultMargin + + LabelUnitContainer { id: _acidConcentrate + objectName : "_acidConcentrate" + width : _private.containerWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Acid Concentrate") + titleFontPixelSize : _private.titleFontPixelSize + unitFontPixelSize : _private.unitFontPixelSize + showEdit : true + // valid : ! vTreatmentCreate.acidConcentrateRejectReason + onEditClicked : _acidConcentrateAdjustment.open() + + contentItem: BaseComboBox { id: _acidConcentrateComboBox + objectName : "_acidConcentrateComboBox" + anchors { + topMargin : Variables.defaultMargin / 2 + bottomMargin: anchors.topMargin + leftMargin : Variables.defaultMargin * 2 + rightMargin : anchors.leftMargin + } + font.pixelSize : _private.titleFontPixelSize + isActive : vTreatmentCreate.acidConcentrateSet + currentIndex : vTreatmentCreate.acidConcentrate + model : vTreatmentRanges.acidConcentrateOptions + onClear : { + vTreatmentRanges.doClearAcidConcentrate(vTreatmentCreate.acidConcentrateSet) + vTreatmentCreate.acidConcentrateSet = false + } + + onActivated : { + if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason } + vTreatmentCreate.acidConcentrate = _acidConcentrateComboBox.currentIndex + vTreatmentCreate.acidConcentrateSet = true + } + } + } + + LabelUnitContainer { id: _bicarbonateConcentrate + objectName : "_bicarbonateConcentrate" + width : _private.containerWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Bicarbonate Concentrate") + titleFontPixelSize : _private.titleFontPixelSize + unitFontPixelSize : _private.unitFontPixelSize + + contentItem: BaseComboBox { id: _bicarbonateConcentrateComboBox + objectName : "_bicarbonateConcentrateComboBox" + anchors { + topMargin : Variables.defaultMargin / 2 + bottomMargin: anchors.topMargin + leftMargin : Variables.defaultMargin * 2 + rightMargin : anchors.leftMargin + } + font.pixelSize : _private.titleFontPixelSize + isActive : vTreatmentCreate.bicarbonateConcentrateSet + currentIndex : vTreatmentCreate.bicarbonateConcentrate + model : vTreatmentRanges.bicarbonateConcentrateOptions + onClear : vTreatmentCreate.bicarbonateConcentrateSet = false + onActivated : { + if ( ! _bicarbonateConcentrate.valid ) { vTreatmentCreate.bicarbonateConcentrateRejectReason = Variables.noRejectReason } + vTreatmentCreate.bicarbonateConcentrate = _bicarbonateConcentrateComboBox.currentIndex + vTreatmentCreate.bicarbonateConcentrateSet = true + } + } + } + + LabelUnitContainer { id: _theoreticalConductivity + objectName : "_theoreticalConductivity" + width : _private.containerWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Theoretical Conductivity") + titleFontPixelSize : _private.titleFontPixelSize + unitText : Variables.unitTextDialCond + unitFontPixelSize : _private.unitFontPixelSize + + contentItem: Text { id: _theoreticalConductivityText + objectName : "_theoreticalConductivityText" + anchors.centerIn : parent + width : contentWidth + height : contentHeight + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + text : "--" + } + } + + LabelUnitContainer { id: _independentConductivity + objectName : "_independentConductivity" + width : _private.containerWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Independent Conductivity Reading") + titleFontPixelSize : _private.titleFontPixelSize + unitText : Variables.unitTextDialCond + unitFontPixelSize : _private.unitFontPixelSize + + contentItem: Text { id: _independentConductivityText + objectName : "_independentConductivityText" + anchors.centerIn : parent + width : contentWidth + height : contentHeight + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + text : "--" + } + } + } + } + } + + TouchRect { id: _confirmButton + objectName : "_confirmButton" + anchors { + bottom : parent.bottom + bottomMargin : Variables.defaultMargin + horizontalCenter: parent.horizontalCenter + } + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight + text { + text : qsTr("Confirm") + font.weight : Font.Medium + } + isDefault : true + + onClicked : { + _root.confirmClicked() + } + } + } +} Index: sources/model/MModel.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/model/MModel.h (.../MModel.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/MModel.h (.../MModel.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -148,6 +148,10 @@ #include "MTreatmentAdjustBolusVolumeResponse.h" #include "MTreatmentAdjustDurationEditResponse.h" #include "MTreatmentAdjustDurationConfirmResponse.h" +#include "MTreatmentAdjustSetPointsResponse.h" +#include "MTreatmentAdjustBloodFlowRateResponse.h" +#include "MTreatmentAdjustDialysateFlowRateResponse.h" +#include "MTreatmentAdjustDialysateTemperatureResponse.h" #include "MTreatmentAdjustBloodDialysateResponse.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" @@ -451,6 +455,10 @@ REGISTER_METATYPE( AdjustBolusVolumeRequestData ) \ REGISTER_METATYPE( AdjustDurationEditRequestData ) \ REGISTER_METATYPE( AdjustDurationConfirmRequestData ) \ + REGISTER_METATYPE( AdjustSetPointsRequestData ) \ + REGISTER_METATYPE( AdjustBloodFlowRateRequestData ) \ + REGISTER_METATYPE( AdjustDialysateFlowRateRequestData ) \ + REGISTER_METATYPE( AdjustDialysateTemperatureRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ @@ -493,6 +501,10 @@ REGISTER_METATYPE( AdjustBolusVolumeResponseData ) \ REGISTER_METATYPE( AdjustDurationEditResponseData ) \ REGISTER_METATYPE( AdjustDurationConfirmResponseData ) \ + REGISTER_METATYPE( AdjustSetPointsResponseData ) \ + REGISTER_METATYPE( AdjustBloodFlowRateResponseData ) \ + REGISTER_METATYPE( AdjustDialysateFlowRateResponseData ) \ + REGISTER_METATYPE( AdjustDialysateTemperatureResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ @@ -652,6 +664,10 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBolusVolumeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationConfirmResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSetPointsResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodFlowRateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ @@ -693,6 +709,10 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBolusVolumeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSetPointsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDialysateTemperatureRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ @@ -876,6 +896,10 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBolusVolumeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationConfirmResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSetPointsResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodFlowRateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDialysateFlowRateResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDialysateTemperatureResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ @@ -941,6 +965,10 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBolusVolumeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSetPointsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDialysateFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDialysateTemperatureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ @@ -1004,6 +1032,10 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBolusVolumeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSetPointsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDialysateFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDialysateTemperatureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ @@ -1067,6 +1099,10 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBolusVolumeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSetPointsRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDialysateFlowRateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDialysateTemperatureRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ @@ -1211,6 +1247,10 @@ ACTION_RECEIVE_SIGNAL( AdjustBolusVolumeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDurationConfirmResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustSetPointsResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustBloodFlowRateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDialysateFlowRateResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDialysateTemperatureResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ Fisheye: Tag 62797b3c6e0539e22a04404e16daa7c4465e178f refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 62797b3c6e0539e22a04404e16daa7c4465e178f refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -120,9 +120,9 @@ * \brief The MAdjustDurationEditReq class * \details The treatment duration change request model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8300| 0x100 | Req | Y | UI | HD | Treatment Duration Edit Request | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------------------:| + * |0x8300| 0x100 | Req | Y | UI | HD | Duration Edit Request | * * | Payload || * | || @@ -132,6 +132,7 @@ class MAdjustDurationEditReq : public MModel { public: quint32 duration = 0; + QString toString() { return toString({duration}); } @@ -144,9 +145,9 @@ * \brief The MAdjustDurationConfirmReq class * \details The treatment duration change request model * - * | MSG | CAN ID | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: | - * |0x8500| 0x100 | Req | Y | UI | HD | Treatment Duration Confirm Request | + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:---------------------------:| + * |0x8500| 0x100 | Req | Y | UI | HD | Duration Confirm Request | * * | Payload || * | || @@ -156,6 +157,7 @@ class MAdjustDurationConfirmReq : public MModel { public: quint32 duration = 0; + QString toString() { return toString({duration}); } @@ -165,6 +167,114 @@ }; /*! + * \brief The MAdjustSetPointsReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-------------------:| + * |0x9300| 0x100 | Req | Y | UI | HD | Set Points Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref bloodFlowRate | + * | #2:(U32) | \ref dialysateFlowRate | + * | #3:(F32) | \ref dialysateTemperature | + * | #4:(U32) | \ref acidConcentrate | + * | #5:(U32) | \ref bicarbConcentrate | + * + */ +class MAdjustSetPointsReq : public MModel { +public: + quint32 bloodFlowRate = 0; + quint32 dialysateFlowRate = 0; + float dialysateTemperature = 0; + quint32 acidConcentrate = 0; + quint32 bicarbConcentrate = 0; + + QString toString() { + return toString({bloodFlowRate, dialysateFlowRate, dialysateTemperature, acidConcentrate, bicarbConcentrate}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustSetPointsReq", vParameters); + } +}; + +/*! + * \brief The MAdjustBloodFlowRateReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------------------:| + * |0x9500| 0x100 | Req | Y | UI | HD | Blood Flow Rate Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref bloodFlowRate | + * + */ +class MAdjustBloodFlowRateReq : public MModel { +public: + quint32 bloodFlowRate = 0; + + QString toString() { + return toString({bloodFlowRate}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustBloodFlowRateReq", vParameters); + } +}; + +/*! + * \brief The MAdjustDialysateFlowRateReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:---------------------------:| + * |0x9700| 0x100 | Req | Y | UI | HD | Dialysate Flow Rate Request | + * + * | Payload || + * | || + * | #1:(U32) | \ref dialysateFlowRate | + * + */ +class MAdjustDialysateFlowRateReq : public MModel { +public: + quint32 dialysateFlowRate = 0; + + QString toString() { + return toString({dialysateFlowRate}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDialysateFlowRateReq", vParameters); + } +}; + +/*! + * \brief The MAdjustDialysateTemperatureReq class + * \details The treatment duration change request model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-------------------------------:| + * |0x9900| 0x100 | Req | Y | UI | HD | Dialysate Temperature Request | + * + * | Payload || + * | || + * | #1:(F32) | \ref dialysateTemperature | + * + */ +class MAdjustDialysateTemperatureReq : public MModel { +public: + float dialysateTemperature = 0; + + QString toString() { + return toString({dialysateTemperature}); + } + static QString toString(const QVariantList &vParameters) { + return MModel::toString("AdjustDialysateTemperatureReq", vParameters); + } +}; + +/*! * \brief The MAdjustUltrafiltrationStateReq class * \details The ultrafiltration pause/resume request model * @@ -525,6 +635,10 @@ typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; typedef Model:: MAdjustDurationEditReq AdjustDurationEditRequestData; typedef Model:: MAdjustDurationConfirmReq AdjustDurationConfirmRequestData; +typedef Model:: MAdjustSetPointsReq AdjustSetPointsRequestData; +typedef Model:: MAdjustBloodFlowRateReq AdjustBloodFlowRateRequestData; +typedef Model:: MAdjustDialysateFlowRateReq AdjustDialysateFlowRateRequestData; +typedef Model:: MAdjustDialysateTemperatureReq AdjustDialysateTemperatureRequestData; typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2021-2025 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 MTreatmentAdjustBloodFlowRateResponse.cpp + * \author (last) Stephen Quong + * \date (last) 18-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 18-Nov-2025 + * + */ +#include "MTreatmentAdjustBloodFlowRateResponse.h" + +using namespace Model; + +QVariantList MAdjustBloodFlowRateResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mBloodFlowRate .value, + }; +} + +bool MAdjustBloodFlowRateResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustBloodFlowRateResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustBloodFlowRateResponseData MAdjustBloodFlowRateResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mBloodFlowRate = _data.mBloodFlowRate .value; + return data; +} Index: sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,87 @@ +/*! + * + * Copyright (c) 2021-2025 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 MTreatmentAdjustBloodFlowRateResponse.h + * \author (last) Stephen Quong + * \date (last) 18-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 18-Nov-2025 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustBloodFlowRateResponse class + * \details The BloodFlowRate Bolus adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:--------------------------------:| + * |0x9600| 0x020 | Rsp | Y | TD | UI | Adjust Blood Flow Rate Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mBloodFlowRate | + * + * \sa Data + * \sa MAdjustBloodFlowRateReq : BloodFlowRate Bolus Request + * \sa MTreatmentBloodFlowRate : BloodFlowRate Bolus Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustBloodFlowRate | + * + */ +class MAdjustBloodFlowRateResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mBloodFlowRate ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustBloodFlowRate") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mBloodFlowRate = 0; /*!< Blood Flow Rate value of type quint32 extracted out */ + }; + + MAdjustBloodFlowRateResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustBloodFlowRateResponse::Data AdjustBloodFlowRateResponseData; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp =================================================================== diff -u -r49dadacdb78d6e7a7e52bf405a4a3c9308f874e0 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp (.../MTreatmentAdjustBolusVolumeResponse.cpp) (revision 49dadacdb78d6e7a7e52bf405a4a3c9308f874e0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp (.../MTreatmentAdjustBolusVolumeResponse.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -45,8 +45,8 @@ */ AdjustBolusVolumeResponseData MAdjustBolusVolumeResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; - data.mBolusVolume = _data.mBolusVolume.value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mBolusVolume = _data.mBolusVolume .value; return data; } Index: sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h =================================================================== diff -u -r49dadacdb78d6e7a7e52bf405a4a3c9308f874e0 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h (.../MTreatmentAdjustBolusVolumeResponse.h) (revision 49dadacdb78d6e7a7e52bf405a4a3c9308f874e0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h (.../MTreatmentAdjustBolusVolumeResponse.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -30,9 +30,9 @@ * \brief The MAdjustBolusVolumeResponse class * \details The BolusVolume Bolus adjustment response model * - * | MSG | CAN ID | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------:| - * |0x8200| 0x020 | Rsp | Y | TD | UI | Bolus Volume Response | + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:----------------------------:| + * |0x8200| 0x020 | Rsp | Y | TD | UI | Adjust Bolus Volume Response | * * | Payload || * | || @@ -41,15 +41,15 @@ * | #3:(U32) | \ref Data::mBolusVolume | * * \sa Data - * \sa MAdjustBolusVolumeReq : BolusVolume Bolus Request - * \sa MTreatmentBolusVolume : BolusVolume Bolus Data + * \sa MAdjustBolusVolumeReq : Adjust Bolus Volume Request + * \sa MTreatmentBolusVolume : Adjust Bolus Volume Data * *

Logging info

* | || * | || - * | typeText | Event | - * | unitText | HD | - * | infoText | AdjustBolusVolume | + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustBolusVolume | * */ class MAdjustBolusVolumeResponse : public MAbstract { @@ -67,9 +67,9 @@ public: - Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eTD ; } - QString infoText () const override { return QString("AdjustBolusVolume") ; } + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustBolusVolume") ; } struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2021-2025 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 MTreatmentAdjustDialysateFlowRateResponse.cpp + * \author (last) Stephen Quong + * \date (last) 18-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 18-Nov-2025 + * + */ +#include "MTreatmentAdjustDialysateFlowRateResponse.h" + +using namespace Model; + +QVariantList MAdjustDialysateFlowRateResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mDialysateFlowRate .value, + }; +} + +bool MAdjustDialysateFlowRateResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDialysateFlowRateResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDialysateFlowRateResponseData MAdjustDialysateFlowRateResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDialysateFlowRate = _data.mDialysateFlowRate .value; + return data; +} Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,87 @@ +/*! + * + * Copyright (c) 2021-2025 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 MTreatmentAdjustDialysateFlowRateResponse.h + * \author (last) Stephen Quong + * \date (last) 18-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 18-Nov-2025 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDialysateFlowRateResponse class + * \details The Dialysate Flow Rate adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:------------------------------------:| + * |0x9800| 0x020 | Rsp | Y | TD | UI | Adjust Dialysate Flow Rate Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mDialysateFlowRate | + * + * \sa Data + * \sa MAdjustDialysateFlowRateReq : Adjust Dialysate Flow Rate Request + * \sa MTreatmentDialysateFlowRate : Adjust Dialysate Flow Rate Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustDialysateFlowRate | + * + */ +class MAdjustDialysateFlowRateResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mDialysateFlowRate ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustDialysateFlowRate") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mDialysateFlowRate = 0; /*!< Dialysate Flow Rate value of type quint32 extracted out */ + }; + + MAdjustDialysateFlowRateResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDialysateFlowRateResponse::Data AdjustDialysateFlowRateResponseData; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2021-2025 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 MTreatmentAdjustDialysateTemperatureResponse.cpp + * \author (last) Stephen Quong + * \date (last) 18-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 18-Nov-2025 + * + */ +#include "MTreatmentAdjustDialysateTemperatureResponse.h" + +using namespace Model; + +QVariantList MAdjustDialysateTemperatureResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mDialysateTemperature .value, + }; +} + +bool MAdjustDialysateTemperatureResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateTemperature )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDialysateTemperatureResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDialysateTemperatureResponseData MAdjustDialysateTemperatureResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDialysateTemperature = _data.mDialysateTemperature .value; + return data; +} Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,87 @@ +/*! + * + * Copyright (c) 2021-2025 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 MTreatmentAdjustDialysateTemperatureResponse.h + * \author (last) Stephen Quong + * \date (last) 18-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 18-Nov-2025 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDialysateTemperatureResponse class + * \details The Dialysate Temperature adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:----------------------------------------:| + * |0x9800| 0x020 | Rsp | Y | TD | UI | Adjust Dialysate Temperature Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mDialysateTemperature | + * + * \sa Data + * \sa MAdjustDialysateTemperatureReq : Adjust Dialysate Temperature Request + * \sa MTreatmentDialysateTemperature : Adjust Dialysate Temperature Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustDialysateTemperature | + * + */ +class MAdjustDialysateTemperatureResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::F32 mDialysateTemperature ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustDialysateTemperature") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mDialysateTemperature = 0; /*!< Dialysate Temperature value of type quint32 extracted out */ + }; + + MAdjustDialysateTemperatureResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDialysateTemperatureResponse::Data AdjustDialysateTemperatureResponseData; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,58 @@ +/*! + * + * Copyright (c) 2021-2024 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 MTreatmentAdjustPressuresLimitsResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 31-May-2023 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "MTreatmentAdjustPressuresLimitsResponse.h" + +using namespace Model; + +QVariantList MAdjustPressuresLimitsResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mArterialPressureLimitWindow .value, + _data.mVenousPressureLimitWindow .value, + _data.mVenousPressureLimitAsymtrc .value + }; +} + +bool MAdjustPressuresLimitsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mArterialPressureLimitWindow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitWindow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrc )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustPressuresLimitsResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustPressuresLimitsResponseData MAdjustPressuresLimitsResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mArterialPressureLimitWindow = _data.mArterialPressureLimitWindow .value; + data.mVenousPressureLimitWindow = _data.mVenousPressureLimitWindow .value; + data.mVenousPressureLimitAsymtrc = _data.mVenousPressureLimitAsymtrc .value; + return data; +} Index: sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,96 @@ +/*! + * + * Copyright (c) 2021-2024 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 MTreatmentAdjustPressuresLimitsResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 31-May-2023 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustPressuresLimitsResponse class + * \details The pressures limits adjustment response model + * + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------:| + * |0x7200| 0x020 | 6 | Rsp | Y | HD | UI | A/V BP Limit Change Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(S32) | \ref Data::mArterialPressureLimitWindow | + * | #4:(S32) | \ref Data::mVenousPressureLimitWindow | + * | #5:(S32) | \ref Data::mVenousPressureLimitAsymtrc | + * | #6:(S32) | \ref Data::mTmpLimitWindow | + * + * \sa Data + * \sa MAdjustPressureLimitsReq : Pressures limits adjustment request + * \sa MPressureOcclusion : Pressure data broadcast + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustPressuresLimits | + * + */ +class MAdjustPressuresLimitsResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::S32 mArterialPressureLimitWindow ; + Types::S32 mVenousPressureLimitWindow ; + Types::S32 mVenousPressureLimitAsymtrc ; + Types::S32 mTmpLimitWindow ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustPressuresLimits") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + qint32 mArterialPressureLimitWindow = 0; /*!< ArterialLimitWindow value of type qint32 extracted out */ + qint32 mVenousPressureLimitWindow = 0; /*!< VenousLimitWindow value of type qint32 extracted out */ + qint32 mVenousPressureLimitAsymtrc = 0; /*!< VenousLimitAsymmetric value of type qint32 extracted out */ + qint32 mTmpLimitWindow = 0; /*!< TmpLimitWindow value of type qint32 extracted out */ + }; + + MAdjustPressuresLimitsResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustPressuresLimitsResponse::Data AdjustPressuresLimitsResponseData; Index: sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,64 @@ +/*! + * + * Copyright (c) 2021-2025 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 MTreatmentAdjustSetPointsResponse.cpp + * \author (last) Stephen Quong + * \date (last) 18-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 18-Nov-2025 + * + */ +#include "MTreatmentAdjustSetPointsResponse.h" + +using namespace Model; + +QVariantList MAdjustSetPointsResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mBloodFlowRate .value, + _data.mDialysateFlowRate .value, + _data.mDialysateTemperature .value, + _data.mAcidConcentrate .value, + _data.mBicarbConcentrate .value, + }; +} + +bool MAdjustSetPointsResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateTemperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidConcentrate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbConcentrate )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustSetPointsResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustSetPointsResponseData MAdjustSetPointsResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mBloodFlowRate = _data.mBloodFlowRate .value; + data.mDialysateFlowRate = _data.mDialysateFlowRate .value; + data.mDialysateTemperature = _data.mDialysateTemperature .value; + data.mAcidConcentrate = _data.mAcidConcentrate .value; + data.mBicarbConcentrate = _data.mBicarbConcentrate .value; + return data; +} Index: sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h =================================================================== diff -u --- sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h (revision 0) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,99 @@ +/*! + * + * Copyright (c) 2021-2025 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 MTreatmentAdjustSetPointsResponse.h + * \author (last) Stephen Quong + * \date (last) 18-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 18-Nov-2025 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustSetPointsResponse class + * \details The SetPoints Bolus adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:----------------------------:| + * |0x9400| 0x020 | Rsp | Y | TD | UI | Adjust Set Points Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #1:(U32) | \ref Data::mBloodFlowRate | + * | #2:(U32) | \ref Data::mDialysateFlowRate | + * | #3:(F32) | \ref Data::mDialysateTemperature | + * | #4:(U32) | \ref Data::mAcidConcentrate | + * | #5:(U32) | \ref Data::mBicarbConcentrate | + * + * \sa Data + * \sa MAdjustSetPointsReq : Adjust Set Points Request + * \sa MTreatmentSetPoints : Adjust Set Points Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustSetPoints | + * + */ +class MAdjustSetPointsResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mBloodFlowRate ; + Types::U32 mDialysateFlowRate ; + Types::F32 mDialysateTemperature ; + Types::U32 mAcidConcentrate ; + Types::U32 mBicarbConcentrate ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } + QString infoText () const override { return QString("AdjustSetPoints") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mBloodFlowRate = 0; /*!< Blood Flow Rate value of type quint32 extracted out */ + quint32 mDialysateFlowRate = 0; /*!< Dialysate Flow Rate value of type quint32 extracted out */ + float mDialysateTemperature = 0; /*!< Dialysate Temperature value of type float extracted out */ + quint32 mAcidConcentrate = 0; /*!< Acid Concentrate value of type quint32 extracted out */ + quint32 mBicarbConcentrate = 0; /*!< Bicarbonate Concentrate value of type quint32 extracted out */ + }; + + MAdjustSetPointsResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustSetPointsResponse::Data AdjustSetPointsResponseData; Fisheye: Tag 62797b3c6e0539e22a04404e16daa7c4465e178f refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 62797b3c6e0539e22a04404e16daa7c4465e178f refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 62797b3c6e0539e22a04404e16daa7c4465e178f refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 62797b3c6e0539e22a04404e16daa7c4465e178f refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,61 @@ +/*! + * + * Copyright (c) 2021-2025 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 VTreatmentAdjustmentBloodFlowRate.cpp + * \author (last) Stephen Quong + * \date (last) 15-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 15-Nov-2025 + * + */ +#include "VTreatmentAdjustmentBloodFlowRate.h" + +#include +#include + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentBloodFlowRate) + +/*! + * \brief Function called during startup to register this class with the QMetaObject system + */ +static void qRegister() +{ + qmlRegisterType("VTreatmentAdjustmentBloodFlowRate", 0, 1, "VTreatmentAdjustmentBloodFlowRate"); +} +Q_COREAPP_STARTUP_FUNCTION(qRegister) + +void VTreatmentAdjustmentBloodFlowRate::initConnections() +{ + ACTION_VIEW_CONNECTION(AdjustBloodFlowRateResponseData); + ADJUST_VIEW_CONNECTION(AdjustBloodFlowRateRequestData ); + +} + +void VTreatmentAdjustmentBloodFlowRate::onActionReceive(const AdjustBloodFlowRateResponseData &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 doAdjustment + * \details the invocable slot to adjust the blood flow rate + * \param vBloodFlowRate - blood flow rate adjusted value + */ +void VTreatmentAdjustmentBloodFlowRate::doAdjustment(const quint32 vBloodFlowRate) +{ + _data.bloodFlowRate = vBloodFlowRate; + + emit didAdjustment(_data); +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,59 @@ +/*! + * + * Copyright (c) 2021-2025 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 VTreatmentAdjustmentBloodFlowRate.h + * \author (last) Stephen Quong + * \date (last) 15-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 15-Nov-2025 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MTreatmentAdjustBloodFlowRateResponse.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentBloodFlowRate class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustBloodFlowRateResponse + * + */ +class VTreatmentAdjustmentBloodFlowRate : public VAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustBloodFlowRateRequestData _data; + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + TRIGGER( bool , adjustment , 0 ) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentBloodFlowRate, AdjustBloodFlowRateResponseData) + +public slots: + void doAdjustment(const quint32 vBloodFlowRate); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the saline bolus state + * \param vData - data model for the duration adjustment request + */ + void didAdjustment(const AdjustBloodFlowRateRequestData &vData); +}; +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp =================================================================== diff -u -r49dadacdb78d6e7a7e52bf405a4a3c9308f874e0 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp (.../VTreatmentAdjustmentBolusVolume.cpp) (revision 49dadacdb78d6e7a7e52bf405a4a3c9308f874e0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp (.../VTreatmentAdjustmentBolusVolume.cpp) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -40,12 +40,12 @@ void VTreatmentAdjustmentBolusVolume::onActionReceive(const AdjustBolusVolumeResponseData &vData) { - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); + 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 ); + adjustment ( true ); } /*! @@ -55,7 +55,6 @@ */ void VTreatmentAdjustmentBolusVolume::doAdjustment(const quint32 vBolusVolume) { - qDebug() << QString("*** VTreatmentAdjustmentBolusVolume::doAdjustment: vBolusVolume=%1").arg(vBolusVolume); // SQ _data.mBolusVolume = vBolusVolume; emit didAdjustment(_data); Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h =================================================================== diff -u -r49dadacdb78d6e7a7e52bf405a4a3c9308f874e0 -r62797b3c6e0539e22a04404e16daa7c4465e178f --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h (.../VTreatmentAdjustmentBolusVolume.h) (revision 49dadacdb78d6e7a7e52bf405a4a3c9308f874e0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h (.../VTreatmentAdjustmentBolusVolume.h) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -51,8 +51,8 @@ signals: /*! * \brief didAdjustment - * \details the notification signal to adjust the saline bolus state - * \param vData - data model for the duration adjustment request + * \details the notification signal to adjust the fluid bolus volume + * \param vData - data model for the fluid bolus volume adjustment request */ void didAdjustment(const AdjustBolusVolumeRequestData &vData); }; Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,61 @@ +/*! + * + * Copyright (c) 2021-2025 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 VTreatmentAdjustmentDialysateFlowRate.cpp + * \author (last) Stephen Quong + * \date (last) 15-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 15-Nov-2025 + * + */ +#include "VTreatmentAdjustmentDialysateFlowRate.h" + +#include +#include + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDialysateFlowRate) + +/*! + * \brief Function called during startup to register this class with the QMetaObject system + */ +static void qRegister() +{ + qmlRegisterType("VTreatmentAdjustmentDialysateFlowRate", 0, 1, "VTreatmentAdjustmentDialysateFlowRate"); +} +Q_COREAPP_STARTUP_FUNCTION(qRegister) + +void VTreatmentAdjustmentDialysateFlowRate::initConnections() +{ + ACTION_VIEW_CONNECTION(AdjustDialysateFlowRateResponseData); + ADJUST_VIEW_CONNECTION(AdjustDialysateFlowRateRequestData ); + +} + +void VTreatmentAdjustmentDialysateFlowRate::onActionReceive(const AdjustDialysateFlowRateResponseData &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 doAdjustment + * \details the invocable slot to adjust the dialysate flow rate + * \param vDialysateFlowRate - dialysate flow rate adjusted value + */ +void VTreatmentAdjustmentDialysateFlowRate::doAdjustment(const quint32 vDialysateFlowRate) +{ + _data.dialysateFlowRate = vDialysateFlowRate; + + emit didAdjustment(_data); +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,59 @@ +/*! + * + * Copyright (c) 2021-2025 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 VTreatmentAdjustmentDialysateFlowRate.h + * \author (last) Stephen Quong + * \date (last) 15-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 15-Nov-2025 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MTreatmentAdjustDialysateFlowRateResponse.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentDialysateFlowRate class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustDialysateFlowRateResponse + * + */ +class VTreatmentAdjustmentDialysateFlowRate : public VAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustDialysateFlowRateRequestData _data; + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + TRIGGER( bool , adjustment , 0 ) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDialysateFlowRate, AdjustDialysateFlowRateResponseData) + +public slots: + void doAdjustment(const quint32 vDialysateFlowRate); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the dialysate flow rate + * \param vData - data model for the dialysate flow rate adjustment request + */ + void didAdjustment(const AdjustDialysateFlowRateRequestData &vData); +}; +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,61 @@ +/*! + * + * Copyright (c) 2021-2025 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 VTreatmentAdjustmentDialysateTemperature.cpp + * \author (last) Stephen Quong + * \date (last) 15-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 15-Nov-2025 + * + */ +#include "VTreatmentAdjustmentDialysateTemperature.h" + +#include +#include + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDialysateTemperature) + +/*! + * \brief Function called during startup to register this class with the QMetaObject system + */ +static void qRegister() +{ + qmlRegisterType("VTreatmentAdjustmentDialysateTemperature", 0, 1, "VTreatmentAdjustmentDialysateTemperature"); +} +Q_COREAPP_STARTUP_FUNCTION(qRegister) + +void VTreatmentAdjustmentDialysateTemperature::initConnections() +{ + ACTION_VIEW_CONNECTION(AdjustDialysateTemperatureResponseData); + ADJUST_VIEW_CONNECTION(AdjustDialysateTemperatureRequestData ); + +} + +void VTreatmentAdjustmentDialysateTemperature::onActionReceive(const AdjustDialysateTemperatureResponseData &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 doAdjustment + * \details the invocable slot to adjust the dialysate temperature + * \param vDialysateTemperature - dialysate temperature adjusted value + */ +void VTreatmentAdjustmentDialysateTemperature::doAdjustment(const float vDialysateTemperature) +{ + _data.dialysateTemperature = vDialysateTemperature; + + emit didAdjustment(_data); +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,59 @@ +/*! + * + * Copyright (c) 2021-2025 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 VTreatmentAdjustmentDialysateTemperature.h + * \author (last) Stephen Quong + * \date (last) 15-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 15-Nov-2025 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MTreatmentAdjustDialysateTemperatureResponse.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentDialysateTemperature class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustDialysateTemperatureResponse + * + */ +class VTreatmentAdjustmentDialysateTemperature : public VAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustDialysateTemperatureRequestData _data; + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + TRIGGER( bool , adjustment , 0 ) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDialysateTemperature, AdjustDialysateTemperatureResponseData) + +public slots: + void doAdjustment(const float vDialysateTemperature); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the dialysate temperature + * \param vData - data model for the dialysate temperature adjustment request + */ + void didAdjustment(const AdjustDialysateTemperatureRequestData &vData); +}; +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,43 @@ +/*! + * + * Copyright (c) 2021-2024 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 VTreatmentAdjustmentFlows.cpp + * \author (last) Behrouz NematiPour + * \date (last) 11-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "VTreatmentAdjustmentFlows.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentFlows) + +void VTreatmentAdjustmentFlows::initConnections() { + ACTION_VIEW_CONNECTION(AdjustBloodDialysateResponseData); + ADJUST_VIEW_CONNECTION( AdjustBloodDialysateRequestData); +} + +/*! + * \brief VTreatmentAdjustmentFlows::onActionReceive + * \details Model data received message handler. + * When signal received this method is called to update the view properties. + * \param vData - Model data + */ +void VTreatmentAdjustmentFlows::onActionReceive(const AdjustBloodDialysateResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + bloodFlow_FlowSetPoint ( vData.mBloodRate ); + dialysateFlow_FlowSetPoint ( vData.mDialysateRate ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustment ( true ); +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,74 @@ +/*! + * + * Copyright (c) 2021-2024 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 VTreatmentAdjustmentFlows.h + * \author (last) Behrouz NematiPour + * \date (last) 18-Apr-2022 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MTreatmentAdjustBloodDialysateResponse.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentFlows class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustBloodDialysateResponse + * + */ +class VTreatmentAdjustmentFlows : public VAdjustmentResponseBase +{ + Q_OBJECT + // friends + friend class ::tst_views; + + AdjustBloodDialysateRequestData _data; + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + TRIGGER( bool , adjustment , 0) + + // Treatment Blood/Dialysate Flow data + PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0) + PROPERTY( quint32 , dialysateFlow_FlowSetPoint , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentFlows, AdjustBloodDialysateResponseData) + + // ----- Adjust Blood/Dialysate Flows +public slots: + /*! + * \brief doAdjustment + * \details the invocable slot to adjust the treatment blood and dialysate flow rates + * \param vBloodFlow + * \param vDialysateFlow + */ + void doAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow) { + _data. bloodFlow = vBloodFlow; + _data.dialysateFlow = vDialysateFlow; + emit didAdjustment(_data); + } + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the blood and dialysate flow rates + * \param vData - data model for the blood and dialysate adjustment request + */ + void didAdjustment(const AdjustBloodDialysateRequestData &vData); +}; +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,66 @@ +/*! + * + * Copyright (c) 2021-2024 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 VTreatmentAdjustmentPressuresLimits.cpp + * \author (last) Behrouz NematiPour + * \date (last) 31-May-2023 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "VTreatmentAdjustmentPressuresLimits.h" + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits) + +void VTreatmentAdjustmentPressuresLimits::initConnections() { + ACTION_VIEW_CONNECTION(AdjustPressuresLimitsResponseData); + ADJUST_VIEW_CONNECTION( AdjustPressuresLimitsRequestData); +} + +/*! + * \brief View::VTreatmentAdjustmentPressuresLimits::doAdjustment + * \details the invocable slot to adjust the treatment pressure limits + * \param vArterialPressureLimitWindow - requested arterial pressure window limit + * \param vVenousPressureLimitWindow - requested venous pressure window limit + * \param vVenousPressureLimitAsymtrc - requested venous pressure asymmetrics limit + * \param vTmpLimitWindow - requested TMP window limit + */ +void VTreatmentAdjustmentPressuresLimits::doAdjustment( + qint32 vArterialPressureLimitWindow, + qint32 vVenousPressureLimitWindow, + qint32 vVenousPressureLimitAsymtrc, + qint32 vTmpLimitWindow) +{ + _data.mArterialPressureLimitWindow = vArterialPressureLimitWindow ; + _data.mVenousPressureLimitWindow = vVenousPressureLimitWindow ; + _data.mVenousPressureLimitAsymtrc = vVenousPressureLimitAsymtrc ; + _data.mTmpLimitWindow = vTmpLimitWindow ; + emit didAdjustment(_data); +} + +/*! + * \brief VTreatmentAdjustmentPressures::onActionReceive + * \details Model data received message handler. + * When signal received this method is called to update the view properties. + * \param vData - Model data + */ +void VTreatmentAdjustmentPressuresLimits::onActionReceive(const AdjustPressuresLimitsResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + arterialPressureLimitWindow ( vData.mArterialPressureLimitWindow ); + venousPressureLimitWindow ( vData.mVenousPressureLimitWindow ); + venousPressureLimitAsymtrc ( vData.mVenousPressureLimitAsymtrc ); + tmpLimitWindow ( vData.mTmpLimitWindow ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustment ( true ); +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,77 @@ +/*! + * + * Copyright (c) 2021-2024 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 VTreatmentAdjustmentPressuresLimits.h + * \author (last) Behrouz NematiPour + * \date (last) 31-May-2023 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MTreatmentAdjustPressuresLimitsResponse.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentPressuresLimits class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustPressuresLimitsResponse + * + */ +class VTreatmentAdjustmentPressuresLimits : public VAdjustmentResponseBase +{ + Q_OBJECT + // friends + friend class ::tst_views; + + AdjustPressuresLimitsRequestData _data; + + // 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) + + // ----- Adjust Pressures Limits + PROPERTY( qint32 , arterialPressureLimitWindow , 0) + PROPERTY( qint32 , venousPressureLimitWindow , 0) + PROPERTY( qint32 , venousPressureLimitAsymtrc , 0) + PROPERTY( qint32 , tmpLimitWindow , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentPressuresLimits, AdjustPressuresLimitsResponseData) + +public slots: + /*! + * \brief doAdjustment + * \details the invocable slot to adjust the treatment pressures limits + * \param vArterialLimitWindow + * \param vVenousLimitWindow + * \param vVenousLimitAsymtrc + * \param vTmpLimitWindow + */ + void doAdjustment( qint32 vArterialPressureLimitWindow , + qint32 vVenousPressureLimitWindow , + qint32 vVenousPressureLimitAsymtrc , + qint32 vTmpLimitWindow ); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the pressures limits + * \param vData - data model for the pressures limits adjustment request + */ + void didAdjustment(const AdjustPressuresLimitsRequestData &vData); +}; +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,71 @@ +/*! + * + * Copyright (c) 2021-2025 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 VTreatmentAdjustmentSetPoints.cpp + * \author (last) Stephen Quong + * \date (last) 15-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 15-Nov-2025 + * + */ +#include "VTreatmentAdjustmentSetPoints.h" + +#include +#include + +// Project +#include "GuiController.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentSetPoints) + +/*! + * \brief Function called during startup to register this class with the QMetaObject system + */ +static void qRegister() +{ + qmlRegisterType("VTreatmentAdjustmentSetPoints", 0, 1, "VTreatmentAdjustmentSetPoints"); +} +Q_COREAPP_STARTUP_FUNCTION(qRegister) + +void VTreatmentAdjustmentSetPoints::initConnections() +{ + ACTION_VIEW_CONNECTION(AdjustSetPointsResponseData); + ADJUST_VIEW_CONNECTION(AdjustSetPointsRequestData ); + +} + +void VTreatmentAdjustmentSetPoints::onActionReceive(const AdjustSetPointsResponseData &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 doAdjustment + * \details the invocable slot to adjust the fluid bolus volume + * \param vSetPoints - fluid bolus volume adjusted value + * \param vBloodFlowRate - adjusted blood flow rate value + * \param vDialysateFlowRate - adjusted dialysate flow rate value + * \param vDialysateTemperature - adjusted dialysate temperature value + * \param vAcidConcentrate - adjusted acid concentrate value + * \param vBicarbConcentrate - adjusted bicarbonate concentrate value + */ +void VTreatmentAdjustmentSetPoints::doAdjustment(const quint32 vBloodFlowRate, const quint32 vDialysateFlowRate, + const float vDialysateTemperature, const quint32 vAcidConcentrate, const quint32 vBicarbConcentrate) +{ + _data.bloodFlowRate = vBloodFlowRate; + _data.dialysateFlowRate = vDialysateFlowRate; + _data.dialysateTemperature = vDialysateTemperature; + _data.acidConcentrate = vAcidConcentrate; + _data.bicarbConcentrate = vBicarbConcentrate; + + emit didAdjustment(_data); +} Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h =================================================================== diff -u --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h (revision 0) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) @@ -0,0 +1,60 @@ +/*! + * + * Copyright (c) 2021-2025 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 VTreatmentAdjustmentSetPoints.h + * \author (last) Stephen Quong + * \date (last) 15-Nov-2025 + * \author (original) Stephen Quong + * \date (original) 15-Nov-2025 + * + */ +#pragma once + +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VAdjustmentResponseBase.h" +#include "MTreatmentAdjustSetPointsResponse.h" + +namespace View { + +/*! + * \brief The VTreatmentAdjustmentSetPoints class + * \details View for Model's Data representation. + * + * \sa Model::MAdjustSetPointsResponse + * + */ +class VTreatmentAdjustmentSetPoints : public VAdjustmentResponseBase +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + AdjustSetPointsRequestData _data; + + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + TRIGGER( bool , adjustment , 0 ) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentSetPoints, AdjustSetPointsResponseData) + +public slots: + void doAdjustment(const quint32 vBloodFlowRate, const quint32 vDialysateFlowRate, const float vDialysateTemperature, + const quint32 vAcidConcentrate, const quint32 vBicarbConcentrate); + +signals: + /*! + * \brief didAdjustment + * \details the notification signal to adjust the fluid bolus volume + * \param vData - data model for the fluid bolus volume adjustment request + */ + void didAdjustment(const AdjustSetPointsRequestData &vData); +}; +}