Index: leahi.qrc
===================================================================
diff -u -rf46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881 -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c
--- leahi.qrc (.../leahi.qrc) (revision f46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881)
+++ leahi.qrc (.../leahi.qrc) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
@@ -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
@@ -318,7 +319,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/qml/dialogs/ConfirmDialog.qml
===================================================================
diff -u -rec9c06478bddf4cadf546aa4a49bb18b224f3b50 -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c
--- sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
+++ sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
@@ -31,12 +31,16 @@
property alias messageText : _messageText.text
property alias confirmText : _confirmTouch.textString
property alias confirmVisible : _confirmTouch.visible
+ property bool isConfirmDefault : true
property alias cancelText : _cancelTouch.textString
property alias cancelVisible : _cancelTouch.visible
+ property bool additionalVisible: false
+ property string additionalText : ""
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
+ signal additionalButtonClicked()
height : Variables.smallDialogHeight
width : Variables.smallDialogWidth
@@ -84,10 +88,23 @@
anchors.margins : 0
anchors.top : undefined
anchors.right : undefined
+ isDefault : _root.isConfirmDefault
onClicked: {
accepted()
if ( autoClose ) close()
}
+ },
+ TouchRect { id : _additionalTouch
+ height : Variables.defaultButtonHeight
+ anchors.margins : 0
+ anchors.top : undefined
+ anchors.right : undefined
+ textString : _root.additionalText
+ visible : _root.additionalVisible
+ onClicked: {
+ additionalButtonClicked()
+ if ( autoClose ) close()
+ }
}
]
}
Index: sources/gui/qml/dialogs/RinsebackCompleteDialog.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/RinsebackCompleteDialog.qml (revision 0)
+++ sources/gui/qml/dialogs/RinsebackCompleteDialog.qml (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
@@ -0,0 +1,31 @@
+import QtQuick 2.12
+import "qrc:/globals"
+import "qrc:/components"
+
+ConfirmDialog { id: _root
+ messageText : qsTr("Blood Return Complete!")
+ confirmText : qsTr("Fluid Bolus")
+ cancelText : qsTr("End Treatment")
+ additionalText : qsTr("Recirculate")
+ additionalVisible : true
+ isConfirmDefault : false
+
+ width : Variables.completeDialogWidth
+ height : Variables.completeDialogHeight
+ backgroundColor : Colors.darkDialogColor
+ footerBottomMargin : Variables.defaultMargin * 3
+ messageTextVerticalOffset : Variables.defaultMargin * -1
+
+ Image { id : _iconImage
+ objectName: "iconImage"
+
+ anchors {
+ top : parent.top
+ topMargin : Variables.defaultMargin * 3
+ horizontalCenter: parent.horizontalCenter
+ }
+
+ fillMode: Image.PreserveAspectFit
+ source : "qrc:/images/iCompleteCheck"
+ }
+}
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r6d7a81af8acbaaf3ee3f722ccace021634507cb4 -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c
--- sources/gui/qml/main.qml (.../main.qml) (revision 6d7a81af8acbaaf3ee3f722ccace021634507cb4)
+++ sources/gui/qml/main.qml (.../main.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
@@ -409,6 +409,7 @@
WaterSampleDialog { id: _headerbarWaterSampleDialysate }
TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals }
EndTreatmentDialog { id: _endTreatmentDialog }
+ RinsebackCompleteDialog { id: _rinsebackCompleteDialog }
LockDialog { id: _lockDialog }
AlarmItem { id: _alarmItem ; z: 996 }
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
===================================================================
diff -u -r07fa2cd47bf538e89c48fc7d425674f20afc9f2a -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c
--- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 07fa2cd47bf538e89c48fc7d425674f20afc9f2a)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
@@ -35,7 +35,7 @@
onVisibleChanged: {
if (visible) {
- _headerBar.titleText = stackView.currentItem.headerTitle ?? ""
+// _headerBar.titleText = stackView.currentItem.headerTitle ?? ""
}
else {
_headerBar.titleText = ""
@@ -46,10 +46,9 @@
EndTreatmentRinsebackInit { id: _endTreatmentRinsebackInit }
EndTreatmentRinseback { id: _endTreatmentRinseback
StackView.onActivating : {
- _headerBar.titleText = qsTr("Rinseback")
+ _headerBar.titleText = qsTr("Returning Blood")
}
}
- EndTreatmentRinsebackComplete { id: _endTreatmentRinsebackComplete }
EndTreatmentAdditional { id: _endTreatmentAdditional }
EndTreatmentRinsebackReconnect { id: _endTreatmentRinsebackReconnect }
@@ -71,12 +70,13 @@
function onResumeClicked ( vValue ) { vTreatmentAdjustmentRinseback.doResume ()} //82.4
function onEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doEnd ()} //82.5
}
- Connections { target: _endTreatmentRinsebackComplete
- function onAdditionalClicked ( vValue ) { vTreatmentAdjustmentRinseback.doAdditional ()} //82.6
- function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9
- function onConfirmClicked ( vValue ) { vTreatmentAdjustmentRinseback.doConfirm ()} //82.7
- function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8
+
+ Connections { target: _rinsebackCompleteDialog
+ function onAccepted () { vTreatmentAdjustmentRinseback.doAdditional() } // Fluid Blus
+ function onRejected () { vTreatmentAdjustmentRinseback.doTreatmentEnd() } // End Treatment
+ function onAdditionalButtonClicked () { vTreatmentAdjustmentRinseback.doConfirm () } // Recirculate
}
+
Connections { target: _endTreatmentRinsebackReconnect
function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doResume ()} //82.4
function onConfirmClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9
@@ -87,7 +87,7 @@
function onRbInitChanged ( vValue ) { page( _endTreatmentRinsebackInit , vValue )}
function onRbRunChanged ( vValue ) { page( _endTreatmentRinseback , vValue )}
function onRbPausedChanged ( vValue ) { page( _endTreatmentRinseback , vValue )}
- function onRbStopChanged ( vValue ) { page( _endTreatmentRinsebackComplete , vValue )}
+ function onRbStopChanged ( vValue ) { print("stop" + vValue ) ;if ( vValue ) { _rinsebackCompleteDialog.open() }}
function onRbAdditionalChanged ( vValue ) { page( _endTreatmentAdditional , vValue )}
function onRbReconnectChanged ( vValue ) { page( _endTreatmentRinsebackReconnect , vValue )}
}
@@ -100,7 +100,6 @@
// and let them cleared for their own message when each get visible.
_endTreatmentRinsebackInit .reasonText = vTreatmentAdjustmentRinseback.text();
_endTreatmentRinseback .reasonText = vTreatmentAdjustmentRinseback.text();
- _endTreatmentRinsebackComplete .reasonText = vTreatmentAdjustmentRinseback.text();
_endTreatmentRinsebackReconnect .reasonText = vTreatmentAdjustmentRinseback.text();
}
}
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
===================================================================
diff -u -r726dc38cf98a8f0a827b2efeecfd32996d0eee90 -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision 726dc38cf98a8f0a827b2efeecfd32996d0eee90)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
@@ -30,7 +30,7 @@
EndTreatmentBase { id: _root
objectName : "_EndTreatmentRinseback"
- headerTitle : qsTr("Rinseback")
+ headerTitle : qsTr("Returning Blood")
signal pauseClicked ()
signal resumeClicked ()
@@ -112,10 +112,10 @@
TreatmentSection { id: _treatmentFlowRate
objectName : "_treatmentFlowRate"
anchors.verticalCenter : parent.verticalCenter
- width : _flowRateItem.childrenRect.width + (Variables.defaultMargin * 2) // margin x2 for look and feel
+ width : parent.width / 3
height : _treatmentPressures.height
header {
- title : qsTr("Rinseback Flow Rate")
+ title : qsTr("Blood Flow Rate")
showEdit : false
}
contentItem : Item { id: _flowRateItem
@@ -213,26 +213,12 @@
}
spacing: Variables.defaultMargin * 2
- TouchRect { id: _endButton
- objectName : "_endButton"
- width : Variables.defaultButtonWidth
- height : Variables.defaultButtonHeight
- text {
- text : qsTr("End Rinseback")
- font.weight : Font.Medium
- }
- isDefault : true
- enabled : true
-
- onClicked : { _root.endClicked() }
- }
-
TouchRect { id: _pauseResumeButton
objectName: "_pauseResumeButton"
width : Variables.defaultButtonWidth
height : Variables.defaultButtonHeight
text {
- text : vTDTreatmentStates.rbPaused ? qsTr("Resume Rinseback") : qsTr("Pause Rinseback")
+ text : vTDTreatmentStates.rbPaused ? qsTr("Resume") : qsTr("Pause")
font.weight : Font.Medium
}
isDefault : true
Fisheye: Tag bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c refers to a dead (removed) revision in file `sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml'.
Fisheye: No comparison available. Pass `N' to diff?