Index: leahi.pro =================================================================== diff -u -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3 -rc1651f840faf3ed767fb19b76742b68401f96272 --- leahi.pro (.../leahi.pro) (revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3) +++ leahi.pro (.../leahi.pro) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -204,7 +204,6 @@ sources/model/td/data/MTDValvesData.h \ sources/model/td/data/MTDVoltageData.h \ sources/model/td/data/MWaterSampleData.h \ - sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \ sources/model/td/data/treatment/MTreatmentHDFData.h \ @@ -593,7 +592,6 @@ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/MWaterSampleData.cpp \ sources/model/td/data/MTDSyringePumpData.cpp \ - sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ sources/model/td/data/treatment/MTreatmentHDFData.cpp \ Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc63c041f361045518ede1c8df212517159a662a5 -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c63c041f361045518ede1c8df212517159a662a5) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -90,8 +90,8 @@ // ----- Settings // Service Mode - ID_AdjustServiceModeReq = 0xB000, // 176 - ID_AdjustServiceModeRsp = 0xB10F, // 177 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustServiceModeReq = 0xD000, // 208 + ID_AdjustServiceModeRsp = 0xD100, // 209 // Version ID_AdjustVersionsUIReq = 0x0D00, // 13 //// ----- @LEAHIZED Index: sources/gui/qml/components/BaseComboBox.qml =================================================================== diff -u -rec53ffe0a1528ace958cfe347875b7bcd25bed57 -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision ec53ffe0a1528ace958cfe347875b7bcd25bed57) +++ sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -79,7 +79,6 @@ visible : _delegate.down || _delegate.highlighted || _delegate.visualFocus color : _delegate.down ? Colors.backgroundButtonSelect : Colors.backgroundButtonSelectDark - radius : Variables.dialogRadius } } Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -r7360f85ae13ee2a460ddfb11bc455203d6edf3ff -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 7360f85ae13ee2a460ddfb11bc455203d6edf3ff) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -31,6 +31,7 @@ //TODO need to update code to use bgColor instead of backgroundColor property // property alias bgColor : _root.color property alias textString : _text.text + property alias textFont : _text.font property bool touchable : true property bool animated : true Index: sources/gui/qml/compounds/DryBicartDisconnect.qml =================================================================== diff -u -r6c4840c01de76cc3d804c796aecd06d37438fc9c -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/compounds/DryBicartDisconnect.qml (.../DryBicartDisconnect.qml) (revision 6c4840c01de76cc3d804c796aecd06d37438fc9c) +++ sources/gui/qml/compounds/DryBicartDisconnect.qml (.../DryBicartDisconnect.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -8,15 +8,15 @@ ProcessStatusView { id: _root property bool isDialog: false - title : _root.isDialog ? qsTr("Disconnect Dry Bicarbonate Cartridge") : qsTr("Bicarb Cartridge Options") + title : _root.isDialog ? qsTr("Drain/Depressurize Dry Bicarbonate Cartridge") : qsTr("Dry Bicarbonate Cartridge Options") leftButtonText : vTreatmentDryBicartDisconnect.drainInProgress ? qsTr("Cancel") : qsTr("Drain") centerButtonText : qsTr("Depressurize") rightButtonText : isDialog ? qsTr("Done") : "" leftButtonEnabled : ! vTreatmentDryBicartDisconnect.depressurizeInProgress centerButtonEnabled : ! vTreatmentDryBicartDisconnect.depressurizeInProgress && ! vTreatmentDryBicartDisconnect.drainInProgress rightButtonEnabled : ! vTreatmentDryBicartDisconnect.depressurizeInProgress && ! vTreatmentDryBicartDisconnect.drainInProgress - progressText : vTreatmentDryBicartDisconnect.drainInProgress ? qsTr("Draining Bicart...") : + progressText : vTreatmentDryBicartDisconnect.drainInProgress ? qsTr("Draining Cartridge...") : vTreatmentDryBicartDisconnect.depressurizeInProgress ? qsTr("Depressurizing...") : vTreatmentDryBicartDisconnect.progress >= vTreatmentDryBicartDisconnect.total && vTreatmentDryBicartDisconnect.total > 0 ? qsTr("Complete") : "" @@ -42,8 +42,6 @@ color : Colors.offWhite font.pixelSize : Fonts.fontPixelTextRectExtra font.weight : Font.Medium - text : qsTr("Disconnect your consumables per your clinic's instructions") + text : qsTr("Drain or depressurize dry bicarbonate cartridge per your clinic's instructions") } - - } Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -rfe26c932a53276a569d98cfcfbfc48b8a73af921 -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision fe26c932a53276a569d98cfcfbfc48b8a73af921) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -285,64 +285,69 @@ onPressed : resumeClicked() text.text : qsTr("Resume") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } TouchRect { id : _temporaryBreak visible : temporaryBreakVisible onPressed : temporaryBreakClicked() text.text : qsTr("Temporary Break") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } TouchRect { id : _rinsebackTouchRect visible : rinsebackVisible onPressed : rinsebackClicked() text.text : qsTr("Return Blood & End Treatment") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } TouchRect { id : _endTouchRect visible : endVisible onPressed : endClicked() text.text : qsTr("End Treatment Only") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } TouchRect { id : _okTouchRect visible : okVisible onPressed : okClicked() text.text : qsTr("OK") width : _buttonGroup.buttonsWidth - isDefault : vSettings.darkMode + isDefault : true backgroundColor: Colors.transparent fgColor : isPressed ? Colors.offWhite : _colorMode.modeAlarmButtonPressedColor selectColor : Qt.darker(borderColor, 1.15) pixelSize : Fonts.fontPixelNotification borderColor : _colorMode.modeAlarmButtonColor + textFont.weight: Font.Medium } } Index: sources/gui/qml/main.qml =================================================================== diff -u -r16aaf5ab7e1c58199754a132d624a470295d3440 -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/main.qml (.../main.qml) (revision 16aaf5ab7e1c58199754a132d624a470295d3440) +++ sources/gui/qml/main.qml (.../main.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -365,9 +365,9 @@ readonly property color modeAutoStepProgressColor : vSettings.darkMode ? Colors.borderButton : Colors.statusTextPaused readonly property color modeTextColor : vSettings.darkMode ? Colors.offWhite : Colors.backgroundMainMenu readonly property color modeButtonColor : vSettings.darkMode ? Colors.borderButton : Colors.backgroundMainMenu - readonly property color modeAlarmButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.lightModeSelect + readonly property color modeAlarmButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite readonly property color modeAlarmStepButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite - readonly property color modeAlarmButtonPressedColor : vSettings.darkMode ? Colors.offWhite : Colors.lightModeSelect + readonly property color modeAlarmButtonPressedColor : vSettings.darkMode ? Colors.offWhite : Colors.offWhite readonly property color modeAlarmListColor : vSettings.darkMode ? Colors.offWhite : Colors.alarmDialogText readonly property color modeAlarmStopStateColor : vSettings.darkMode ? Colors.darkModeAlarmStopState : Colors.lightModeAlarmStopState } Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -rbb2557d984b23c29426f452968ea797e6559ac3b -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision bb2557d984b23c29426f452968ea797e6559ac3b) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -65,7 +65,7 @@ } component ButtonStartRecirculate : TouchRect { - text.text : qsTr("Start Recirculation") + text.text : qsTr("Start Temporary Break") isDefault : true height : Variables.defaultButtonHeight onClicked : confirmDisconnectClicked() @@ -79,7 +79,7 @@ // Disconnect EndTreatmentBase { id: _recirculateDisconnect - headerTitle : qsTr("Recirculate Set Up") + headerTitle : qsTr("Temporary Break Set Up") instructionBased : true footer.children : [ ButtonEndTreatment {}, Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml =================================================================== diff -u -r45cc119e54711893ccc2b9d600412b8f51b7764f -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) +++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -10,7 +10,7 @@ import "qrc:/pages/endtreatment" EndTreatmentBase { id: _root - headerTitle : qsTr("Recirculate In Progress") + headerTitle : qsTr("Temporary Break In Progress") footer.anchors.bottomMargin: Variables.notificationHeight + Variables.defaultMargin readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown @@ -32,7 +32,7 @@ LabelUnitText { id: _timeElapsed objectName : "_timeElapsed" width : _infoRow.cellWidth - label : qsTr("Recirculation Time Elapsed:") + label : qsTr("Temporary Break Time Elapsed:") labelWeight : Font.Medium TimeText { id: _timeText objectName: "timeText" Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -r9c15c403ee00b776def3aaf8bfb32a3f8c6f2792 -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 9c15c403ee00b776def3aaf8bfb32a3f8c6f2792) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -43,6 +43,7 @@ _heparinRx.reset() vTreatmentCreate.ufPreWeight = vTreatmentRanges.weightDef vTreatmentCreate.ufEstimatedTargetWeight = vTreatmentRanges.weightDef + vTreatmentCreate.patientID = "" if ( _GuiView.dryDemoMode ) { vTreatmentCreate.hdfTreatmentModeSet = true Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r29f591c2ce9d6977f776a1b1925f7f492f217744 -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 29f591c2ce9d6977f776a1b1925f7f492f217744) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -309,7 +309,10 @@ Connections { target: vTDTreatmentStates // in-Treatmet function onTxBloodPrimeChanged ( vValue ) { page( _treatmentBloodPrime , vValue )} - function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )} + function onTxDialysisChanged ( vValue ) { page( _treatmentHome , _headerBar.headerMenuIndex === HeaderBar.Treatment && vValue ) + + print(" _headerBar.headerMenuIndex " + _headerBar.headerMenuIndex) + } function onTxEndChanged ( vValue ) { if ( vValue ) { _endTreatmentDialog.open() }} function onTxRinsebackChanged ( vValue ) { page( _endTreatmentRinsebackStack , vValue )} function onTxRecirculateChanged ( vValue ) { page( _endTreatmentRecirculateStack , vValue )} Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -rc1651f840faf3ed767fb19b76742b68401f96272 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision c1651f840faf3ed767fb19b76742b68401f96272) @@ -79,7 +79,7 @@ LabelUnitValueAdjuster { id: _systolicHighAlarmLimit width : _root.containerWidth - text : qsTr("Systolic BP Low Alarm Limit") + text : qsTr("Systolic BP High Alarm Limit") unitText : Variables.unitTextBloodPressure valid : ! vTreatmentAdjustmentVitalsAlarmLimits.systolicBpHighAlarmLimitRejectionReson minimum : vTreatmentRanges.systolicBloodPressureHighAlarmLimitMin