Index: leahi.pro =================================================================== diff -u -r64ab90fa99a6c4be429455f709b27bb4388e4f27 -r5b83234771fac143552fa8106027d0ed8730c4d5 --- leahi.pro (.../leahi.pro) (revision 64ab90fa99a6c4be429455f709b27bb4388e4f27) +++ leahi.pro (.../leahi.pro) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) @@ -188,6 +188,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 \ @@ -214,6 +216,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 \ @@ -239,7 +244,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 \ @@ -248,7 +252,21 @@ 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/VTreatmentUltrafiltrationData.h \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \ @@ -257,6 +275,9 @@ 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 \ @@ -353,7 +374,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 \ @@ -457,7 +477,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 \ @@ -479,18 +498,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/VTreatmentUltrafiltrationData.h + sources/utility/qrcodegen.h SOURCES += \ \ # common @@ -539,6 +547,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 \ @@ -583,6 +593,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 \ @@ -662,7 +675,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 \ @@ -715,7 +727,21 @@ 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/VTreatmentUltrafiltrationData.cpp \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \ @@ -724,6 +750,9 @@ 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 \ @@ -795,7 +824,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 \ @@ -819,18 +847,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/VTreatmentUltrafiltrationData.cpp + sources/utility/qrcodegen.cpp RESOURCES += \ leahi.qrc Index: leahi.qrc =================================================================== diff -u -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462 -r5b83234771fac143552fa8106027d0ed8730c4d5 --- leahi.qrc (.../leahi.qrc) (revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462) +++ leahi.qrc (.../leahi.qrc) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) @@ -281,15 +281,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 -r64ab90fa99a6c4be429455f709b27bb4388e4f27 -r5b83234771fac143552fa8106027d0ed8730c4d5 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 64ab90fa99a6c4be429455f709b27bb4388e4f27) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) @@ -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 @@ -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 = 0x960F, // 150 //// ----- @CRAPIZED: had to change to avoid duplication // 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 -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -r5b83234771fac143552fa8106027d0ed8730c4d5 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) @@ -106,6 +106,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" @@ -165,6 +166,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/Fonts.qml =================================================================== diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -r5b83234771fac143552fa8106027d0ed8730c4d5 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) @@ -82,8 +82,8 @@ readonly property int fontPixelUltrafiltrationAdjustmentMetrics : 30 readonly property int fontPixelUltrafiltrationAdjustmentNotification : 32 readonly property int fontPixelUltrafiltrationAdjustmentConfirmation : 50 - readonly property int fontPixelUltrafiltrationRangeMarker : 32 - readonly property int fontPixelUltrafiltrationMinMaxLabel : 24 + readonly property int fontPixelUltrafiltrationRangeMarker : 24 + readonly property int fontPixelUltrafiltrationMinMaxLabel : 18 readonly property int fontPixelUltrafiltrationRateUnit : 16 readonly property int fontPixelRinsebackAdjustmentButton : 26 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -ra7aab61ca63538c37b6931c60252680fc2ec2416 -r5b83234771fac143552fa8106027d0ed8730c4d5 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) @@ -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 @@ -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 Index: sources/gui/qml/main.qml =================================================================== diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -r5b83234771fac143552fa8106027d0ed8730c4d5 --- sources/gui/qml/main.qml (.../main.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) +++ sources/gui/qml/main.qml (.../main.qml) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) @@ -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 @@ -130,6 +131,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 @@ -231,6 +235,7 @@ VTDTemperature { id: vTDTemperature } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } + VTreatmentIsolatedUF { id: vTreatmentIsolatedUF } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } @@ -294,6 +299,9 @@ VTreatmentRanges { id: vTreatmentRanges } VTreatmentAdjustmentBolusVolume { id: vTreatmentAdjustmentBolusVolume } + VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit } + VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit } + VTreatmentAdjustmentIsolatedUFConfirm { id: vTreatmentAdjustmentIsolatedUFConfirm } VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals } VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState }