Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -rf46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision f46bc6ffce5eb0ac3e1bbd5a9b8ee9202209c881) @@ -41,8 +41,8 @@ signal sectionTimeClicked() signal sectionUltrafiltrationClicked() - readonly property int cellWidth : (_root.width / 7) - 10 // = screen width / # columns - readonly property int cellHeight: (Variables.screenContentHeight / 2) - Variables.notificationHeight // = screen height / # rows - headerbar + readonly property int cellWidth : Variables.treatmentCellWidth + readonly property int cellHeight: Variables.treatmentCellHeight Column { id: _column objectName: "column" @@ -99,6 +99,7 @@ objectName : "treatmentUltrafiltration" width : cellWidth * 3 height : cellHeight + header.setEditActive: ! isTreatmentEnd // LEAHI-PRS-376 onEditClicked : sectionUltrafiltrationClicked() } @@ -128,70 +129,75 @@ height : 60 visible : ! _alarmBar.visible && text - property int source: -1 - - onTextChanged: { - if (text === "") { - source = -1 - } - } - CloseButton { id: _dismissButton objectName: "_dismissButton" anchors { - top: parent.top - bottom: parent.bottom - right: parent.right - margins: 20 + top : parent.top + bottom : parent.bottom + right : parent.right + margins : 20 } - width: height - visible: true - onClicked: { _notification.text = "" } + width : height + visible : true + onClicked : { _notification.text = "" } } } Connections { target: vTreatmentAdjustmentBloodFlowRate function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentBloodFlowRate.adjustment_Accepted) { - if (_notification.source === 0) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentBloodFlowRate.text() - _notification.source = 0 } } } Connections { target: vTreatmentAdjustmentDialysateFlowRate function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentDialysateFlowRate.adjustment_Accepted) { - if (_notification.source === 1) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentDialysateFlowRate.text() - _notification.source = 1 } } } Connections { target: vTreatmentAdjustmentDialysateTemperature function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentDialysateTemperature.adjustment_Accepted) { - if (_notification.source === 2) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentDialysateTemperature.text() - _notification.source = 2 } } } + Connections { target: vTreatmentAdjustmentPressuresWidening + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentPressuresWidening.adjustment_Accepted) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentPressuresWidening.text() + } + } + } + + Connections { target: vTreatmentAdjustmentSaline + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentSaline.adjustment_Accepted) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentSaline.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true