Index: leahi.pro
===================================================================
diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- leahi.pro (.../leahi.pro) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601)
+++ leahi.pro (.../leahi.pro) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -243,6 +243,8 @@
sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h \
\ # ---------- Models - DD - Adjustment - Settings
sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \
+ \ # ---------- Models - TD - Adjustment - End-Treatment
+ sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \
\ # ---------- Models - confirm
sources/model/confirm/MDuetConfirmHDi.h \
\ # ---------- Models - POST
@@ -295,7 +297,6 @@
\ # ---------- Models - HD - Adjustment - End-Treatment
sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \
sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \
- sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h \
\ # ---------- Models - HD - Adjustment - Post-Treatment
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
@@ -558,6 +559,8 @@
sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
+ \ # ---------- Models - TD - Adjustment - End-Treatment
+ sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \
\ # ---------- Models - CONFIRM
sources/model/confirm/MDuetConfirmHDi.cpp \
\ # ---------- Models - POST
@@ -611,7 +614,6 @@
\ # ---------- Models - HD - Adjustment - End-Treatment
sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \
sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
- sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \
\ # ---------- Models - HD - Adjustment - Post-Treatment
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \
Index: leahi.qrc
===================================================================
diff -u -rd2c4e611703fcb97794975dbc28f9a030b84bbf0 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- leahi.qrc (.../leahi.qrc) (revision d2c4e611703fcb97794975dbc28f9a030b84bbf0)
+++ leahi.qrc (.../leahi.qrc) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -36,6 +36,7 @@
sources/gui/qml/dialogs/AlarmListDialog.qml
sources/gui/qml/dialogs/LockDialog.qml
sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml
+ sources/gui/qml/dialogs/EndTreatmentDialog.qml
sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml
@@ -106,6 +107,7 @@
resources/images/Vitals_Red.png
resources/images/check_green.png
resources/images/eye_closed.png
+ resources/images/complete_check.png
sources/gui/qml/components/MainMenu.qml
@@ -169,6 +171,7 @@
sources/gui/qml/components/PasswordRequirements.qml
sources/gui/qml/components/BaseSwitch.qml
sources/gui/qml/components/IdleTimer.qml
+ sources/gui/qml/components/TreatmentCompleteButton.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601)
+++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -405,10 +405,9 @@
* \param vData - Data model contains treatment end adjustment state.
* \return void
*/
-void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &)
{
QVariantList mData;
- mData += vData.requestedState;
onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData);
}
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -234,7 +234,7 @@
{Gui::GuiActionType::ID_AdjustRecirculateRsp , 2 * 4 }, // 2 parameters each 4bytes
// ---- Treatment End
- {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 1 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 0 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AdjustTreatmentEndRsp , 2 * 4 }, // 2 parameters each 4bytes
// ---- Post-Treatment
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r87be1a4b3a1d19c60b37908f1cba8e310799a963 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 87be1a4b3a1d19c60b37908f1cba8e310799a963)
+++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -258,7 +258,7 @@
// End-Treatment
case Gui::GuiActionType::ID_AdjustRinsebackReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData ); break;
case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData ); break;
- case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData ); break;
+ case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentEndRequestData ); break;
// Post-Treatment
case Gui::GuiActionType::ID_AdjustPatientDisconnectNotifyReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionNotifyRequestData ); break;
case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData ); break;
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r148844d868453927c9dd3f9c47e79d829c08d303 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 148844d868453927c9dd3f9c47e79d829c08d303)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -106,18 +106,18 @@
// Service Information
ID_AdjustServiceDatesReq = 0x8900, // 137
- ID_AdjustServiceDatesHDRsp = 0x8A00, // 138
- ID_AdjustServiceDatesDGRsp = 0x8C00, // 140
+ ID_AdjustServiceDatesHDRsp = 0x8A0F, // 138 //// ----- @CRAPIZED: had to change to avoid duplication
+ ID_AdjustServiceDatesDGRsp = 0x8C0F, // 140 //// ----- @CRAPIZED: had to change to avoid duplication
// HD/DG Usage Counter
ID_HDUsageInfoReq = 0xA000, // 160
- ID_HDUsageInfoRsp = 0x8B00, // 139
+ ID_HDUsageInfoRsp = 0x8B0F, // 139 //// ----- @CRAPIZED: had to change to avoid duplication
// RTC
- ID_AdjustHDDateTimeReq = 0x6D00, // 109
- ID_AdjustHDDateTimeRsp = 0x6E00, // 110
- ID_AdjustDGDateTimeReq = 0x6F00, // 111
- ID_AdjustDGDateTimeRsp = 0x7000, // 112
+ ID_AdjustTDDateTimeReq = 0x6C00, // 108
+ ID_AdjustTDDateTimeRsp = 0x6D00, // 109
+ ID_AdjustDDDateTimeReq = 0x6E00, // 110
+ ID_AdjustDDDateTimeRsp = 0x6F00, // 111
ID_HDRTCEpochData = 0x0A0F, // 10 //// ----- @CRAPIZED
// State Messages
@@ -136,7 +136,7 @@
ID_PressureOcclusion = 0x2400, // 36 //// ----- @LEAHIZED
ID_Saline = 0x3D00, // 61 //// ----- @LEAHIZED
ID_Ultrafiltration = 0x3E00, // 62 //// ----- @LEAHIZED
- ID_Heparin = 0x4D00, // 77
+ ID_Heparin = 0x8C00, // 140
ID_Rinseback = 0x5600, // 86
ID_Recirculate = 0x5A00, // 90
ID_BloodPrime = 0x5900, // 89
@@ -224,7 +224,7 @@
// HD Data Messages
ID_HDAccelerometerData = 0x3300, // 51
ID_HDSyringePumpData = 0x6900, // 105
- ID_HDBloodLeakData = 0x6C00, // 108
+ ID_HDBloodLeakData = 0x6C0F, // 108 //// ----- @CRAPIZED: had to change to avoid duplication
ID_TDAirBubbleData = 0x1E00, // 30 //// ----- @LEAHIZED
ID_TDAirPumpData = 0x2000, // 32 //// ----- @LEAHIZED
ID_TDAirTrapData = 0x2A00, // 42 //// ----- @LEAHIZED
@@ -252,8 +252,8 @@
ID_AdjustVitalsReq = 0x6300, // 99
ID_AdjustVitalsRsp = 0x6400, // 100
- ID_AdjustHeparinReq = 0x4B00, // 75
- ID_AdjustHeparinRsp = 0x4C00, // 76
+ ID_AdjustHeparinReq = 0x8A00, // 138
+ ID_AdjustHeparinRsp = 0x8B00, // 139
// Ultrafiltration
ID_AdjustUltrafiltrationStateReq = 0x4700, // 71 //// ----- @LEAHIZED
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -7,6 +7,10 @@
property alias menuHidden : _headerMenu.hidden
property alias headerMenuIndex : _headerMenu.index
+ property alias titleText : _title.text
+ property alias loggedUser : _loggedInUser.text
+ readonly property int currentScreen : _headerMenu.currentScreen
+ property alias statusColor : _headerMenu.statusColor
width : Variables.applicationWidth
height : Variables.headerHeight
@@ -36,13 +40,31 @@
}
}
+ Text { id: _loggedInUser
+ color : Colors.textMain
+ anchors.top : parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ horizontalAlignment : Text.AlignHCenter
+ verticalAlignment : Text.AlignVCenter
+ font.pixelSize : Fonts.fontHeaderbarUser
+ }
+
+ Text { id: _title
+ color : Colors.textMain
+ anchors.centerIn : parent
+ horizontalAlignment : Text.AlignHCenter
+ verticalAlignment : Text.AlignVCenter
+ font.pixelSize : Fonts.fontHeaderbarTitle
+ font.weight : Font.DemiBold
+
+ }
+
Item { id: _dateTimeItem
width : Variables.headerBarDateTimeWidth
anchors {
top : parent.top
left : parent.left
bottom : parent.bottom
- margins : 10
}
Column { id: _dateTimeColumn
@@ -54,8 +76,10 @@
height : parent.height * 3/5
horizontalAlignment : Text.AlignHCenter
verticalAlignment : Text.AlignVCenter
- text : vDateTime.time
- font.pixelSize: 40
+ text : vDateTime.time
+ font.pixelSize : Fonts.fontHeaderbarTime
+ font.weight : Font.DemiBold
+
}
Text { id: _dateText
@@ -65,7 +89,7 @@
horizontalAlignment : Text.AlignHCenter
verticalAlignment : Text.AlignVCenter
text : vDateTime.date
- font.pixelSize: 25
+ font.pixelSize: Fonts.fontHeaderbarDate
}
}
}
@@ -83,7 +107,7 @@
height : 15
width : _root.width / 5
text : vDateTime.timezone
- font.pixelSize: 14
+ font.pixelSize: Fonts.fontHeaderbarTimezone
}
MainMenu { id: _headerMenu
@@ -93,13 +117,12 @@
bottomMargin: hidden || disable ? height * -1 : 0
}
height : parent.height
- width : parent.width / 3
+ width : parent.width / 2 // gives the width of the headerbar menu
hidden : true
titlePixelSize : 32
backgroundColor : Colors.transparent
highlightHeight : 15
isMainTreatment : true
-
onHiddenChanged: { if (hidden) { index = 0 } }
}
Index: sources/gui/qml/dialogs/ConfirmDialog.qml
===================================================================
diff -u -r6e18f1d24b8cc3d84d26f46f36f73deb34e54371 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision 6e18f1d24b8cc3d84d26f46f36f73deb34e54371)
+++ sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -34,6 +34,8 @@
property alias cancelText : _cancelTouch.textString
property alias cancelVisible : _cancelTouch.visible
property bool autoClose : true
+ property int messageTextVerticalOffset : Variables.defaultMargin * -3 // adjust text up to add more space for bottom buttons
+ property int footerBottomMargin : Variables.notificationHeight + Variables.minVGap
height : Variables.smallDialogHeight
width : Variables.smallDialogWidth
@@ -53,7 +55,7 @@
TitleText { id: _messageText
anchors.centerIn : parent
- anchors.verticalCenterOffset: Variables.defaultMargin * -3 // adjust text up to add more space from bottom buttons
+ anchors.verticalCenterOffset: _root.messageTextVerticalOffset// adjust text up to add more space from bottom buttons
width : parent.width
height : Variables.mainMenuHeight * 4 // title + reason + 2*Gap
clip : true
@@ -62,12 +64,16 @@
Footer { id: _footer
anchors.horizontalCenter : parent.horizontalCenter
+ anchors.bottomMargin : _root.footerBottomMargin
childrenWidth: Variables.defaultButtonWidth
children: [
TouchRect { id : _cancelTouch
textString : qsTr("Cancel")
height : Variables.defaultButtonHeight
+ text.font.pixelSize : Fonts.fontPixelConfirm
+ text.font.weight : Font.Medium
+
onPressed : {
rejected()
if ( autoClose ) close()
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 93b7d7da5dea9e0392e139b59117eb0315d6c343)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -60,6 +60,7 @@
readonly property color alarmDialogGreyText : "#838080"
readonly property color dialogShadowColor : "#334E759C"
readonly property color dialogValueColor : "#3D8EEF"
+ readonly property color darkDialogColor : "#091E31"
readonly property color backgroundRangeRect : "#3e546e"
readonly property color highlightProgressBar : "#3d8eef"
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/gui/qml/main.qml (.../main.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/main.qml (.../main.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -75,6 +75,8 @@
import VTreatmentBloodPrime 0.1
import VTreatmentStop 0.1
import VTreatmentRanges 0.1
+import VTreatmentHeparin 0.1
+
// Pre-Treatment
import VPreTreatmentAdjustmentInitTreatment 0.1
import VDGFilterFlush 0.1
@@ -195,7 +197,7 @@
VTreatmentVitals { id: vTreatmentVitals
interval : vTreatmentCreate.bloodPressureMeasureInterval
canStartInterval: vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment
- enableBPCuff : true // TODO: PRS 343 update with enable/disable Integrated Blood Pressure Cuff
+ enableBPCuff : vSettings.integratedBPCuff
onCanStartIntervalChanged : {
if ( vTreatmentVitals.canStartInterval ) { vTreatmentVitals.doTimerStart() }
else { vTreatmentVitals.doTimerStop() }
@@ -225,6 +227,8 @@
VTreatmentRinseback { id: vTreatmentRinseback }
VTreatmentRecirculate { id: vTreatmentRecirculate }
VTreatmentStop { id: vTreatmentStop }
+ VTreatmentHeparin { id: vTreatmentHeparin }
+
// ---- DD
VDGDrainPump { id: vDGDrainPump }
VDDHeaters { id: vDDHeaters }
Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
===================================================================
diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 93b7d7da5dea9e0392e139b59117eb0315d6c343)
+++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -25,6 +25,7 @@
property bool showLock : false
property bool showEdit : true
property int titleLeftMargin: Variables.defaultMargin * 2
+ property bool setEditActive : true // set to disable edit no matter what
signal editClicked
signal lockClicked
@@ -38,7 +39,7 @@
MouseArea { id: _mouseArea
anchors.fill : parent
- enabled : editEnabled
+ enabled : editEnabled && _root.setEditActive
onClicked : _root.editClicked()
}
@@ -67,7 +68,7 @@
visible : showLock
iconImageSource : editEnabled ? "qrc:/images/iUnlock" : "qrc:/images/iLock"
onPressed : {
- editEnabled = !editEnabled
+ editEnabled = ! editEnabled
_root.lockClicked()
}
}
@@ -80,8 +81,8 @@
}
visible : showEdit
- enabled : editEnabled
- iconImageSource : editEnabled ? "qrc:/images/iEdit" : "qrc:/images/iEditDisabled"
+ enabled : editEnabled && _root.setEditActive
+ iconImageSource : enabled ? "qrc:/images/iEdit" : "qrc:/images/iEditDisabled"
onPressed : _root.editClicked()
}
}
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r3688682c11b882e4794445e8c8e31c797faa7042 -rec9c06478bddf4cadf546aa4a49bb18b224f3b50
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 3688682c11b882e4794445e8c8e31c797faa7042)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
@@ -47,11 +47,10 @@
stackView.initialItem : null
readonly property bool isTreatmentPaused : vTDTreatmentStates.txStop
-
readonly property bool isSBInProgress : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump )
+ readonly property bool isTreatmentEnd : vTDTreatmentStates.txEnd
+ property int headerMenuIndex : _headerBar.headerMenuIndex
- property int headerMenuIndex: _headerBar.headerMenuIndex
-
onHeaderMenuIndexChanged: {
switch( _headerBar.currentScreen ) {
case MainMenu.Treatment:
@@ -180,11 +179,12 @@
Connections { target: vTDTreatmentStates
// in-Treatmet
- function onTxBloodPrimeChanged ( vValue ) { page( _treatmentBloodPrime , vValue )}
- function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )}
+ function onTxBloodPrimeChanged ( vValue ) { page( _treatmentBloodPrime , vValue )}
+ function onTxDialysisChanged ( vValue ) { page( _treatmentHome , vValue )}
+ function onTxEndChanged ( vValue ) { if ( vValue ) { _endTreatmentDialog.open() }}
}
Connections { target: _mainHome
- function onStartTreatment ( vValue ) { page( _treatmentHome )}
+ function onStartTreatment ( vValue ) { page( _treatmentHome )}
}
}