Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -r679f72813050ba2ca4d9161746ef3a219b562a1c --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 679f72813050ba2ca4d9161746ef3a219b562a1c) @@ -34,7 +34,7 @@ visible : _text.text height : Variables.notificationHeight color : Colors.textNotificationNoneBg - //radius : Variables.dialogRadius + radius : 5 anchors { bottom : parent.bottom left : parent.left Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r679f72813050ba2ca4d9161746ef3a219b562a1c --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 679f72813050ba2ca4d9161746ef3a219b562a1c) @@ -48,7 +48,7 @@ readonly property int touchRectHeight : 85 //K:D //70 readonly property int touchRectRadius : 45 - readonly property int titleBottomPadding : 25 + readonly property int titleBottomPadding : 25 readonly property int columnSpacing : 25 //K:D //20 Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r28f3f8dd18981262995386d29d3c2ab31418bfc4 -r679f72813050ba2ca4d9161746ef3a219b562a1c --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 28f3f8dd18981262995386d29d3c2ab31418bfc4) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 679f72813050ba2ca4d9161746ef3a219b562a1c) @@ -15,8 +15,6 @@ // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Layouts 1.12 // Project // Qml imports @@ -30,22 +28,23 @@ ScreenItem { id: _root objectName: "_treatmentBegin" - signal clickedBack() - signal clickedStart() + property alias ufVolume : _volumeSlider.value + property alias reasonText : _notification.text + signal backClicked () + signal startClicked() + QtObject { id: _private - property int decimal : 3 property real minimum : 0.000 property real maximum : 8.000 - property real value : _volumeSlider.value } TopMenuBarCreateTreatment { id: _topMenuBar anchors.top: parent.top anchors.left: parent.left width: parent.width onClickedBack: { - _root.clickedBack(); + _root.backClicked(); } state: "begin" } @@ -79,7 +78,7 @@ Text { id: _textValue visible : true color : "white" - text : _private.value.toFixed(_private.decimal) + text : _root.ufVolume.toFixed(vTreatmentUltrafiltration.precision) font { pixelSize : Fonts.createTreatmentFontSize } @@ -103,7 +102,7 @@ stepSnap: true ticks : false diameter: Variables.sliderCircleDiameter - decimal : _private.decimal + decimal : vTreatmentUltrafiltration.precision minimum : _private.minimum maximum : _private.maximum minText.font.pixelSize: Fonts.fontPixelFluidText @@ -128,11 +127,16 @@ font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentButton } onClicked: { - clickedStart(vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_volumeSlider.value)) + _root.startClicked() } } + NotificationBar { id: _notification + iconVisible: false + } + onVisibleChanged: { + _notification.text = "" if (visible) { _mainMenu.hidden = true } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r679f72813050ba2ca4d9161746ef3a219b562a1c --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 679f72813050ba2ca4d9161746ef3a219b562a1c) @@ -128,8 +128,8 @@ } TreatmentBegin { id: _treatmentBegin - onClickedBack : {vTreatmentCreate.doRequestPop() } - onClickedStart : {vTreatmentCreate.doStartTreatment(); } + onBackClicked : {vTreatmentCreate.doRequestPop() } + onStartClicked : {vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_treatmentBegin.volume) } } //// Treatment Adjustment Dialogs @@ -233,6 +233,21 @@ } } + Connections { target: vTreatmentAdjustmentUltrafiltrationInit + onAdjustmentTriggered : { + // the maximum ultrafiltration volume has to be set/revert regardless + vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationInit.volume + _treatmentBegin.ufVolume = vTreatmentAdjustmentUltrafiltrationInit.volume + // but only if it has been accepted it will navigate + if (vTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted) { + vTreatmentCreate.doStartTreatment() + } + else { + _treatmentBegin.reasonText = vTreatmentAdjustmentUltrafiltrationInit.text() + } + } + } + Connections { target: vTreatmentAdjustmentUltrafiltrationState onAdjustmentTriggered : { if ( vTreatmentAdjustmentUltrafiltrationState.adjustment_Accepted ) {