Index: leahi.qrc
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- leahi.qrc (.../leahi.qrc) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ leahi.qrc (.../leahi.qrc) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -105,7 +105,6 @@
resources/images/backspace.png
resources/images/Vitals.png
resources/images/Vitals_Red.png
- resources/images/Lock-disabled.png
resources/images/complete_check.png
Index: sources/gui/qml/components/TreatmentCompleteButton.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/components/TreatmentCompleteButton.qml (.../TreatmentCompleteButton.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/components/TreatmentCompleteButton.qml (.../TreatmentCompleteButton.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -21,13 +21,13 @@
SequentialAnimation on scale {
loops : Animation.Infinite
- running : true
+ running : _root.visible
NumberAnimation { from: 0.9; to: 1.1; duration: 1000; easing.type: Easing.InOutQuad }
}
SequentialAnimation on opacity {
loops : Animation.Infinite
- running : true
+ running : _root.visible
NumberAnimation { from: 1.0; to: 0.0; duration: 1000; easing.type: Easing.InOutQuad }
}
}
Index: sources/gui/qml/dialogs/ConfirmDialog.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -34,12 +34,9 @@
property alias cancelText : _cancelTouch.textString
property alias cancelVisible : _cancelTouch.visible
property bool autoClose : true
- property int messageTextVerticalOffset : Variables.defaultMargin * -3
+ property int messageTextVerticalOffset : Variables.defaultMargin * -3 // adjust text up to add more space from bottom buttons
property int footerBottomMargin : Variables.notificationHeight + Variables.minVGap
- height : Variables.smallDialogHeight
- width : Variables.smallDialogWidth
-
function footerUpdate() {
_footer.update()
}
@@ -71,7 +68,6 @@
TouchRect { id : _cancelTouch
textString : qsTr("Cancel")
height : Variables.defaultButtonHeight
- isDefault : true
text.font.pixelSize : Fonts.fontPixelConfirm
text.font.weight : Font.Medium
Index: sources/gui/qml/dialogs/EndTreatmentDialog.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/dialogs/EndTreatmentDialog.qml (.../EndTreatmentDialog.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/dialogs/EndTreatmentDialog.qml (.../EndTreatmentDialog.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -4,8 +4,8 @@
ConfirmDialog { id: _root
messageText : qsTr("Dialysis Treatment Complete!")
- confirmText : qsTr("Stay On Treatment")
- cancelText : qsTr("End Treatment")
+ confirmText : qsTr("End Treatment")
+ cancelText : qsTr("Stay On Treatment")
y : Math.round((Variables.applicationHeight - height) / 2) - Variables.headerHeight
width : 600
Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r4567cb1eb7c259b4f9abc6f8d86caea43ffcf971 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 4567cb1eb7c259b4f9abc6f8d86caea43ffcf971)
+++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -177,7 +177,7 @@
Connections { target: _endTreatmentDialog
// End Treatment -> proceed to rinceback
- function onRejected () {
+ function onAccepted () {
vTreatmentAdjustmentEnd.doAdjustment ()
}
}
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -49,12 +49,21 @@
childrenWidth : 300
anchors.fill : footer
children : [
+ TouchRect { id : _endTreatmentTouchRect
+ enabled : _root.instructionIsLast
+ visible : true //DEN-15722: SRSHD 1231: REmoved => vTreatmentTime .time_IsLeft
+ text.text : qsTr("END TREATMENT")
+ onClicked : treatmentEndClicked()
+ },
+
TouchRect { id : _beginRinsebackTouchRect
enabled : _root.instructionIsLast
visible : true
isDefault : true
text.text : qsTr("START RINSEBACK")
onClicked : rinsebackClicked()
+ },
+ Item { id: placeholder
}
]
}
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -65,7 +65,6 @@
width : (cellWidth * 2) - (Variables.defaultMargin * 2)
height : cellHeight
onClicked : sectionTimeClicked()
- editEnabled : ! isTreatmentEnd // LEAHI-PRS-376
}
TreatmentSaline { id: _treatmentSaline
@@ -106,12 +105,11 @@
objectName : "treatmentFlows"
width : cellWidth * 4
height : cellHeight
- header.editEnabled : ! isTreatmentEnd // LEAHI-PRS-376
- header.lockEnabled : ! isTreatmentEnd
-
+ header.setEditActive: ! isTreatmentEnd // LEAHI-PRS-376
+ editEnabled : ! _lockDialog.isLocked
onEditClicked : sectionFlowClicked()
onLockClicked : {
- _lockDialog.isLocked = editEnabled
+ _lockDialog.isLocked = editEnabled
_lockDialog.showDialog (
editEnabled ? qsTr("Treatment Parameters Unlocked") :
qsTr("Treatment Parameters Locked"),
Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -22,9 +22,9 @@
Rectangle { id: _root
property string title : ""
property bool editEnabled : true
- property bool lockEnabled : true
property bool showLock : false
property bool showEdit : true
+ property bool setEditActive : true // set to disable edit no matter what
signal editClicked
signal lockClicked
@@ -38,7 +38,7 @@
MouseArea { id: _mouseArea
anchors.fill : parent
- enabled : editEnabled
+ enabled : editEnabled && _root.setEditActive
onClicked : _root.editClicked()
}
@@ -63,10 +63,9 @@
right : _editButton.left
rightMargin : Variables.defaultMargin * 2
}
- enabled : lockEnabled
visible : showLock
- iconImageSource : lockEnabled ? editEnabled ? "qrc:/images/iUnlock" : "qrc:/images/iLock" : "qrc:/images/iLockDisabled"
+ iconImageSource : editEnabled ? "qrc:/images/iUnlock" : "qrc:/images/iLock"
onPressed : {
editEnabled = ! editEnabled
_root.lockClicked()
@@ -81,8 +80,8 @@
}
visible : showEdit
- enabled : editEnabled && lockEnabled
- 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/sections/TreatmentFlows.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -27,7 +27,7 @@
* \brief Treatment Screen Flows section
*/
TreatmentSection { id: _root
- property bool editEnabled : header.editEnabled
+ property bool editEnabled : true
header.title : qsTr("Treatment Parameters")
header.showLock : true
@@ -48,7 +48,7 @@
width : _row.cellWidth
value : Variables.notSetVariable(vTreatmentParametersSetPoint.bloodFlow.toFixed(Variables.bloodFlowPrecision))
unitText : Variables.unitTextFlowRate
- buttonsEnabled : isTreatmentEnd ? true : editEnabled // LEAHI-PRS-376
+ buttonsEnabled : editEnabled // LEAHI-PRS-376
onIncrement : print(" increment blood flow")
onDecrement : print(" decrement blood flow")
@@ -61,7 +61,7 @@
width : _row.cellWidth
value : vTreatmentParametersSetPoint.dialysateFlow.toFixed(Variables.dialysateFlowPrecision) // Need to show 0 value
unitText : Variables.unitTextFlowRate
- buttonsEnabled : editEnabled && ! isTreatmentEnd // LEAHI-PRS-376
+ buttonsEnabled : isTreatmentEnd ? false : editEnabled // LEAHI-PRS-376
extraText : vTreatmentParametersSetPoint.dialysateFlow === 0 ? qsTr("OFF") :
! vDDGenDialysate.isDialGood ? qsTr("Bypass") :
""
@@ -77,7 +77,7 @@
width : _row.cellWidth
value : Variables.notSetVariable(vTreatmentParametersSetPoint.dialysateTemp.toFixed(Variables.dialysateTempPrecision))
unitText : Variables.unitTextTemperature
- buttonsEnabled : editEnabled && ! isTreatmentEnd // LEAHI-PRS-376
+ buttonsEnabled : isTreatmentEnd ? false : editEnabled // LEAHI-PRS-376
onIncrement : print(" increment dial temp")
onDecrement : print(" decrement dial temp")
Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c)
@@ -40,7 +40,7 @@
property string notificationText: isComplete ? qsTr("Treatment Complete"):
! isRunning ? qsTr("Treatment Paused") :
""
- property alias editEnabled: _editTimeIcon.enabled
+ property bool editEnabled : ! isTreatmentEnd // LEAHI-PRS-376
color : "transparent"
width : _circle.width
@@ -62,7 +62,7 @@
MouseArea { id: _mouseArea
anchors.fill : parent
- onClicked : if ( editEnabled ) { _root.clicked() }
+ onClicked : if ( _root.editEnabled ) { _root.clicked() }
}
}
@@ -110,6 +110,7 @@
bottomMargin: Variables.defaultMargin
horizontalCenter: parent.horizontalCenter
}
+ enabled : _root.editEnabled
iconSize : 30
iconImageSource : enabled ? "qrc:/images/iEdit" : "qrc:/images/iEditDisabled"
onClicked : _root.clicked()