Index: leahi.pro =================================================================== diff -u -rad78225384a974269b18c0fe3b55a7d64f77d813 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- leahi.pro (.../leahi.pro) (revision ad78225384a974269b18c0fe3b55a7d64f77d813) +++ leahi.pro (.../leahi.pro) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -178,6 +178,7 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ sources/model/td/data/MTDAirBubbleData.h \ sources/model/td/data/MTDAirPumpData.h \ @@ -232,6 +233,7 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ \ # ---------- Views - TD - Data - States //// ----- @LEAHIZED + sources/view/VListModel.h \ sources/view/dd/data/VDDBloodLeakData.h \ sources/view/dd/data/VDDConcentratePumpData.h \ sources/view/dd/data/VDDConductivityData.h \ @@ -251,6 +253,7 @@ 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/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ sources/view/td/data/VTDAirTrapData.h \ @@ -542,6 +545,7 @@ 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/MTreatmentAdjustPressuresWideningResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ sources/model/td/data/MTDAirPumpData.cpp \ sources/model/td/data/MTDAirTrapData.cpp \ @@ -564,6 +568,7 @@ sources/model/ui/data/MUIBloodPressureData.cpp \ sources/storage/Settings.cpp \ sources/storage/TreatmentLog.cpp \ + sources/view/VListModel.cpp \ sources/view/dd/data/VDDBloodLeakData.cpp \ sources/view/dd/data/VDDConcentratePumpData.cpp \ sources/view/dd/data/VDDConductivityData.cpp \ @@ -728,6 +733,7 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ sources/view/td/data/VTDAirTrapData.cpp \ Index: leahi.qrc =================================================================== diff -u -rad78225384a974269b18c0fe3b55a7d64f77d813 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- leahi.qrc (.../leahi.qrc) (revision ad78225384a974269b18c0fe3b55a7d64f77d813) +++ leahi.qrc (.../leahi.qrc) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -38,6 +38,7 @@ sources/gui/qml/dialogs/LockDialog.qml sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml sources/gui/qml/dialogs/EndTreatmentDialog.qml + sources/gui/qml/dialogs/RinsebackCompleteDialog.qml sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml @@ -53,6 +54,12 @@ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml + + sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml + sources/gui/qml/dialogs/watersample/WaterSampleBase.qml + sources/gui/qml/dialogs/watersample/WaterSamplePage.qml + sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml + resources/images/Logo d.png resources/images/Logo DialityT.png @@ -112,6 +119,9 @@ resources/images/Volume.png resources/images/water_sample_fail.png resources/images/water_sample_pass.png + resources/images/water_sample.png + resources/images/ArrowDownDisabled.png + resources/images/ArrowUpDisabled.png sources/gui/qml/components/MainMenu.qml @@ -180,6 +190,7 @@ sources/gui/qml/components/RangedValue.qml sources/gui/qml/components/SubStepIndicator.qml sources/gui/qml/components/SDCInfo.qml + sources/gui/qml/components/BaseChart.qml sources/gui/qml/compounds/PressureRangeSlider.qml @@ -253,11 +264,9 @@ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml sources/gui/qml/pages/pretreatment/PreTreatmentStack.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 @@ -270,6 +279,7 @@ sources/gui/qml/pages/treatment/TreatmentSection.qml sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml sources/gui/qml/pages/treatment/TreatmentHeparin.qml + sources/gui/qml/pages/treatment/TreatmentHDF.qml sources/gui/qml/pages/treatment/TreatmentTrends.qml @@ -281,6 +291,7 @@ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml + sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml @@ -299,6 +310,7 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml @@ -309,9 +321,6 @@ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml - sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml - sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml - sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rad78225384a974269b18c0fe3b55a7d64f77d813 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ad78225384a974269b18c0fe3b55a7d64f77d813) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -72,8 +72,8 @@ ID_TDDebugText = 0xF1FF, ID_DDDebugText = 0xF2FF, - ID_HDGeneralEvent = 0xA400, - ID_DGGeneralEvent = 0xA500, + ID_HDGeneralEvent = 0xA40F, //// ----- @CRAPIZED: had to change to avoid duplication + ID_DGGeneralEvent = 0xA50F, //// ----- @CRAPIZED: had to change to avoid duplication ID_TDCheckIn = 0x1000, // 16 //// ----- @LEAHIZED @@ -167,7 +167,7 @@ ID_DGFilterFlushData = 0x600F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustWaterSampleReq = 0x5D00, // 93 ID_AdjustWaterSampleRsp = 0x5E00, // 94 - ID_AdjustWaterSampleResultReq = 0x5F0F, // 95 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustWaterSampleResultReq = 0XA300, // 163 // Pre-Treatment Consumables Installation Confirm ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest NoCartridge Progress Data @@ -277,6 +277,9 @@ ID_AdjustHeparinReq = 0x8A00, // 138 ID_AdjustHeparinRsp = 0x8B00, // 139 + ID_AdjustPressuresWideningReq = 0xA400, // 114 //// ----- @LEAHIZED + ID_AdjustPressuresWideningRsp = 0xA500, // 115 //// ----- @LEAHIZED + // Ultrafiltration ID_AdjustUltrafiltrationStateReq = 0x4700, // 71 //// ----- @LEAHIZED ID_AdjustUltrafiltrationStateRsp = 0x4800, // 72 //// ----- @LEAHIZED Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rad78225384a974269b18c0fe3b55a7d64f77d813 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision ad78225384a974269b18c0fe3b55a7d64f77d813) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -47,7 +47,6 @@ readonly property color mainTreatmentLighterBlue : "#1F3D5A" readonly property color mainTreatmentOrange : "#FFB836" readonly property color mainTreatmentIsoBlue : "#C3F9FF" - readonly property color mainTreatmentGreen : "#BBFFA3" readonly property color sliderHighlightColor : "orange" readonly property color sliderProgressBorderActive : white @@ -59,7 +58,7 @@ readonly property color alarmDialogGreyText : "#838080" readonly property color dialogShadowColor : "#EAE9E9" readonly property color dialogValueColor : "#385E92" - readonly property color darkDialogColor : "#091E31" + readonly property color darkDialogColor : "#162737" readonly property color backgroundRangeRect : "#2E4F76" readonly property color highlightProgressBar : "#3d8eef" @@ -97,10 +96,14 @@ readonly property color heparinPanelBorderColor         : "#CC42556B" readonly property color heparinSectionHeader            : "#384B60" - readonly property color heparinActive                   : "#429C4A" - readonly property color heparinPaused                   : "#D9A23D" - readonly property color heparinComplete                 : "#276FCD" + readonly property color statusActive : "#339D47" + readonly property color statusPaused : "#AB7107" + readonly property color statusComplete : "#60DCFF" + readonly property color statusTextActive : "#7DF393" + readonly property color statusTextPaused : "#FFB836" + readonly property color statusTextComplete : "#185E81" + readonly property color touchTextAreaTitle : "#a0b6d0" readonly property color textTextRectTitle : white Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r2283d645185c14bf358aff5ea59bed5087692146 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2283d645185c14bf358aff5ea59bed5087692146) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -128,6 +128,10 @@ readonly property int treatmentFlowsComponentWidth : 150 readonly property int treatmentPressureTitleWidth : 125 readonly property int treatmentPressureValueWidth : 140 + readonly property int completeDialogHeight : 600 + readonly property int completeDialogWidth : 800 + readonly property int treatmentCellWidth : 264 // screen width / # columns + readonly property int treatmentCellHeight : 420 //screen height / # rows - headerbar readonly property int ultrafiltrationProgressBarWidth : 769 readonly property int ultraFiltrationProgressBarHeight : 25 Index: sources/gui/qml/main.qml =================================================================== diff -u -rad78225384a974269b18c0fe3b55a7d64f77d813 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- sources/gui/qml/main.qml (.../main.qml) (revision ad78225384a974269b18c0fe3b55a7d64f77d813) +++ sources/gui/qml/main.qml (.../main.qml) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -35,6 +35,8 @@ import VTDSwitches 0.1 import VTDEjector 0.1 import VTDTemperature 0.1 +import VListModel 0.1 + // POST import VHDPOSTData 0.1 import VDGPOSTData 0.1 @@ -140,6 +142,7 @@ import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 import VTreatmentAdjustmentPressuresLimits 0.1 +import VTreatmentAdjustmentPressuresWidening 0.1 import VTreatmentAdjustmentSaline 0.1 import VTreatmentAdjustmentVitals 0.1 import VTreatmentAdjustmentHeparin 0.1 @@ -166,6 +169,7 @@ import "qrc:/dialogs" import "qrc:/dialogs/diagnostics" import "qrc:/dialogs/headerbar" +import "qrc:/dialogs/watersample" /*! * \brief Initialization and start point of the QML @@ -235,6 +239,7 @@ VTDSwitches { id: vTDSwitches } VTDEjector { id: vTDEjector } VTDTemperature { id: vTDTemperature } + VListModel { id: vListModel } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentIsolatedUF { id: vTreatmentIsolatedUF } @@ -313,6 +318,7 @@ VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } + VTreatmentAdjustmentPressuresWidening { id: vTreatmentAdjustmentPressuresWidening } VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } @@ -415,19 +421,21 @@ KeyboardItem { id: _keyboard } // Dialogs - AcidConcentrateAdjustment { id: _acidConcentrateAdjustment } - HeaderbarPrescription { id: _headerbarPrescription } - HeaderbarWiFi { id: _headerbarWifi } - HeaderbarSettings { id: _headerbarSettings } - HeaderbarInformation { id: _headerbarInformation } - TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } - EndTreatmentDialog { id: _endTreatmentDialog } + AcidConcentrateAdjustment { id: _acidConcentrateAdjustment } + HeaderbarPrescription { id: _headerbarPrescription } + HeaderbarWiFi { id: _headerbarWifi } + HeaderbarSettings { id: _headerbarSettings } + HeaderbarInformation { id: _headerbarInformation } + WaterSampleDialog { id: _headerbarWaterSampleDialysate } + TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals } + EndTreatmentDialog { id: _endTreatmentDialog } + RinsebackCompleteDialog { id: _rinsebackCompleteDialog } - LockDialog { id: _lockDialog } - AlarmItem { id: _alarmItem ; z: 996 } - PowerItem { id: _powerItem ; z: 997 } - ConfirmDialog { id: _confirmDialog ; z: 998 } - DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + LockDialog { id: _lockDialog } + AlarmItem { id: _alarmItem ; z: 996 } + PowerItem { id: _powerItem ; z: 997 } + ConfirmDialog { id: _confirmDialog ; z: 998 } + DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r631dadb4c886d7a68687aeb7451d59a144e47992 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 631dadb4c886d7a68687aeb7451d59a144e47992) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -43,10 +43,11 @@ if (! visible) { _headerBar.menuHidden = true + stackView.initialItem = null } } - stackView.initialItem : null + stackView.initialItem : _treatmentHome readonly property bool isTreatmentPaused : vTDTreatmentStates.txStop readonly property bool isSBInProgress : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump ) @@ -55,16 +56,16 @@ onHeaderMenuIndexChanged: { switch( _headerBar.currentScreen ) { - case MainMenu.Treatment: + case HeaderBar.Treatment: pop(null) // unwind stack back to main treatment break - case MainMenu.Trends: + case HeaderBar.Trends: page( _treatmentTrends ) break; - case MainMenu.Heparin: + case HeaderBar.Heparin: page( _treatmentHeparin ) break - case MainMenu.HDF: // TODO + case HeaderBar.HDF: // TODO page( _treatmentHDF ) break default: @@ -140,17 +141,28 @@ TreatmentHeparin { id: _treatmentHeparin } Connections { target: _treatmentHeparin function onIdleTimeout ( ) { - _headerBar.headerMenuIndex = MainMenu.Treatment // on heparin idle timeout go to main treatment + _headerBar.headerMenuIndex = HeaderBar.Treatment // on heparin idle timeout go to main treatment } } - ScreenItem { id: _treatmentHDF } // TODO: make me! + TreatmentHDF { id: _treatmentHDF } + Connections { target: _treatmentHDF + function onSectionPressuresClicked ( ) { + _treatmentAdjustmentPressuresLimits.open() + } + function onTreatmentHDFEditClicked ( ) { + _treatmentAdjustmentHDF.open() + + } + } + //// Treatment Adjustment Dialogs TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } TreatmentAdjustmentUltrafiltrationStack { id: _treatmentAdjustmentUltrafiltration } + TreatmentAdjustmentHDF { id: _treatmentAdjustmentHDF } Connections { target: _treatmentAdjustmentSetPoints function onConfirmClicked ( vValue ) { @@ -237,8 +249,4 @@ function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )} function onTxEndChanged ( vValue ) { if ( vValue ) { _endTreatmentDialog.open() }} } - - Connections { target: _mainHome - function onStartTreatment ( vValue ) { page( _treatmentHome )} - } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -rad78225384a974269b18c0fe3b55a7d64f77d813 -rafd1d028227b4f58f864aa814fc4d4e286cb873b --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision ad78225384a974269b18c0fe3b55a7d64f77d813) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision afd1d028227b4f58f864aa814fc4d4e286cb873b) @@ -80,12 +80,12 @@ } onOpened: { + _bphrEntry.setInitialFocus() notificationText = notificationTextString } onCloseClicked: { numPad.hide() - numPad.visible = false vTreatmentVitals.doSkip() }