Index: leahi.pro =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- leahi.pro (.../leahi.pro) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ leahi.pro (.../leahi.pro) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -65,6 +65,7 @@ sources/model/td/adjustment \ sources/model/td/adjustment/settings \ sources/model/td/adjustment/treatment \ + sources/model/td/adjustment/pretreatment \ sources/model/dd \ sources/model/dd/data \ sources/model/dd/adjustment \ @@ -78,6 +79,7 @@ sources/view/td/data \ sources/view/td/data/treatment \ sources/view/td/adjustment/treatment \ + sources/view/td/adjustment/pretreatment \ sources/view/dd \ sources/view/dd/data \ sources/view/confirm \ @@ -187,6 +189,8 @@ sources/model/td/data/MTDValvesData.h \ sources/model/td/data/MTDVoltageData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ + sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \ + sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \ sources/model/td/data/treatment/MTreatmentSalineData.h \ @@ -216,6 +220,9 @@ 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/MTreatmentAdjustIsolatedUFDurationEditResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.h \ @@ -241,7 +248,6 @@ sources/view/fp/data/VFPPressuresData.h \ sources/view/fp/data/VFPROPumpData.h \ sources/view/fp/data/VFPTemperatureData.h \ - sources/view/hd/data/VTreatmentRanges.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ sources/view/td/data/VTDAirBubbleData.h \ @@ -250,7 +256,22 @@ sources/view/td/data/VTDBatteryData.h \ sources/view/td/data/VTDEjectorData.h \ sources/view/td/data/VTDOpModeData.h \ + sources/view/td/data/VTDSwitchesData.h \ + sources/view/td/data/VTDTemperatureData.h \ + sources/view/td/data/VTDValvesData.h \ + sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.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/VTreatmentIsolatedUFData.h \ + sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ + sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ + sources/view/td/data/treatment/VTreatmentSalineData.h \ + sources/view/td/data/treatment/VTreatmentTime.h \ + sources/view/td/data/treatment/VTreatmentTrends.h \ + sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \ @@ -259,13 +280,19 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.h \ + 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/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 \ + \ # ---------- Views - TD - Adjustment - Pre-Treatment + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \ \ # ---------- Models - TD - Adjustment - Settings @@ -276,6 +303,9 @@ sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \ \ # ---------- Models - TD - Adjustment - End-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \ + \ # ---------- Models - TD - Adjustment - Pre-Treatment + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - confirm sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST @@ -312,12 +342,10 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ @@ -351,7 +379,6 @@ sources/model/hd/data/treatment/MTreatmentHeparinData.h \ sources/model/hd/data/treatment/MTreatmentRinsebackData.h \ sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ - sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \ sources/model/hd/data/treatment/MTreatmentStopData.h \ sources/model/hd/data/post/MHDRTCEpochData.h \ sources/model/hd/data/MHDUsageInfoResponse.h \ @@ -421,12 +448,10 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \ \ # ---------- Views - HD - Adjustment - End-Treatment @@ -455,7 +480,6 @@ sources/view/hd/data/treatment/VTreatmentHeparinData.h \ sources/view/hd/data/treatment/VTreatmentRinsebackData.h \ sources/view/hd/data/treatment/VTreatmentRecirculateData.h \ - sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \ sources/view/hd/data/treatment/VTreatmentStopData.h \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress sources/view/dg/data/pretreatment/VDGFilterFlushData.h \ @@ -477,19 +501,7 @@ sources/utility/format.h \ sources/utility/types.h \ sources/utility/encryption.h \ - sources/utility/qrcodegen.h \ - sources/view/td/data/VTDSwitchesData.h \ - sources/view/td/data/VTDTemperatureData.h \ - sources/view/td/data/VTDValvesData.h \ - sources/view/td/data/VTDVoltageData.h \ - sources/view/td/data/treatment/VTDTreatmentStatesData.h \ - sources/view/td/data/treatment/VTreatmentBloodFlow.h \ - sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \ - sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \ - sources/view/td/data/treatment/VTreatmentSalineData.h \ - sources/view/td/data/treatment/VTreatmentTime.h \ - sources/view/td/data/treatment/VTreatmentTrends.h \ - sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h + sources/utility/qrcodegen.h SOURCES += \ \ # common @@ -538,6 +550,8 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ + sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ + sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \ sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \ sources/model/td/data/treatment/MTreatmentSalineData.cpp \ @@ -585,6 +599,9 @@ 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/MTreatmentAdjustIsolatedUFDurationEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeEditResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustSetPointsResponse.cpp \ @@ -622,6 +639,9 @@ sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \ + \ # ---------- Models - TD - Adjustment - Pre-Treatment + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ + sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ \ # ---------- Models - HD - Adjustment @@ -632,12 +652,10 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \ - sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ \ # ---------- Models - HD - Adjustment - In-Treatment sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ @@ -663,7 +681,6 @@ sources/model/hd/data/treatment/MTreatmentHeparinData.cpp \ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \ sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \ - sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \ sources/model/hd/data/treatment/MTreatmentStopData.cpp \ sources/model/hd/data/post/MHDRTCEpochData.cpp \ sources/model/hd/data/MHDUsageInfoResponse.cpp \ @@ -714,7 +731,22 @@ sources/view/td/data/VTDBatteryData.cpp \ sources/view/td/data/VTDEjectorData.cpp \ sources/view/td/data/VTDOpModeData.cpp \ + sources/view/td/data/VTDSwitchesData.cpp \ + sources/view/td/data/VTDTemperatureData.cpp \ + sources/view/td/data/VTDValvesData.cpp \ + sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.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/VTreatmentIsolatedUFData.cpp \ + sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ + sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ + sources/view/td/data/treatment/VTreatmentSalineData.cpp \ + sources/view/td/data/treatment/VTreatmentTime.cpp \ + sources/view/td/data/treatment/VTreatmentTrends.cpp \ + sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \ @@ -723,13 +755,19 @@ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \ + 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/VTreatmentAdjustmentPressuresLimits.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.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 - TD - Adjustment - Pre-Treatment + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - CONFIRM sources/view/confirm/VConfirm.cpp \ \ # ---------- Views - POST @@ -760,12 +798,10 @@ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \ - sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \ \ # ---------- Views - HD - Adjustment - End-Treatment @@ -793,7 +829,6 @@ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ \ # ---------- Views - HD - Data - End-Treatment - sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp \ sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \ sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \ sources/view/hd/data/treatment/VTreatmentStopData.cpp \ @@ -817,19 +852,7 @@ sources/utility/format.cpp \ sources/utility/types.cpp \ sources/utility/encryption.cpp \ - sources/utility/qrcodegen.cpp \ - sources/view/td/data/VTDSwitchesData.cpp \ - sources/view/td/data/VTDTemperatureData.cpp \ - sources/view/td/data/VTDValvesData.cpp \ - sources/view/td/data/VTDVoltageData.cpp \ - sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ - sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ - sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \ - sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \ - sources/view/td/data/treatment/VTreatmentSalineData.cpp \ - sources/view/td/data/treatment/VTreatmentTime.cpp \ - sources/view/td/data/treatment/VTreatmentTrends.cpp \ - sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp + sources/utility/qrcodegen.cpp RESOURCES += \ leahi.qrc Index: leahi.qrc =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- leahi.qrc (.../leahi.qrc) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ leahi.qrc (.../leahi.qrc) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -110,6 +110,8 @@ resources/images/eye_closed.png resources/images/stepCheck.png resources/images/complete_check.png + resources/images/water_sample_fail.png + resources/images/water_sample_pass.png sources/gui/qml/components/MainMenu.qml @@ -176,6 +178,7 @@ sources/gui/qml/components/IdleTimer.qml sources/gui/qml/components/TreatmentCompleteButton.qml sources/gui/qml/components/RangedValue.qml + sources/gui/qml/components/SubStepIndicator.qml sources/gui/qml/compounds/PressureRangeSlider.qml @@ -248,18 +251,16 @@ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml - sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml - sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml - sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml + sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml + sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml + sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml + sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml - - sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml - sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml - sources/gui/qml/pages/treatment/TreatmentStack.qml sources/gui/qml/pages/treatment/TreatmentHome.qml @@ -282,15 +283,18 @@ 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/TreatmentAdjustmentDurationStack.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationConfirm.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/TreatmentAdjustmentUltrafiltrationStack.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/TreatmentAdjustmentIsolatedUFDurationEdit.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFVolumeEdit.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -83,9 +83,9 @@ // POST ID_HDPostSingleResultData = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication - ID_HDPostFinalResultData = 0x8F0F, // 143 //// ----- @CRAPIZED - ID_DGPostSingleResultData = 0x9000, // 144 - ID_DGPostFinalResultData = 0x9100, // 145 + ID_HDPostFinalResultData = 0x8F0F, // 143 //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGPostSingleResultData = 0x900F, // 144 //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGPostFinalResultData = 0x910F, // 145 //// ----- @CRAPIZED: had to change to avoid duplication ID_UIPostFinalResultData = 0x920F, // 146 //// ----- @CRAPIZED: had to change to avoid duplication ID_UIPostFinalResultHDReq = 0xB200, // 178 // ID_HDFinalResultRxq - HD Final Result request received @@ -110,7 +110,7 @@ ID_AdjustServiceDatesDGRsp = 0x8C0F, // 140 //// ----- @CRAPIZED: had to change to avoid duplication // HD/DG Usage Counter - ID_HDUsageInfoReq = 0xA000, // 160 + ID_HDUsageInfoReq = 0xA00F, // 160 //// ----- @CRAPIZED: had to change to avoid duplication ID_HDUsageInfoRsp = 0x8B0F, // 139 //// ----- @CRAPIZED: had to change to avoid duplication // RTC @@ -137,9 +137,10 @@ ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED ID_Heparin = 0x8C00, // 140 + ID_IsolatedUF = 0x9A00, // 154 ID_Rinseback = 0x8F00, // 143 //// ----- @LEAHIZED ID_Recirculate = 0x5A00, // 90 - ID_BloodPrime = 0x5900, // 89 + ID_BloodPrime = 0x9700, // 151 ID_TreatmentStop = 0x4900, // 73 ID_Vitals = 0x6500, // 101 @@ -190,9 +191,9 @@ ID_AdjustPatientConnectionConfirmReq = 0x660F, // 102 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustPatientConnectionConfirmRsp = 0x670F, // 103 //// ----- @CRAPIZED: had to change to avoid duplication // Pre-Treatment Start Treatment - ID_AdjustStartTreatmentReq = 0x7100, // 113 - ID_AdjustStartTreatmentRsp = 0x720F, // 114 //// ----- @CRAPIZED: had to change to avoid duplication - + ID_AdjustStartTreatmentReq = 0xA100, // 161 + ID_AdjustStartTreatmentRsp = 0xA200, // 162 + // DG Data Messages ID_DGROPumpData = 0x1F0F, // 31 //// ----- @CRAPIZED: had to change to avoid duplication ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication @@ -282,6 +283,15 @@ ID_AdjustUltrafiltrationConfirmReq = 0x6600, // 102 //// ----- @LEAHIZED ID_AdjustUltrafiltrationConfirmRsp = 0x6700, // 103 //// ----- @LEAHIZED + ID_AdjustIsolatedUFDurationEditReq = 0x9B00, // 155 //// ----- @LEAHIZED + ID_AdjustIsolatedUFDurationEditRsp = 0x9C00, // 156 //// ----- @LEAHIZED + + ID_AdjustIsolatedUFVolumeEditReq = 0x9D00, // 157 //// ----- @LEAHIZED + ID_AdjustIsolatedUFVolumeEditRsp = 0x9E00, // 158 //// ----- @LEAHIZED + + ID_AdjustIsolatedUFConfirmReq = 0x9F00, // 159 //// ----- @LEAHIZED + ID_AdjustIsolatedUFConfirmRsp = 0xA000, // 160 //// ----- @LEAHIZED + // End-Treatment // Rinseback ID_AdjustRinsebackReq = 0x9000, // 144 //// ----- @LEAHIZED @@ -314,8 +324,8 @@ ID_TreatmentLogEventData = 0x6B00, // 107 //// ----- @LEAHIZED // Disinfect - ID_AdjustDisinfectModeReq = 0x9A00, // 154 - ID_AdjustDisinfectModeRsp = 0x9B00, // 155 + ID_AdjustDisinfectModeReq = 0x9A0F, // 154 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustDisinfectModeRsp = 0x9B0F, // 155 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisinfectStartReq = 0x7F0F, // 127 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisinfectStartRsp = 0x800F, // 128 //// ----- @CRAPIZED: had to change to avoid duplication Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -37,7 +37,7 @@ readonly property color backgroundButtonNormal : transparent readonly property color backgroundButtonSelect : "#438FEB" readonly property color backgroundButtonSelectDark : "#135088" // "#214773" - readonly property color backgroundDialog : "#254670" + readonly property color backgroundDialog : "#1B3F66" readonly property color backgroundMenu : "#14314C" readonly property color backgroundMainMenu : "#0F2841" //// ----- @LEAHIZED readonly property color backgroundDottedMenu : "#64809D" @@ -62,7 +62,7 @@ readonly property color dialogValueColor : "#3D8EEF" readonly property color darkDialogColor : "#091E31" - readonly property color backgroundRangeRect : "#3e546e" + readonly property color backgroundRangeRect : "#2E4F76" readonly property color highlightProgressBar : "#3d8eef" readonly property color highlightMedProgressBar : "#1b2b3e" readonly property color textProgressBar : "#88a3c5" @@ -109,6 +109,7 @@ readonly property color textTextRectExtra : "#708795" readonly property color line : "#094266" + readonly property color checkListLine : "#345477" readonly property color pressuresText : white readonly property color pressuresArterialBar : "#FF8282" @@ -168,6 +169,8 @@ readonly property color roFeatured : "#E79DF6" readonly property color roDefeatured : "#F9CD74" + readonly property color waterSampleContainer : "#2A425A" + // ---------- < PRS > Related Section ---------- // Alarm priority colors function alarmPriorityColors(vPriority) { Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -42,7 +42,7 @@ readonly property int mainMenuHeight : 80 //// ----- @LEAHIZED readonly property int alarmDialogHeaderHeight : 100 - readonly property int instructionHeight : 73 + readonly property int instructionHeight : 77 readonly property int minVGap : 15 readonly property int minVGap2 : 30 @@ -83,7 +83,7 @@ readonly property int rangeRectRadius : 2 readonly property int rangeRectTextMargin : 10 readonly property int rangeRectBorderWidth : 2 - readonly property int rangeMarkerHeight : 60 + readonly property int rangeMarkerHeight : 48 readonly property int rangeMarkerHeightMidle : 40 readonly property int rangeMarkerHeightShort : 30 readonly property int rangeMarkerWidth : 2 @@ -102,7 +102,7 @@ readonly property int circleNormalDiameter : 418 readonly property int progressCircleDiameterNormal : circleNormalDiameter - readonly property int progressCircleDiameterSmall : 150 + readonly property int progressCircleDiameterSmall : 250 readonly property int opacityAnimationDuration : 1200 readonly property int sliderTextMargin : 20 @@ -111,7 +111,7 @@ readonly property int notificationHeight : 80 //// ----- @LEAHIZED readonly property int notificationIconDiameter : 36 - readonly property int checkListViewItemWidth : 350 + readonly property int checkListViewItemWidth : 400 readonly property int checkListViewItemHeight : 60 readonly property int pauseIconDiameter : 60 @@ -138,7 +138,7 @@ readonly property int ultrafiltrationButtonWidth : 300 readonly property int ultrafiltrationButtonHeight : 60 readonly property int ultrafiltrationRangeMarkerWidth : 3 - readonly property int ultrafiltrationRangeMarkerTextMargin : 5 + readonly property int ultrafiltrationRangeMarkerTextMargin : 10 readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 @@ -257,6 +257,9 @@ // Calcium readonly property int substitutionPrecision : 1 + // conductivity + readonly property int conductivityPrecision : 1 + function sizeConverted(vSize, vSizePowers, vRound = 2) { return ( vSize / vSizePowers // convert from byte to Giga byte @@ -287,6 +290,9 @@ readonly property string preTreatmentStepLabelPriming : qsTr("PRIME" ) readonly property string preTreatmentStepLabelUltrafiltration : qsTr("BEGIN" ) + readonly property string unitTextChlorine : qsTr("mg/L") + readonly property real chlorineLevel : 0.1 + // Heparin readonly property string unitHeparinType : qsTr("IU/mL") // Units Index: sources/gui/qml/main.qml =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- sources/gui/qml/main.qml (.../main.qml) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ sources/gui/qml/main.qml (.../main.qml) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -69,6 +69,7 @@ // In-Treatment - Data import VTreatmentBloodFlow 0.1 import VTreatmentDialysateFlow 0.1 +import VTreatmentIsolatedUF 0.1 import VTreatmentPressureOcclusion 0.1 import VTreatmentUltrafiltration 0.1 import VTreatmentTime 0.1 @@ -131,6 +132,9 @@ import VTreatmentAdjustmentDialysateFlowRate 0.1 import VTreatmentAdjustmentDialysateTemperature 0.1 import VTreatmentAdjustmentFlows 0.1 +import VTreatmentAdjustmentIsolatedUFDurationEdit 0.1 +import VTreatmentAdjustmentIsolatedUFVolumeEdit 0.1 +import VTreatmentAdjustmentIsolatedUFConfirm 0.1 import VTreatmentAdjustmentUltrafiltrationState 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 @@ -232,6 +236,7 @@ VTDTemperature { id: vTDTemperature } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } + VTreatmentIsolatedUF { id: vTreatmentIsolatedUF } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } @@ -297,6 +302,9 @@ VTreatmentTrends { id: vTreatmentTrends } VTreatmentAdjustmentBolusVolume { id: vTreatmentAdjustmentBolusVolume } + VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit } + VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit } + VTreatmentAdjustmentIsolatedUFConfirm { id: vTreatmentAdjustmentIsolatedUFConfirm } VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals } VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } @@ -381,6 +389,10 @@ function onDidTimeout() { vTreatmentTrends.onIntervalTimeoutVitals() } } + Connections { target: _mainStack + function onIsCreateRx ( vState ) { _headerBar.isCreateRx = vState } + } + // 9 - Others HeaderBar { id: _headerBar anchors.top: parent.top Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -75,7 +75,6 @@ // Components TreatmentBloodPrime { id: _treatmentBloodPrime } TreatmentHome { id: _treatmentHome } - Connections { target: _treatmentHome function onSectionFlowClicked ( vValue ) { _treatmentAdjustmentSetPoints.open() @@ -119,10 +118,10 @@ ScreenItem { id: _treatmentHDF } // TODO: make me! //// Treatment Adjustment Dialogs - TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } - TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } - TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } - TreatmentAdjustmentUltrafiltration { id: _treatmentAdjustmentUltrafiltration } + TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } + TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } + TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } + TreatmentAdjustmentUltrafiltrationStack { id: _treatmentAdjustmentUltrafiltration } Connections { target: _treatmentAdjustmentSetPoints function onConfirmClicked ( vValue ) { @@ -151,7 +150,7 @@ } } - TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration } + TreatmentAdjustmentDurationStack { id: _treatmentAdjustmentDuration } TreatmentAdjustmentVitalsInterval { id: _treatmentAdjustmentVitalsInterval }