Index: leahi.pro =================================================================== diff -u -r390ed35afb0d069fb37084b7b61bc56c4b2c44d4 -rf0f6a52911547cba480cf48473c95a2389e6a1a4 --- leahi.pro (.../leahi.pro) (revision 390ed35afb0d069fb37084b7b61bc56c4b2c44d4) +++ leahi.pro (.../leahi.pro) (revision f0f6a52911547cba480cf48473c95a2389e6a1a4) @@ -187,6 +187,7 @@ 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 \ @@ -213,6 +214,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 \ @@ -238,7 +242,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 \ @@ -247,7 +250,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 \ @@ -256,6 +273,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 \ @@ -474,19 +494,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/VTreatmentBloodPrimeData.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 @@ -536,6 +544,7 @@ 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 \ @@ -580,6 +589,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 \ @@ -710,7 +722,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 \ @@ -719,6 +745,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 \ @@ -812,19 +841,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/VTreatmentBloodPrimeData.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: sources/gui/GuiGlobals.h =================================================================== diff -u -r390ed35afb0d069fb37084b7b61bc56c4b2c44d4 -rf0f6a52911547cba480cf48473c95a2389e6a1a4 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 390ed35afb0d069fb37084b7b61bc56c4b2c44d4) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f0f6a52911547cba480cf48473c95a2389e6a1a4) @@ -84,8 +84,8 @@ // POST ID_HDPostSingleResultData = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication ID_HDPostFinalResultData = 0x8F0F, // 143 //// ----- @CRAPIZED: had to change to avoid duplication - ID_DGPostSingleResultData = 0x9000, // 144 - ID_DGPostFinalResultData = 0x9100, // 145 + 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,6 +137,7 @@ 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 = 0x9700, // 151 @@ -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/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r0caa3e46caac980e0dfb5daf5ec3429a574d74eb -rf0f6a52911547cba480cf48473c95a2389e6a1a4 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 0caa3e46caac980e0dfb5daf5ec3429a574d74eb) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision f0f6a52911547cba480cf48473c95a2389e6a1a4) @@ -107,10 +107,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 ) { @@ -139,7 +139,7 @@ } } - TreatmentAdjustmentDuration { id: _treatmentAdjustmentDuration } + TreatmentAdjustmentDurationStack { id: _treatmentAdjustmentDuration } TreatmentAdjustmentVitalsInterval { id: _treatmentAdjustmentVitalsInterval }