Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -r0d59385f134f65a19dace1e2b46eb2631924396e --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 0d59385f134f65a19dace1e2b46eb2631924396e) @@ -28,31 +28,39 @@ * which is the default screen in the "Manager" stack */ ScreenItem { id: _root - signal backClicked() - signal startClicked() + objectName: "_treatmentBegin" backgroundRect.color: Colors.backgroundMainMenu + signal clickedBack() + signal clickedStart() + TopMenuBarCreateTreatment { id: _topMenuBar anchors.top: parent.top anchors.left: parent.left width: parent.width - onBackClicked: { - _root.backClicked(); + onClickedBack: { + _root.clickedBack(); } state: "begin" } Flickable { id: _flickable + objectName: "_treatmentBeginFlickable" anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom width: parent.width contentWidth: parent.width contentHeight: _column.implicitHeight clip: true + flickDeceleration: Variables.createTreatmentFlickableDeceleration + function setInteractive(isInteractive) { + _flickable.interactive = isInteractive + } + ScrollBar.vertical: ScrollBar { id: _scrollBar anchors.right: _flickable.right anchors.rightMargin: 3 @@ -76,11 +84,32 @@ font.pixelSize: Fonts.fontPixelTitle } + SliderCreateTreatment { + id: _ultrafiltration + objectName: "_ultrafiltration" + sliderObjectName: objectName + "Slider" + selectedValueObjectName: objectName + "Value" + text: "Ultrafiltration Volume" + units: qsTr("mL") + min: vTreatmentBegin.ufVolumeMin + max: vTreatmentBegin.ufVolumeMax + step: vTreatmentBegin.ufVolumeRes + onPressed: { + _flickable.setInteractive(false) + vTreatmentBegin.ufVolume = value + } + onReleased: { + vTreatmentBegin.ufVolume = value + _flickable.setInteractive(true) + } + } + TouchRect { id : _continueRect + objectName: "_treatmentBeginStart" anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("START") button.onClicked: { - _root.startClicked() + _root.clickedStart() } } }