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 }