Index: leahi.pro =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- leahi.pro (.../leahi.pro) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ leahi.pro (.../leahi.pro) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -62,7 +62,9 @@ sources/model/td \ sources/model/td/data \ sources/model/td/data/treatment \ + sources/model/td/data/pretreatment \ sources/model/td/data/treatmentlog \ + sources/model/td/data/pretreatment \ sources/model/td/alarm \ sources/model/td/adjustment \ sources/model/td/adjustment/settings \ @@ -81,6 +83,7 @@ sources/view/td \ sources/view/td/data \ sources/view/td/data/treatment \ + sources/view/td/data/pretreatment \ sources/view/td/adjustment/treatment \ sources/view/td/adjustment/pretreatment \ sources/view/td/adjustment/posttreatment \ @@ -157,6 +160,8 @@ sources/model/confirm/MDuetConfirmTDi.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \ + sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \ sources/model/dd/data/MDDBloodLeakData.h \ sources/model/dd/data/MDDConcentratePumpData.h \ sources/model/dd/data/MDDConductivityData.h \ @@ -181,7 +186,13 @@ 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/settings/MAdjustTDAlarmVolumeResponse.h \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ @@ -197,6 +208,8 @@ sources/model/td/data/MWaterSampleData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \ + sources/model/td/data/treatment/MTreatmentHDFData.h \ + sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.h \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ @@ -219,10 +232,14 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ sources/model/td/data/MTDPowerOffWarning.h \ + sources/model/td/data/MTDSyringePumpData.h \ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \ + \ # ---------- Models - TD - Data - Pre-Treatment + sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \ + sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ @@ -265,7 +282,12 @@ sources/view/fp/data/VFPTemperatureData.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ + sources/view/settings/VRoWaterMode.h \ + sources/view/settings/VCalibrationSettings.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ sources/view/td/data/VTDAirTrapData.h \ @@ -278,10 +300,16 @@ sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.h \ + sources/view/td/data/VTDSyringePumpData.h \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \ + sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ sources/view/td/data/treatment/VTreatmentBloodPrimeData.h \ + sources/view/td/data/treatment/VTreatmentHDFData.h \ + sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.h \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ @@ -302,6 +330,8 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \ @@ -313,7 +343,7 @@ \ # ---------- Views - TD - Adjustment - Pre-Treatment sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ - sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ \ # ---------- Views - TD - Adjustment - Post-Treatment sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \ @@ -354,20 +384,16 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ @@ -388,12 +414,10 @@ \ # ---------- Models - HD - Data - Pre-Treatment - Progress sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \ - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ - sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MHDBloodLeakData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \ @@ -450,7 +474,6 @@ sources/view/settings/VAdjustmentServiceMode.h \ sources/view/settings/VAdjustmentServiceDates.h \ sources/view/settings/VAdjustmentDGCleaningUsage.h \ - sources/view/settings/VDuetRoWaterDG.h \ sources/view/settings/VCloudSync.h \ sources/view/settings/VHDUsageInfo.h \ sources/view/settings/VAdjustmentInstitutionalRecord.h \ @@ -478,16 +501,13 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ \ # ---------- Views - HD - Data - States - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \ \ # ---------- Views - HD - Data - Pre-Treatment - Progress sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ - sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VHDBloodLeakData.h \ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ @@ -529,6 +549,8 @@ sources/model/confirm/MDuetConfirmTDi.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \ + sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \ sources/model/dd/data/MDDBloodLeakData.cpp \ sources/model/dd/data/MDDConcentratePumpData.cpp \ sources/model/dd/data/MDDConductivityData.cpp \ @@ -554,6 +576,11 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustDryBicartDisconnectResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ @@ -566,8 +593,11 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/MWaterSampleData.cpp \ + sources/model/td/data/MTDSyringePumpData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ + sources/model/td/data/treatment/MTreatmentHDFData.cpp \ + sources/model/td/data/treatment/MTreatmentDryBicartDisconnectData.cpp \ sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ @@ -617,6 +647,9 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ + \ # ---------- Models - Data - States + sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \ + sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \ @@ -651,20 +684,19 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ sources/model/hd/alarm/MAlarmMapping.cpp \ sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ \ # ---------- Models - TD - Adjustment - Settings sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \ \ # ---------- Models - TD - Adjustment - Pre-Treatment sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ @@ -677,8 +709,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ @@ -696,7 +726,6 @@ sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ - sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MHDBloodLeakData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \ @@ -707,7 +736,6 @@ sources/model/hd/data/post/MHDRTCEpochData.cpp \ sources/model/hd/data/MHDUsageInfoResponse.cpp \ \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ \ # ---------- Models - DG - Adjustment - Settings @@ -743,7 +771,12 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ - sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ + sources/view/settings/VRoWaterMode.cpp \ + sources/view/settings/VCalibrationSettings.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentDryBicartDisconnect.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ sources/view/td/data/VTDAirTrapData.cpp \ @@ -756,10 +789,16 @@ sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.cpp \ + sources/view/td/data/VTDSyringePumpData.cpp \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \ + sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \ + sources/view/td/data/treatment/VTreatmentHDFData.cpp \ + sources/view/td/data/treatment/VTreatmentDryBicartDisconnect.cpp \ sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \ sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ @@ -780,6 +819,8 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \ @@ -791,7 +832,7 @@ \ # ---------- Views - TD - Adjustment - Pre-Treatment sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ - sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ \ # ---------- Views - TD - Adjustment - Post-Treatment sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \ @@ -812,7 +853,6 @@ sources/view/settings/VAdjustmentAlarmVolume.cpp \ sources/view/settings/VAdjustmentServiceMode.cpp \ sources/view/settings/VAdjustmentServiceDates.cpp \ - sources/view/settings/VDuetRoWaterDG.cpp \ sources/view/settings/VCloudSync.cpp \ sources/view/settings/VAdjustmentDGCleaningUsage.cpp \ sources/view/settings/VHDUsageInfo.cpp \ @@ -838,16 +878,13 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ \ # ---------- Views - HD - States Data - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ - sources/view/hd/data/VHDSyringePumpData.cpp \ sources/view/hd/data/VHDBloodLeakData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - HD - Data - In-Treatment sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -217,7 +217,8 @@ // Generic Confirm case Gui::GuiActionType::ID_DuetConfirmUIr : INTERPRET_TRANSMIT_MESSAGE(DuetConfirmUIrData ); break; // RO Water - case Gui::GuiActionType::ID_DuetRoWaterModeUIi : INTERPRET_TRANSMIT_MESSAGE(DuetRoWaterModeUIiData ); break; + case Gui::GuiActionType::ID_AdjustRoWaterModeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRoWaterModeRequestData ); break; + case Gui::GuiActionType::ID_RoWaterModeReq : INTERPRET_TRSMT_MT_MESSAGE(RoWaterModeRequestData ); break; // POST case Gui::GuiActionType::ID_UIPostFinalResultData : INTERPRET_TRANSMIT_MESSAGE(AdjustUIPostFinalResultRequestData ); break; // Settings @@ -260,13 +261,19 @@ case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData ); break; case Gui::GuiActionType::ID_AdjustVitalsReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData ); break; case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData ); break; + case Gui::GuiActionType::ID_AdjustHDFStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFStateRequestData ); break; + case Gui::GuiActionType::ID_AdjustAutoSubReq : INTERPRET_TRANSMIT_MESSAGE(AdjustAutoSubRequestData ); break; + case Gui::GuiActionType::ID_AdjustHDFReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDFRequestData ); break; + + case Gui::GuiActionType::ID_AdjustDryBicartDisconnectReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDryBicartDisconnectRequestData ); break; // in-treatment - ultrafiltration case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFDurationEditRequestData ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFVolumeEditRequestData ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustIsolatedUFConfirmRequestData ); break; + case Gui::GuiActionType::ID_AdjustIsoUFStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFStateRequestData ); break; // End-Treatment case Gui::GuiActionType::ID_AdjustRinsebackReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData ); break; case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData ); break; @@ -285,7 +292,7 @@ // alarms case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; - case Gui::GuiActionType::ID_AlarmVolumeSetReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDAlarmVolumeRequestData ); break; + case Gui::GuiActionType::ID_AlarmVolumeSetReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTDAlarmVolumeRequestData ); break; // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmActiveListReq : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData ); break; case Gui::GuiActionType::ID_AlarmTriggered : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData ); break; @@ -491,7 +498,7 @@ // ----- Datum case Gui::GuiActionType::ID_HDAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData ); break; - case Gui::GuiActionType::ID_HDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDSyringePumpData ); break; + case Gui::GuiActionType::ID_TDSyringePumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDSyringePumpData ); break; case Gui::GuiActionType::ID_TDVoltageData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDVoltageData ); break; case Gui::GuiActionType::ID_TDAirBubbleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirBubbleData ); break; case Gui::GuiActionType::ID_TDAirPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TDAirPumpData ); break; @@ -530,6 +537,7 @@ case Gui::GuiActionType::ID_DialysateOutletFlow : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow ); break; case Gui::GuiActionType::ID_PressureOcclusion : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion ); break; case Gui::GuiActionType::ID_Saline : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Saline ); break; + case Gui::GuiActionType::ID_HDF : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDF ); break; case Gui::GuiActionType::ID_Vitals : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Vitals ); break; case Gui::GuiActionType::ID_Heparin : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Heparin ); break; case Gui::GuiActionType::ID_Rinseback : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Rinseback ); break; @@ -539,6 +547,7 @@ case Gui::GuiActionType::ID_Ultrafiltration : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration ); break; case Gui::GuiActionType::ID_IsolatedUF : ok = notify(vMessage, vData, Gui::GuiActionType::ID_IsolatedUF ); break; case Gui::GuiActionType::ID_TreatmentParametersSetPointData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData ); break; + case Gui::GuiActionType::ID_DryBicartDisconnectData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DryBicartDisconnectData ); break; // ----- In-Treatment Adjust case Gui::GuiActionType::ID_AdjustBloodPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodPrimeRsp ); break; case Gui::GuiActionType::ID_AdjustDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationEditRsp ); break; @@ -555,13 +564,18 @@ case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break; case Gui::GuiActionType::ID_AdjustVitalsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVitalsRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break; + case Gui::GuiActionType::ID_AdjustIsoUFStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsoUFStateRsp ); break; case Gui::GuiActionType::ID_AdjustHeparinRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp ); break; case Gui::GuiActionType::ID_AdjustRinsebackRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp ); break; case Gui::GuiActionType::ID_AdjustRecirculateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp ); break; case Gui::GuiActionType::ID_AdjustTreatmentEndRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp ); break; case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp ); break; + case Gui::GuiActionType::ID_AdjsutHDFStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjsutHDFStateRsp ); break; + case Gui::GuiActionType::ID_AdjustAutoSubRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustAutoSubRsp ); break; + case Gui::GuiActionType::ID_AdjustHDFRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDFRsp ); break; + case Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDryBicartDisconnectRsp ); break; // ----- Post-Treatment Adjust case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break; @@ -582,7 +596,7 @@ case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; case Gui::GuiActionType::ID_AlarmTriggered : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered ); break; case Gui::GuiActionType::ID_AlarmCleared : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared ); break; - case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; + case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmActiveListRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp ); break; @@ -634,9 +648,6 @@ // DG Response Messages case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp ); break; - // RO Water - case Gui::GuiActionType::ID_DuetRoWaterStatDGq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq ); break; - case Gui::GuiActionType::ID_DuetRoWaterModeDGr : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterModeDGr ); break; // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. default : printUnhandled (vMessage ); break; @@ -659,6 +670,9 @@ case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; + case Gui::GuiActionType::ID_RoWaterModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_RoWaterModeRsp ); break; + case Gui::GuiActionType::ID_AdjustRoWaterModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRoWaterModeRsp ); break; + case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -49,13 +49,14 @@ #include "VDateTime.h" #include "VAdjustmentAlarmVolume.h" #include "VBluetooth.h" -#include "VDuetRoWaterDG.h" +#include "VRoWaterMode.h" #include "VCloudSync.h" #include "VHDUsageInfo.h" #include "VAdjustmentInstitutionalRecord.h" #include "VInstitutionalRecord.h" #include "VAdjustmentAdvancedInstitutionalRecord.h" #include "VAdvancedInstitutionalRecord.h" +#include "VCalibrationSettings.h" // states data #include "VTDOpModeData.h" #include "VPreTreatmentStatesData.h" @@ -92,7 +93,7 @@ #include "VTreatmentBloodPrimeData.h" #include "VTreatmentStopData.h" #include "VHDAccelerometerData.h" -#include "VHDSyringePumpData.h" +#include "VTDSyringePumpData.h" #include "VHDBloodLeakData.h" #include "VTDAirBubbleData.h" #include "VTDAirPumpData.h" @@ -104,7 +105,9 @@ #include "VTDEjectorData.h" #include "VTDTemperatureData.h" #include "VTreatmentTrends.h" +#include "VTreatmentDryBicartDisconnect.h" #include "VWaterSampleData.h" +#include "VTreatmentHDFData.h" // DG data #include "VDGDrainPumpData.h" #include "VDDHeatersData.h" @@ -158,8 +161,13 @@ #include "VTreatmentAdjustmentIsolatedUFConfirm.h" #include "VTreatmentAdjustmentIsolatedUFDurationEdit.h" #include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h" +#include "VTreatmentAdjustmentIsolatedUFState.h" #include "VTreatmentAdjustmentSetPoints.h" #include "VTreatmentAdjustmentVitalsAlarmLimits.h" +#include "VTreatmentAdjustmentAutoSub.h" +#include "VTreatmentAdjustmentHDFState.h" +#include "VTreatmentAdjustmentHDF.h" +#include "VTreatmentAdjustmentDryBicartDisconnect.h" // ----- Post-Treatment Adjustments #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h" #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h" Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 // Dialog -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 /* Qt6 Port: replace the above import with the following one: import QtQuick.Effects */ @@ -39,7 +39,7 @@ property alias radius : _backgroundRect.radius property alias notificationText : _notification.text property alias notification : _notification - property bool showDropShadow : false + // property bool showDropShadow : false property alias backgroundItem : _backgroundItem.children property alias backgroundItemZ : _backgroundItem.z property bool closeOnStateChange : true @@ -51,8 +51,8 @@ x: Math.round((Variables.applicationWidth - width) / 2) y: Math.round((Variables.applicationHeight - height) / 2) - enter: Transition { NumberAnimation { property: "scale"; from: 0.8; to: 1.0; duration: 200; easing.type: Easing.OutCubic } } - exit : Transition { NumberAnimation { property: "scale"; from: 1.0; to: 0.8; duration: 200; easing.type: Easing.InCubic } } + // enter: Transition { NumberAnimation { property: "scale"; from: 0.8; to: 1.0; duration: 200; easing.type: Easing.OutCubic } } + // exit : Transition { NumberAnimation { property: "scale"; from: 1.0; to: 0.8; duration: 200; easing.type: Easing.InCubic } } modal: true @@ -69,17 +69,17 @@ color : Colors.backgroundDialog radius : Variables.dialogRadius - layer.enabled : showDropShadow - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 4 - verticalOffset : 4 - radius : 12 - samples : 32 - color : Colors.dropShadowDialogColor - source : _backgroundRect - anchors.fill : _backgroundRect - } + // layer.enabled : showDropShadow + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 4 + // verticalOffset : 4 + // radius : 12 + // samples : 32 + // color : Colors.dropShadowDialogColor + // source : _backgroundRect + // anchors.fill : _backgroundRect + // } /* Qt6 Port: replace above DropShadow with following RectangularShadow: layer.effect: RectangularShadow { id: _dropShadow Index: sources/gui/qml/compounds/NumPad.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -13,7 +13,7 @@ * */ -import QtQuick 2.12 +import QtQuick 2.15 import QtQuick.Controls 2.12 import "qrc:/components" @@ -23,17 +23,20 @@ property var settingValue : undefined property alias unit : _unitText.text property alias range : _range.text + property alias showRange : _range.visible property alias title : _title.text property alias displayValue : _valueLabel.text property int precision : 0 property var getter : null property var setter : null - property var validator : null - readonly property bool isValueValid : validator ? validator(valueInt) : true - readonly property var valueInt : isNaN(parseInt(_valueLabel.text)) ? undefined : parseInt(_valueLabel.text) + property real validatorMin : 0 + property real validatorMax : 99999 readonly property string backSpace : "qrc:/images/iBackspace" property bool isOpened : false + property bool allowDecimal : false + property bool showSliderButton : true + property int numCharacters : 3 width : Variables.numPadWidth height : Variables.numPadHeight @@ -66,7 +69,8 @@ .arg(max) _root.getter = entry.text _root.setter = function (value) { entry.text = value } - _root.validator = function (value) { return value >= min && value <= max } + _root.validatorMin = min + _root.validatorMax = max } function show() { @@ -102,6 +106,7 @@ radius : height border.color : Colors.transparent backgroundColor : Colors.backgroundButtonSelect + visible : _root.showSliderButton onPressed : isOpened ? hide() : show() Image { id : _iconImage @@ -155,14 +160,19 @@ radius : 10 color : "#324867" - Text { id: _valueLabel + TextInput { id: _valueLabel anchors.centerIn: parent font { pixelSize : 65 weight : Font.DemiBold } - color : isValueValid ? Colors.offWhite : Colors.red - text : "" + color : _valueLabel.acceptableInput ? Colors.offWhite : Colors.red + + validator: DoubleValidator { id: _validator + bottom : _root.validatorMin + top : _root.validatorMax + decimals: _root.allowDecimal ? 3 : 0 + } } } @@ -217,7 +227,7 @@ icon.source : modelData === backSpace ? modelData : "" icon.height : 45 icon.width : 45 - enabled : modelData === "." ? precision > 0 : true + enabled : _root.allowDecimal ? true : modelData === "." ? precision > 0 : true contentItem: Rectangle { anchors.fill : parent @@ -238,7 +248,7 @@ color : enabled ? Colors.offWhite : "dimgrey" } } - + onPressed: { if (modelData === backSpace ) { _numPadGrid.replaceValueText = false @@ -249,7 +259,7 @@ _valueLabel.text = _keyButton.text _numPadGrid.replaceValueText = false } - else if (_valueLabel.text.length < 3) { + else if (_valueLabel.text.length < _root.numCharacters) { _valueLabel.text += _keyButton.text } } Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -1,6 +1,6 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 /* Qt6 Port: replace the above import with the following one: import QtQuick.Effects */ @@ -39,7 +39,6 @@ color : _colorMode.modeBackgroundDialogColor radius : Variables.alarmDialogRadius - signal muteClicked() signal minimizeClicked() signal listClicked() @@ -50,6 +49,10 @@ signal endClicked() signal okClicked() + function updateImage () { + _root.figureImageSource = _listView.model.get(_listView.currentIndex).image ?? "" + } + Rectangle { id: _titleBar anchors.top: parent.top height : Variables.alarmDialogHeaderHeight + _root.headerOverlap @@ -60,7 +63,7 @@ // TODO: disable doubleClicked later. this is only for diagnostic purpose when alarm dialog covers the entire screen. MouseArea { id: _minimizeArea anchors.fill : parent - onDoubleClicked : { if ( ! _root.minVisible ) _diagnosticsDialog.open() } + onDoubleClicked : { /*if ( ! _root.minVisible ) _diagnosticsDialog.open()*/ } } Text { id: _title @@ -134,7 +137,10 @@ interactive : false clip : true + onCurrentIndexChanged: _root.updateImage() + delegate: Item { id: _delegateControl + width : _listView.width height : Variables.instructionHeight clip : true @@ -152,21 +158,21 @@ Text { id: _stepNumberRect anchors.centerIn: parent text : index + 1 - color : vSettings.darkMode ? Colors.offWhite : _delegateControl.ListView.isCurrentItem ? _colorMode.modeBackgroundColor : _colorMode.modeButtonColor - font.pixelSize : 20 + color : vSettings.darkMode ? Colors.offWhite : _delegateControl.ListView.isCurrentItem ? _colorMode.modeBackgroundColor : _colorMode.modeButtonColor + font.pixelSize : 28 font.weight : Font.Medium } - layer.enabled : true - layer.effect : DropShadow { id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _stepRect - anchors.fill : _stepRect - } + // layer.enabled : true + // layer.effect : DropShadow { id: _dropShadow + // horizontalOffset: 0 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _stepRect + // anchors.fill : _stepRect + // } /* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect : RectangularShadow { id: _dropShadow radius : 3.0 @@ -187,7 +193,7 @@ font.pixelSize : Fonts.fontPixelInstructionStep font.weight : _delegateControl.ListView.isCurrentItem ? Font.DemiBold : Font.Normal color : _delegateControl.ListView.isCurrentItem ? _colorMode.modeSelctedColor : _colorMode.modeTextColor - text : model.instruction + text : model.instruction.join(" ") wrapMode : Text.WordWrap } @@ -196,7 +202,6 @@ onClicked: { if (_listView.currentIndex !== index) { _listView.currentIndex = index - _root.figureImageSource = model.image } } } @@ -205,7 +210,7 @@ Image { id: _figureImage anchors.right : parent.right - anchors.verticalCenter: parent.verticalCenter + anchors.bottom : parent.bottom } } @@ -290,64 +295,69 @@ onPressed : resumeClicked() text.text : qsTr("Resume") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } TouchRect { id : _temporaryBreak visible : temporaryBreakVisible onPressed : temporaryBreakClicked() text.text : qsTr("Temporary Break") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } TouchRect { id : _rinsebackTouchRect visible : rinsebackVisible onPressed : rinsebackClicked() text.text : qsTr("Return Blood & End Treatment") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } TouchRect { id : _endTouchRect visible : endVisible onPressed : endClicked() text.text : qsTr("End Treatment Only") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } TouchRect { id : _okTouchRect visible : okVisible onPressed : okClicked() text.text : qsTr("OK") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -144,7 +144,7 @@ readonly property color textNotificationNoneBg : white readonly property color textNotificationNoneFg : "#1b2b3e" - readonly property color textNotificationLowBg : "#f5a623" // ? + readonly property color textNotificationLowBg : "#02B0B0" // ? readonly property color textNotificationLowFg : white // ? readonly property color textNotificationMedBg : "#f5a623" // ? @@ -159,7 +159,7 @@ readonly property color alarmTopBarMedBg : "#db8f00" readonly property color alarmTopBarMedFg : white - readonly property color alarmTopBarLowBg : "#db8f00" + readonly property color alarmTopBarLowBg : "#02B0B0" readonly property color alarmTopBarLowFg : white readonly property color alarmTopBarNoneBg : "#db8f00" Index: sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 /* Qt6 Port: replace the above import with the following one: import QtQuick.Effects */ @@ -186,17 +186,17 @@ HeaderText { id: _default; title: qsTr("Default") } } - layer.enabled : true - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _header - anchors.fill : _header - } + // layer.enabled : true + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 0 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _header + // anchors.fill : _header + // } /* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect: RectangularShadow { id: _dropShadow Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 /* Qt6 Port: replace the above import with the following one: import QtQuick.Effects */ @@ -193,17 +193,17 @@ HeaderText { id: _default; title: qsTr("Default") } } - layer.enabled : true - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _header - anchors.fill : _header - } + // layer.enabled : true + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 0 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _header + // anchors.fill : _header + // } /* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect: RectangularShadow { id: _dropShadow Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -25,14 +25,32 @@ import "qrc:/pages/treatment/sections" ScreenItem { id: _root + enum Status { + Paused = 0, + Active = 1, + Complete = 2 + } + readonly property int margin : Variables.defaultMargin * 5 - readonly property color statusColor : Colors.statusActive - showCreateRxHeaderButton : true + readonly property int hdfState : vTreatmentHDF.hdfState + function statusColor ( vHeaderBar = false ) { + return _root.hdfState === TreatmentHDF.Active ? Colors.statusActive : + _root.hdfState === TreatmentHDF.Paused ? Colors.statusPaused : + _root.hdfState === TreatmentHDF.Complete ? vHeaderBar ? Colors.statusComplete : + Colors.statusTextComplete : Colors.transparent + } + property alias notification : _notification + onHdfStateChanged : setStatusColor() + showCreateRxHeaderButton: true + showHeaderMenu : true + signal sectionPressuresClicked() signal treatmentHDFEditClicked() - Component.onCompleted : vHeaderbarModel.setHeaderbarHDFStatusColor(_root.statusColor.toString()) + function setStatusColor() { + vHeaderbarModel.setHeaderbarHDFStatusColor(_root.statusColor(true).toString()) + } Connections { target: vTDOpMode function onInTreatmentChanged ( vValue ) { if ( vValue ) { _chart.updateXAxis() } } @@ -68,7 +86,7 @@ color : Colors.panelBackgroundColor header.color : Colors.heparinSectionHeader - enableDropShadow: false + // enableDropShadow: false } BaseChart { id: _chart @@ -95,11 +113,13 @@ objectName : "_treatmentHdfComponent" width : _column.width height : _column.cellHeight - statusColor : _root.statusColor + statusColor : _root.statusColor() - onSubstitutionFlowClicked : print ("Substitution Flow Clicked") + onPauseResumeClicked : vTreatmentHDF.hdfState === TreatmentHDF.Paused ? vTreatmentAdjustmentHDFState.doResume() : + vTreatmentAdjustmentHDFState.doPause() - onEditClicked : _root.treatmentHDFEditClicked() + onEditClicked : _root.treatmentHDFEditClicked() } } + NotificationBarSmall { id: _notification } } Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 /* Qt6 Port: replace the above import with the following one: import QtQuick.Effects */ @@ -28,7 +28,7 @@ property Item contentItem : null property alias header : _header property alias contentArea : _contentArea - property bool enableDropShadow: true + // property bool enableDropShadow: true signal editClicked() signal lockClicked() @@ -61,17 +61,17 @@ contentItem: _root.contentItem } - layer.enabled: _root.enableDropShadow - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 3 - verticalOffset: 5 - radius: 3.0 - samples: 7 - color: "#50000000" - source: _root - anchors.fill: _root - } + // layer.enabled: _root.enableDropShadow + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 3 + // verticalOffset: 5 + // radius: 3.0 + // samples: 7 + // color: "#50000000" + // source: _root + // anchors.fill: _root + // } /* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect: RectangularShadow { id: _dropShadow Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 /* Qt6 Port: replaced the above import with the following one: import QtQuick.Effects */ @@ -33,6 +33,7 @@ objectName: "_TreatmentTrends" property alias isParamExpanded: _paramArea.isExpanded showCreateRxHeaderButton: true + showHeaderMenu : true onVisibleChanged: { _paramList.positionViewAtBeginning() @@ -46,7 +47,7 @@ readonly property int labelWidth : 300 readonly property int scrollButtonWidth : 40 readonly property int paramAreaRightMargin : 5 - readonly property int paramWidth : + readonly property int paramWidth : (_root.width - Variables.defaultMargin - labelWidth - scrollButtonWidth - paramAreaRightMargin - _expandButton.width) / 7 readonly property int historyTimeWidth : 50 } @@ -58,21 +59,25 @@ height : _private.topHeaderHeight radius : 10 color : Colors.treatmentSectionHeader - layer { - enabled: true - effect: DropShadow { id: _topHeaderShadow - objectName : "_topHeaderShadow" - horizontalOffset: 2 - verticalOffset : 2 - } + // layer { + // enabled: true + // effect: DropShadow { id: _topHeaderShadow + // objectName : "_topHeaderShadow" + // horizontalOffset: 2 + // verticalOffset : 2 + // radius : 12 + // samples : 32 + // color : "#50000000" + // source : _header + // } /* Qt6 Port: replace the above DropShadow with the following RectangularShadow: effect: RectangularShadow { id: _topHeaderShadow objectName : "_topHeaderShadow" radius : 12 color : "#50000000" } */ - } + // } Text { id: _text objectName : "_text" @@ -181,7 +186,7 @@ width : _private.paramWidth height : _private.cellHeight enabled : true - + Text { id: _valueText objectName : "_valueText" anchors.centerIn : parent @@ -354,7 +359,7 @@ objectName: "_paramList" readonly property int visibleParamCount: _paramArea.isExpanded ? 7 : 5 readonly property int modelCount: _paramList.count ?? 0 - + anchors { fill : parent rightMargin : (Math.max(0, visibleParamCount - _paramList.count) * _private.paramWidth) Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -1,7 +1,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 /* Qt6 Port: replaced the above import with the following one: import QtQuick.Effects */ @@ -26,7 +26,7 @@ property alias precision : _rangedValue.precision property bool showButtons : true property bool buttonsEnabled : true - property bool dropShadowEnabled : true + // property bool dropShadowEnabled : true property bool canOff : false property bool runAnimation : false property real pulseAlpha : 1 @@ -148,16 +148,16 @@ } } - layer.enabled : _root.dropShadowEnabled && _root.showButtons - layer.effect : DropShadow { id: _dropShadow - horizontalOffset: 3 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _root - anchors.fill : _root - } + // layer.enabled : _root.dropShadowEnabled && _root.showButtons + // layer.effect : DropShadow { id: _dropShadow + // horizontalOffset: 3 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _root + // anchors.fill : _root + // } /* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect : RectangularShadow { id: _dropShadow radius : 3.0 Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r456da384df52c20ce45b2bec4317806ee11af1f6 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 456da384df52c20ce45b2bec4317806ee11af1f6) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -340,7 +340,11 @@ void TreatmentLog::saveLogConcurrent() { LOG_DEBUG("Save Treatment Log Started"); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QFuture mFuture = QtConcurrent::run(&TreatmentLog::saveLog, this); +#else QFuture mFuture = QtConcurrent::run(this, &TreatmentLog::saveLog); +#endif _saveWatcher.setFuture(mFuture); } @@ -495,7 +499,11 @@ void TreatmentLog::exportLogConcurrent() { LOG_DEBUG("Export Treatment Log Started"); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QFuture mFuture = QtConcurrent::run(&TreatmentLog::exportLog, this); +#else QFuture mFuture = QtConcurrent::run(this, &TreatmentLog::exportLog); +#endif _exportWatcher.setFuture(mFuture); } Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -rc2f474ff07c98aa350c445a2474976a3cf985f40 -rbecdb453874007323459a9afe9fe581b6c158902 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision becdb453874007323459a9afe9fe581b6c158902) @@ -39,7 +39,6 @@ PROPERTY_POST_CONNECTION(VSettings, servicePass ); PROPERTY_POST_CONNECTION(VSettings, alarmVolume ); - PROPERTY_POST_CONNECTION(VSettings, roWaterMode ); PROPERTY_POST_CONNECTION(VSettings, integratedBPCuff ); PROPERTY_POST_CONNECTION(VSettings, heparinSyringePump ); PROPERTY_POST_CONNECTION(VSettings, chemicalDisinfection); @@ -56,14 +55,6 @@ } } -void VSettings::roWaterMode_post(const bool &vroWaterMode_post) { - //TODO The Settings shall be the Singleton SettingsController and modify the MSettings like the others. - if ( Storage::Settings::save(roWaterModeGroup(), roWaterModeKey(), QString::number(vroWaterMode_post)) != 0 ) { - roWaterMode(false); - // FIXME: Notify UI with a message - } -} - void VSettings::advancedMode_post(const bool &vadvancedMode_post) { //TODO The Settings shall be the Singleton SettingsController and modify the MSettings like the others. if ( Storage::Settings::save(advancedModeGroup(), advancedModeKey(), QString::number(vadvancedMode_post)) != 0 ) { @@ -150,12 +141,6 @@ keyValue[key] = mServicePass ; servicePass ( mServicePass); } - else if ( isroWaterMode (category, group, key) ) { - bool mRoWaterMode; - mRoWaterMode = _Settings.value(category, group, key).toBool (); - keyValue[key] = mRoWaterMode ; - roWaterMode ( mRoWaterMode); - } else if ( isadvancedMode(category, group, key) ) { bool mAdvancedMode; mAdvancedMode = _Settings.value(category, group, key).toBool (); @@ -207,24 +192,23 @@ // otherwise will use the default value and will notify the update. servicePass ( _servicePass ); alarmVolume ( _alarmVolume ); - roWaterMode ( _roWaterMode ); advancedMode( _advancedMode ); - //DEBUG qDebug() << servicePass() << roWaterMode() << alarmVolume(); adjustment(true); initConnectionsSettings(); } -VSettings::TKeysList VSettings::updateReplacements(const QString &vGroup, const QStringList &vKeys) +VSettings::TKeysList VSettings::updateReplacements(const QString &vGroup, + const QStringList &vKeys) { TKeysList keysList; Q_UNUSED(vGroup); Q_UNUSED(vKeys) // TODO: Qt6 port - remove #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) /* TODO: Qt6 port - QRegularExpression #endif for ( quint16 keyIndex = 0; keyIndex < vKeys.count(); keyIndex++ ) { - QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}"); + QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w+\\s*:\\s*\\d+\\s*\\}"); QString key = vKeys[keyIndex]; int replacementCount = key.count(regx); QStringList keyList; @@ -236,10 +220,20 @@ keyList += ""; // value placeholder key.remove(0, pos + regx.matchedLength()); QStringList lst = blk.split(":"); - quint16 id = lst[0].toUInt(); - quint16 ix = lst[1].toUInt(); - QString ex = lst[2] ; - quint16 rd = lst[3].toUInt(); + if ( lst.size() != 4 ) + continue; + + bool okId = false; + bool okIx = false; + bool okRd = false; + + quint16 id = lst[0].trimmed().toUInt(&okId); + quint16 ix = lst[1].trimmed().toUInt(&okIx); + QString ex = lst[2].trimmed(); + quint16 rd = lst[3].trimmed().toUInt(&okRd); + + if ( ! okId || ! okIx || ! okRd ) + continue; TLocation loc; loc.group = vGroup ; loc.keyIndex = keyIndex ;