Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml =================================================================== diff -u -r6130b439bd2717a8a06d32f3f3baf09a1c56d27d -rb2844bc11b33db3c2c5845fa6728ab3d1472e4e8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision 6130b439bd2717a8a06d32f3f3baf09a1c56d27d) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision b2844bc11b33db3c2c5845fa6728ab3d1472e4e8) @@ -66,98 +66,98 @@ pushEnter : null pushExit : null } - } - TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart - visible: false - StackView.onActivating : { - _root.titleText = Qt.binding( - function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } - ) - _root.notificationText = "" + TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart + visible: false + StackView.onActivating : { + _root.titleText = Qt.binding( + function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } + ) + _root.notificationText = "" + } + onPauseClicked : { + // send pause to TD and wait. + // if accepted button changes, otherwise show error in notification + vTreatmentAdjustmentUltrafiltrationState.doPause() + } + onEditClicked : { + _treatmentAdjustmentUltrafiltrationEdit.reset() // reset the slider to minimum value position + _ufStack.stackView.push(_treatmentAdjustmentUltrafiltrationEdit) + } + onIsolatedUfClicked : { + console.log("Isolated UF clicked") + } + onResumeClicked : { + // send resume to TD and wait. + // if accepted button changes, otherwise show error in notification + vTreatmentAdjustmentUltrafiltrationState.doResume() + } } - onPauseClicked : { - // send pause to TD and wait. - // if accepted button changes, otherwise show error in notification - vTreatmentAdjustmentUltrafiltrationState.doPause() - } - onEditClicked : { - _treatmentAdjustmentUltrafiltrationEdit.reset() // reset the slider to minimum value position - _ufStack.stackView.push(_treatmentAdjustmentUltrafiltrationEdit) - } - onIsolatedUfClicked : { - console.log("Isolated UF clicked") - } - onResumeClicked : { - // send resume to TD and wait. - // if accepted button changes, otherwise show error in notification - vTreatmentAdjustmentUltrafiltrationState.doResume() - } - } - TreatmentAdjustmentUltrafiltrationEdit { id: _treatmentAdjustmentUltrafiltrationEdit - visible: false - StackView.onActivating : { - _root.titleText = Qt.binding( - function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } - ) - _root.notificationText = "" + TreatmentAdjustmentUltrafiltrationEdit { id: _treatmentAdjustmentUltrafiltrationEdit + visible: false + StackView.onActivating : { + _root.titleText = Qt.binding( + function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } + ) + _root.notificationText = "" + } + onContinueClicked : function(vVolume) { + // send Volume to TD and wait. + // if accepted moves to confirm screen, otherwise show error in notification + vTreatmentAdjustmentUltrafiltrationEdit.doAdjustment(vVolume) + } } - onContinueClicked : function(vVolume) { - // send Volume to TD and wait. - // if accepted moves to confirm screen, otherwise show error in notification - vTreatmentAdjustmentUltrafiltrationEdit.doAdjustment(vVolume) - } - } - TreatmentAdjustmentUltrafiltrationConfirm { id: _treatmentAdjustmentUltrafiltrationConfirm - visible: false - StackView.onActivating : { - _root.titleText = Qt.binding( - function() { return qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } - ) - _root.notificationText = "" + TreatmentAdjustmentUltrafiltrationConfirm { id: _treatmentAdjustmentUltrafiltrationConfirm + visible: false + StackView.onActivating : { + _root.titleText = Qt.binding( + function() { return qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } + ) + _root.notificationText = "" + } + onConfirmVolumeClicked : { + vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume) + } } - onConfirmVolumeClicked : { - vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume) - } - } - Connections { target: vTreatmentAdjustmentUltrafiltrationState - function onAdjustmentTriggered ( vValue ) { - if (_treatmentAdjustmentUltrafiltrationStart.StackView.status === StackView.Active) { - notification.text = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText + Connections { target: vTreatmentAdjustmentUltrafiltrationState + function onAdjustmentTriggered ( vValue ) { + if (_treatmentAdjustmentUltrafiltrationStart.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText + } } } - } - Connections { target: vTreatmentAdjustmentUltrafiltrationEdit - function onAdjustmentTriggered ( vValue ) { - if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) { - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vTreatmentAdjustmentUltrafiltrationEdit.volume - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = vTreatmentAdjustmentUltrafiltrationEdit.rate + Connections { target: vTreatmentAdjustmentUltrafiltrationEdit + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) { + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vTreatmentAdjustmentUltrafiltrationEdit.volume + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = vTreatmentAdjustmentUltrafiltrationEdit.rate - if (_treatmentAdjustmentUltrafiltrationEdit.StackView.status === StackView.Active) { - _ufStack.stackView.push(_treatmentAdjustmentUltrafiltrationConfirm) + if (_treatmentAdjustmentUltrafiltrationEdit.StackView.status === StackView.Active) { + _ufStack.stackView.push(_treatmentAdjustmentUltrafiltrationConfirm) + } } - } - else { - if (_treatmentAdjustmentUltrafiltrationEdit.StackView.status === StackView.Active) { - notification.text = vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText + else { + if (_treatmentAdjustmentUltrafiltrationEdit.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText + } } } } - } - Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm - function onAdjustmentTriggered ( vValue ) { - if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { - close() - } - else { - if (_treatmentAdjustmentUltrafiltrationConfirm.StackView.status === StackView.Active) { - notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText + Connections { target: vTreatmentAdjustmentUltrafiltrationConfirm + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { + close() } + else { + if (_treatmentAdjustmentUltrafiltrationConfirm.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText + } + } } } }