Index: leahi.pro =================================================================== diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c --- leahi.pro (.../leahi.pro) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) +++ leahi.pro (.../leahi.pro) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c) @@ -210,6 +210,7 @@ \ # ---------- Models - TD - Data //// ----- @LEAHIZED sources/model/td/data/MTDOpModeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED + sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.h \ @@ -269,6 +270,7 @@ sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodPrime.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h \ @@ -298,6 +300,7 @@ sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \ \ # ---------- Models - TD - Adjustment - End-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \ \ # ---------- Models - TD - Adjustment - Pre-Treatment sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \ @@ -346,7 +349,6 @@ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \ \ # ---------- Models - HD - Adjustment - End-Treatment - sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \ \ # ---------- Models - HD - Adjustment - Post-Treatment sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \ @@ -587,6 +589,7 @@ \ # ---------- Models - TD - Data - States sources/model/td/data/MTDOpModeData.cpp \ \ # ---------- Models - TD - Adjustment - In-Treatment + sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustBolusVolumeResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp \ @@ -605,6 +608,7 @@ \ # ---------- Models - TD - Adjustment - End-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \ \ # ---------- Models - CONFIRM sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST @@ -654,7 +658,6 @@ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ \ # ---------- Models - HD - Adjustment - End-Treatment - sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ \ # ---------- Models - HD - Adjustment - Post-Treatment sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \ @@ -744,6 +747,7 @@ sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp \ \ # ---------- Views - TD - Adjustment - In-Treatment sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodPrime.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp \ Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c) @@ -237,6 +237,10 @@ ID_TDTemperatureData = 0x5300, // 83 //// ----- TODO: Payload subject to change given FW implementation ID_TreatmentParametersSetPointData = 0x4F00, // 79 //// ----- @LEAHIZED + // Blood Prime + ID_AdjustBloodPrimeReq = 0x9800, // 152 + ID_AdjustBloodPrimeRsp = 0x9900, // 153 + // In-Treatment Adjustables ID_AdjustPressuresLimitsReq = 0x7200, // 114 //// ----- @LEAHIZED ID_AdjustPressuresLimitsRsp = 0x7300, // 115 //// ----- @LEAHIZED @@ -485,6 +489,7 @@ typedef GuiActions::Requested_Treatment_Recirc_User_Actions GuiRecirculateCommands; // Blood Prime typedef GuiActions::Blood_Prime_States GuiBloodPrimeStates; + typedef GuiActions::Requested_Blood_Prime_User_Actions GuiBloodPrimeCommands; // Treatment End typedef GuiActions::Treatment_End_States GuiTreatmentEndStates; typedef GuiActions::Requested_Treatment_End_User_Actions GuiTreatmentEndCommands; Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c) @@ -51,12 +51,16 @@ } Text { id: _title - color : Colors.textMain - anchors.centerIn : parent - horizontalAlignment : Text.AlignHCenter - verticalAlignment : Text.AlignVCenter - font.pixelSize : Fonts.fontHeaderbarTitle - font.weight : Font.DemiBold + color : Colors.textMain + anchors { + horizontalCenter : parent.horizontalCenter + bottom : _headerMenu.top + } + height : parent.height + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + font.pixelSize : Fonts.fontHeaderbarTitle + font.weight : Font.DemiBold } Item { id: _dateTimeItem Index: sources/gui/qml/main.qml =================================================================== diff -u -r5b83234771fac143552fa8106027d0ed8730c4d5 -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c --- sources/gui/qml/main.qml (.../main.qml) (revision 5b83234771fac143552fa8106027d0ed8730c4d5) +++ sources/gui/qml/main.qml (.../main.qml) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c) @@ -123,6 +123,7 @@ import VFPTemperature 0.1 import VFPBoostPump 0.1 // In-Treatment - Adjustemnt +import VTreatmentAdjustmentBloodPrime 0.1 import VTreatmentAdjustmentBolusVolume 0.1 import VTreatmentAdjustmentDurationEdit 0.1 import VTreatmentAdjustmentDurationConfirm 0.1 @@ -298,6 +299,7 @@ VTreatmentCreate { id: vTreatmentCreate } VTreatmentRanges { id: vTreatmentRanges } + VTreatmentAdjustmentBloodPrime { id: vTreatmentAdjustmentBloodPrime } VTreatmentAdjustmentBolusVolume { id: vTreatmentAdjustmentBolusVolume } VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit } VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit }