Index: leahi.pro
===================================================================
diff -u -r3454906bbb35aa2976572145068980bf691daf1c -r85ccb77b7343cb0ba133b6c13585e95a23ac237e
--- leahi.pro (.../leahi.pro) (revision 3454906bbb35aa2976572145068980bf691daf1c)
+++ leahi.pro (.../leahi.pro) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
@@ -295,6 +295,7 @@
sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
\ # ---------- Models - TD - Adjustment - In-Treatment
sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \
+ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \
\ # ---------- Models - TD - Adjustment - Settings
sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.h \
sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.h \
@@ -351,8 +352,6 @@
sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \
sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \
sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \
- \ # ---------- Models - HD - Adjustment - End-Treatment
- sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \
\ # ---------- Models - HD - Adjustment - Post-Treatment
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
@@ -645,6 +644,8 @@
\ # ---------- Models - TD - Adjustment - Pre-Treatment
sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
+ \ # ---------- Models - TD - Adjustment - In-Treatment
+ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
\ # ---------- Models - DD - Adjustment - Settings
sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \
\ # ---------- Models - HD - Adjustment
@@ -662,8 +663,6 @@
\ # ---------- Models - HD - Adjustment - In-Treatment
sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \
sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \
- \ # ---------- Models - HD - Adjustment - End-Treatment
- sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.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 -rdfb5f7070961fd2a34c2cb8d897ecc43c4f46598 -r85ccb77b7343cb0ba133b6c13585e95a23ac237e
--- leahi.qrc (.../leahi.qrc) (revision dfb5f7070961fd2a34c2cb8d897ecc43c4f46598)
+++ leahi.qrc (.../leahi.qrc) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
@@ -320,8 +320,9 @@
sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
-
-
+
+ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml
+
sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml
sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
Index: sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml
===================================================================
diff -u -r4da79084388ac25822ab24fb52ec1ca4083b50cc -r85ccb77b7343cb0ba133b6c13585e95a23ac237e
--- sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml (.../EndTreatmentBase.qml) (revision 4da79084388ac25822ab24fb52ec1ca4083b50cc)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml (.../EndTreatmentBase.qml) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
@@ -34,6 +34,12 @@
property string headerTitle : ""
property string descriptionText : ""
+ footer {
+ width : parent.width / 2
+ height : Variables.defaultButtonHeight
+ childrenWidth : Variables.defaultButtonWidth
+ }
+
onVisibleChanged: if ( visible ) { _root.updateModel() }
// update model for instruction based steps
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
===================================================================
diff -u -r1da0c41020664b642359f3cd5d58a2fdc36774a2 -r85ccb77b7343cb0ba133b6c13585e95a23ac237e
--- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 1da0c41020664b642359f3cd5d58a2fdc36774a2)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
@@ -20,6 +20,7 @@
// Qml imports
import "qrc:/globals"
import "qrc:/components"
+import "qrc:/pages/endtreatment/recirculate"
/*!
* \brief the end treatment recirculate stack screen
@@ -43,10 +44,6 @@
onTreatmentEndClicked : vTreatmentAdjustmentRecirculate.doTreatmentEnd () //84.3 ///< User requests to end treatment
onConfirmDisconnectClicked : vTreatmentAdjustmentRecirculate.doConfirmDisconnect () //84.4 ///< User confirms patient disconnected, lines shunted to begin re-circulation
- readonly property bool timeoutTotal : vTreatmentRecirculate .timeoutTotal
- readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown * 60
- readonly property bool treatmentTimeLeft : true // vTreatmentTime .time_IsLeft // regarding the conversation with Sean (04/23/2023).
-
onVisibleChanged: {
if (visible) {
_headerBar.titleText = stackView.currentItem.headerTitle ?? ""
@@ -64,58 +61,41 @@
}
component ButtonStartRecirculate : TouchRect {
- visible : treatmentTimeLeft
text.text : qsTr("Start Recirculation")
isDefault : true
height : Variables.defaultButtonHeight
onClicked : confirmDisconnectClicked()
}
- component ButtonResume : TouchRect {
+ component ButtonResume : TouchRect {
text.text : qsTr("Resume Treatment")
isDefault : true
height : Variables.defaultButtonHeight
}
- component RecirculateBase : EndTreatmentBase {
- property bool confirmVisible : false
-
- header.confirmVisible : confirmVisible
- instructionBased : true
- hasTimeout : timeoutTotal
- timeoutValue : timeoutCountdown
-
- footer {
- width : parent.width / 2
- height : Variables.defaultButtonHeight
- childrenWidth : Variables.defaultButtonWidth
- }
- }
-
// Disconnect
- RecirculateBase { id: _recirculateDisconnect
+ EndTreatmentBase { id: _recirculateDisconnect
headerTitle : qsTr("Recirculate Set Up")
- footer.children : [
+ instructionBased : true
+ footer.children : [
ButtonEndTreatment {},
ButtonStartRecirculate {}
-
]
}
// Recirculate
- RecirculateBase { id: _recirculateRecirculate
- headerTitle : qsTr("Recirculate In Progress")
- instructionBased : false
- footer.children : [
+ EndTreatmentRecirculateProgress { id: _recirculateProgress
+ footer.children : [
ButtonEndTreatment { textColor: Colors.offWhite },
ButtonResume { onClicked: reconnectClicked() } /// doReconnect
]
}
// Reconnect
- RecirculateBase { id: _recirculateReconnect
+ EndTreatmentBase { id: _recirculateReconnect
headerTitle : qsTr("Reconnect To Patient")
- footer.children : [
+ instructionBased : true
+ footer.children : [
ButtonEndTreatment { },
ButtonResume { onClicked: confirmReconnectClicked() } // /doConfirmReconnect
]
@@ -129,7 +109,7 @@
Connections { target: vTDTreatmentStates
function onRcDisconnectChanged ( vValue ) { page( _recirculateDisconnect , vValue )} // set up
- function onRcStartedChanged ( vValue ) { page( _recirculateRecirculate , vValue )} // in progress
+ function onRcStartedChanged ( vValue ) { page( _recirculateProgress , vValue )} // in progress
// function onRcStoppedChanged ( vValue ) { page( _recirculateStopped , vValue )} // complete
function onRcReconnectChanged ( vValue ) { page( _recirculateReconnect , vValue )} // disconnect
}
@@ -141,7 +121,7 @@
// so it's fine to set all at the same time
// and let them cleared for their own message when each get visible.
_recirculateDisconnect .reasonText = vTreatmentAdjustmentRecirculate.text();
- _recirculateRecirculate .reasonText = vTreatmentAdjustmentRecirculate.text();
+ _recirculateProgress .reasonText = vTreatmentAdjustmentRecirculate.text();
// _recirculateStopped .reasonText = vTreatmentAdjustmentRecirculate.text();
_recirculateReconnect .reasonText = vTreatmentAdjustmentRecirculate.text();
}
Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml
===================================================================
diff -u
--- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (revision 0)
+++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
@@ -0,0 +1,71 @@
+// Qt
+import QtQuick 2.12
+
+// Project
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+import "qrc:/pages/endtreatment"
+
+EndTreatmentBase { id: _root
+ headerTitle : qsTr("Recirculate In Progress")
+
+ readonly property bool timeoutTotal : vTreatmentRecirculate .timeoutTotal
+ readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown * 60
+ readonly property int bloodFlowRate : vTreatmentParametersSetPoint.bloodFlow
+ readonly property string recirculationImage : ""
+
+ Row { id: _infoRow
+ objectName: "_infoRow"
+
+ readonly property int cellWidth: _root.width / 3.5
+
+ anchors {
+ top : parent.top
+ topMargin : Variables.defaultMargin * 2
+ horizontalCenter: parent.horizontalCenter
+ }
+ spacing: Variables.defaultMargin * 2
+
+ LabelUnitText { id: _timeElapsed
+ objectName : "_timeElapsed"
+ width : _infoRow.cellWidth
+ label : qsTr("Recirculation Time Elapsed:")
+ TimeText { id: _timeText
+ objectName: "timeText"
+
+ anchors {
+ right : parent.right
+ rightMargin : Variables.defaultMargin * 2
+ verticalCenter : parent.verticalCenter
+ verticalCenterOffset: -2
+ }
+ seconds : _root.timeoutCountdown
+ textWeight : Font.Normal
+ textPixelSize : Fonts.fontPixelContainerTitle
+ secondsLeftMargin : 5
+ }
+ }
+
+ LabelUnitText { id: _bloodFlowRate
+ objectName : "_bloodFlowRate"
+ width : _infoRow.cellWidth
+ label : qsTr("Blood Flow Rate:")
+ unit : Variables.unitTextFlowRate
+ value : _root.bloodFlowRate.toFixed(Variables.bloodFlowPrecision)
+ }
+ }
+
+ Image { id: _image
+ anchors {
+ top : _infoRow.bottom
+ topMargin : Variables.defaultMargin * 2
+ horizontalCenter: parent.horizontalCenter
+ }
+ source: _root.recirculationImage
+ }
+
+
+}
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
===================================================================
diff -u -r1da0c41020664b642359f3cd5d58a2fdc36774a2 -r85ccb77b7343cb0ba133b6c13585e95a23ac237e
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 1da0c41020664b642359f3cd5d58a2fdc36774a2)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
@@ -37,7 +37,7 @@
hasTimeout : vTreatmentRinseback .timeoutTotal
timeoutValue : vTreatmentRinseback .timeoutCountDown * 60
- footer.children : [_beginRinsebackTouchRect]
+ footer.children : [ _beginRinsebackTouchRect ]
footer.childrenWidth: Variables.defaultButtonWidth
TouchRect { id : _beginRinsebackTouchRect