Index: denali.pro.user =================================================================== diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -r670f257c9b88d3e5506eccaad111bec914102a72 --- denali.pro.user (.../denali.pro.user) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) +++ denali.pro.user (.../denali.pro.user) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -r670f257c9b88d3e5506eccaad111bec914102a72 --- denali.qrc (.../denali.qrc) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ denali.qrc (.../denali.qrc) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -22,12 +22,16 @@ resources/images/Pause.png resources/images/Resume.png resources/images/PauseGray.png + resources/images/Clock-Minus.png + resources/images/Clock-Plus.png + resources/images/Wave-Minus.png + resources/images/Wave-Plus.png sources/gui/qml/components/MainMenu.qml sources/gui/qml/components/TouchRect.qml sources/gui/qml/components/TitleText.qml - sources/gui/qml/components/LogoD.qml + sources/gui/qml/components/ImageLogoD.qml sources/gui/qml/components/ScreenItem.qml sources/gui/qml/components/StackItem.qml sources/gui/qml/components/ModalDialog.qml @@ -53,6 +57,10 @@ sources/gui/qml/components/ConfirmButton.qml sources/gui/qml/components/TickMarks.qml sources/gui/qml/components/NotificationBar.qml + sources/gui/qml/components/UltrafiltrationButton.qml + sources/gui/qml/components/ImageWave.qml + sources/gui/qml/components/ImageClock.qml + sources/gui/qml/components/ImageLogoDDarkTransparent.qml qtquickcontrols2.conf @@ -86,5 +94,6 @@ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml + sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml Index: resources/images/Clock-Minus.png =================================================================== diff -u Binary files differ Index: resources/images/Clock-Plus.png =================================================================== diff -u Binary files differ Index: resources/images/Wave-Minus.png =================================================================== diff -u Binary files differ Index: resources/images/Wave-Plus.png =================================================================== diff -u Binary files differ Index: sources/gui/qml/components/ImageClock.qml =================================================================== diff -u --- sources/gui/qml/components/ImageClock.qml (revision 0) +++ sources/gui/qml/components/ImageClock.qml (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -0,0 +1,46 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ImageClock.qml + * \date 2020/05/17 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" + +/*! + * \brief Encapsulated Wave image in a qml file + */ +Item { id : _root + property bool isIncrease: true + property real scale : 0.5 + + width : 118 * scale // constant image size + height : 112 * scale // constant image size + clip : false + anchors { + right : parent.right + bottom : parent.bottom + margins : 28 + } + + Image { id: _image + anchors.fill: parent + width : parent.width + height: parent.height + source: isIncrease + ? "qrc:/images/iClock+" + : "qrc:/images/iClock-" + } +} Index: sources/gui/qml/components/ImageLogoD.qml =================================================================== diff -u --- sources/gui/qml/components/ImageLogoD.qml (revision 0) +++ sources/gui/qml/components/ImageLogoD.qml (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -0,0 +1,39 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file LogoD.qml + * \date 2019/10/18 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" + +/*! + * \brief Denali project simple logo (No 'Diality') + */ +Item { id : _root + height : Variables.headerHeight + anchors { + top : parent.top + left : parent.left + right : parent.right + } + + Image { id: _image + anchors.centerIn: parent + width : Variables.logoWidth + height: Variables.logoHeight + source: "qrc:/images/iLogoD" + } +} Index: sources/gui/qml/components/ImageLogoDDarkTransparent.qml =================================================================== diff -u --- sources/gui/qml/components/ImageLogoDDarkTransparent.qml (revision 0) +++ sources/gui/qml/components/ImageLogoDDarkTransparent.qml (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -0,0 +1,35 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ImageLogoDDT.qml + * \date 2020/05/17 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" + +/*! + * \brief Denali project simple logo (No 'Diality') + * Dark Transparent + */ +Item { id : _root + height : Variables.headerHeight + + Image { id: _image + anchors.centerIn: parent + width : Variables.logoWidth + height: Variables.logoHeight + source: "qrc:/images/iLogoDDT" + } +} Index: sources/gui/qml/components/ImageWave.qml =================================================================== diff -u --- sources/gui/qml/components/ImageWave.qml (revision 0) +++ sources/gui/qml/components/ImageWave.qml (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -0,0 +1,47 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ImageWave.qml + * \date 2020/05/15 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" + +/*! + * \brief Encapsulated Wave image in a qml file + */ +Item { id : _root + property bool isIncrease: true + property real scale: 0.5 + + width : 136 * scale // constant image size + height : 90 * scale // constant image size + clip : false + + anchors { + right : parent.right + bottom : parent.bottom + margins : 28 + } + + Image { id: _image + anchors.fill: parent + width : parent.width + height: parent.height + source: isIncrease + ? "qrc:/images/iWave+" + : "qrc:/images/iWave-" + } +} Fisheye: Tag 670f257c9b88d3e5506eccaad111bec914102a72 refers to a dead (removed) revision in file `sources/gui/qml/components/LogoD.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -81,12 +81,9 @@ anchors.fill: parent } - Image { id: _image + ImageLogoDDT { id: _image visible: hasLogo anchors.centerIn: parent - width : Variables.logoWidth - height: Variables.logoHeight - source: "qrc:/images/iLogoDDT" } // normal texts with highlighter bottom ribon. Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -23,19 +23,21 @@ * \brief Denali project ProgressBar */ RangeRect { id: _root - signal progressClicked() - property alias value : _progressRect.value + property int progressWidth : _progressRect.width + property alias value : _progressRect.value - property alias color : _progressRect.color - property alias bgColor : _root.color + property alias color : _progressRect.color + property alias bgColor : _root.color - property alias marker : _marker - property alias markerHeight: _marker.height + property alias marker : _marker + property alias markerHeight : _marker.height - property alias minimum : _root.minimum - property alias maximum : _root.maximum + property alias minimum : _root.minimum + property alias maximum : _root.maximum + signal progressClicked() + height : Variables.progressbarHeight minimum : 0 Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r9ec7a27375189ad75f0bef142cd6beb386db0955 -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 9ec7a27375189ad75f0bef142cd6beb386db0955) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -131,10 +131,10 @@ width : diameter height : diameter radius : diameter - color : "white" + color : Colors.highlightProgressBar border { width: 4 - color: Colors.highlightProgressBar + color: "white" } } } Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -r45617764a63d5573bfb942b039f2854ed25ba15d -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -60,9 +60,11 @@ if (disabled) { text.color = Colors.textDisableButton border.color = Colors.borderDisableButton + color = "Transparent" } else { text.color = textColor border.color = borderColor + color = backgroundColor } } Index: sources/gui/qml/components/UltrafiltrationButton.qml =================================================================== diff -u --- sources/gui/qml/components/UltrafiltrationButton.qml (revision 0) +++ sources/gui/qml/components/UltrafiltrationButton.qml (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -0,0 +1,100 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file UltrafiltrationButton.qml + * \date 2020/05/15 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +import QtGraphicalEffects 1.0 + +// Project + +// Qml imports +import "qrc:/globals" + +/*! + * \brief UltrafiltrationButton.qml is the option button + * to choose the method to adjust the treatment ultrafiltration + */ +Rectangle { id: _root + enum ButtonType { + UltrafiltrationRate , + TreatmentDuration + } + + property string title : "" + property string description : "" + property color textColor : "white" + property int buttonType : UltrafiltrationButton.ButtonType.UltrafiltrationRate + property bool isIncrease : true + property bool selected : false + property bool disabled : false + + signal clicked() + + width : Variables.ultrafiltrationAdjustmtenOptionWidth + height : Variables.ultrafiltrationAdjustmtenOptionHeight + clip : true + + color : disabled ? "transparent" : Colors.backgroundUltrafiltrationButton + radius : 12 + border { + width: 2 + color: selected ? Colors.borderButton : "Transparent" + } + + Text { id: _title + text: _root.title.arg(isIncrease ? "Increase" : "Decrease") + font.pixelSize: 35 + font.weight: Font.DemiBold + color: disabled ? Colors.textDisableButton : textColor + anchors { + top : parent.top + topMargin : 25 + left : parent.left + leftMargin: 35 + } + } + + Text { id: _description + text: _root.description.arg(isIncrease ? "increases" : "decreases") + font.pixelSize: 26 + color: disabled ? Colors.textDisableButton : textColor + anchors { + top : parent.top + topMargin : 85 + left : parent.left + leftMargin: 35 + } + } + + ImageWave { id: _diffImageWave + visible : buttonType === UltrafiltrationButton.ButtonType.UltrafiltrationRate + isIncrease : true + } + + ImageClock { id: _diffImageClock + visible : buttonType === UltrafiltrationButton.ButtonType.TreatmentDuration + isIncrease : true + } + + MouseArea { id: _mouseArea + anchors.fill: parent + onClicked: { + if (! disabled) { + _root.clicked() + } + } + + } + +} Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r45617764a63d5573bfb942b039f2854ed25ba15d -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -31,6 +31,9 @@ readonly property color backgroundDottedMenu : "#64809D" readonly property color backgroundSlider : "#195187" + readonly property color backgroundUltrafiltrationButton : "#31568F" + + readonly property color backgroundRangeRect : "#3e546e" readonly property color highlightProgressBar : "#3d8eef" readonly property color highlightMedProgressBar : "#1b2b3e" Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -55,9 +55,12 @@ - readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : 26 - readonly property int fontPixelUltrafiltrationAdjustmentResumeButton: 30 - readonly property int fontPixelUltrafiltrationAdjustmentEditButton : 30 - readonly property int fontPixelUltrafiltrationAdjustmentNextButton : 26 + readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : 26 + readonly property int fontPixelUltrafiltrationAdjustmentResumeButton : 30 + readonly property int fontPixelUltrafiltrationAdjustmentEditButton : 30 + readonly property int fontPixelUltrafiltrationAdjustmentNextButton : 26 + readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : 26 + readonly property int fontPixelUltrafiltrationAdjustmentConfirmTitle : 40 + } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -79,4 +79,6 @@ readonly property int durationResolution : 15 // PRS346 readonly property int ultrafiltrationProgressbarWidth : 880 + readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 + readonly property int ultrafiltrationAdjustmtenOptionHeight: 275 } Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -34,7 +34,7 @@ signal treatmentCreated() // 2 - Header - LogoD { id: _headerLogo } + ImageLogoD { id: _headerLogo } // Definitions Column { Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -110,6 +110,17 @@ _treatmentAdjustmentUltrafiltrationPaused.open() } onNextClicked : { + close() + _treatmentAdjustmentUltrafiltrationConfirm.open() + } + } + + TreatmentAdjustmentUltrafiltrationConfirm { id: _treatmentAdjustmentUltrafiltrationConfirm + onBackClicked : { + close() + _treatmentAdjustmentUltrafiltrationEdit.open() + } + onConfirmClicked : { // Navigate to Ultrafiltration confirm dialog close() } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (revision 0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -0,0 +1,111 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file TreatmentAdjustmentUltrafiltrationConfirm.qml + * \date 2020/05/15 + * \author Behrouz NematiPour + * + */ + +// Qt +import QtQuick 2.12 +//import QtGraphicalEffects 1.0 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief TreatmentAdjustmentUltrafiltrationEdit.qml is the screen + * To adjust the treatment ultrafiltration + */ +TreatmentAdjustmentBase { id: _root + + closeVisible : false + confirmVisible : false + backVisible : true + + titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") + notification { + text: qsTr("Ultrafiltration is paused.") + imageSource: "qrc:/images/iPauseGray" + } + + TitleText { id : _titleText + text: qsTr("To confirm new UF Volume (%1),\nselect a treatment adjustment:").arg(5200) + font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentConfirmTitle + color: Colors.textMain + height: Variables.mainMenuHeight + anchors { + top: parent.top + topMargin: 100 + horizontalCenter: parent.horizontalCenter + } + } + + TouchRect { id: _confirmButton + width : 530 + height : 70 + anchors { + bottom: parent.bottom + bottomMargin: 85 + horizontalCenter: parent.horizontalCenter + } + + backgroundColor: Colors.backgroundButtonSelect + disabled: !(_rateAdjustmentButton.selected || _durationAdjustmentButton.selected) + text { + text: qsTr("CONFIRM") + font.weight: Font.DemiBold + font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentConfirmButton + } + onClicked: confirmClicked() + } + + Row { + spacing: 20 + anchors { + top: parent.top + topMargin: 205 + horizontalCenter: parent.horizontalCenter + } + UltrafiltrationButton { id: _rateAdjustmentButton + title : qsTr("%1 UF Rate") + description : qsTr("The rate %1, so the treatment\nduration remains the same.") + buttonType : UltrafiltrationButton.ButtonType.UltrafiltrationRate + isIncrease : true + onClicked : { + _durationAdjustmentButton.selected = false + selected = true + } + } + + UltrafiltrationButton { id: _durationAdjustmentButton + title : qsTr("%1 Treatment Duration") + description : qsTr("Rate remains, but treatment\nduration %2 by %1 minutes.").arg(30) + buttonType: UltrafiltrationButton.ButtonType.TreatmentDuration + isIncrease: false + onClicked : { + _rateAdjustmentButton.selected = false + selected = true + } + disabled: true + } + } + + onConfirmClicked: { + _durationAdjustmentButton.selected = false + _rateAdjustmentButton.selected = false + } + onBackClicked: { + _durationAdjustmentButton.selected = false + _rateAdjustmentButton.selected = false + } +} Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -r670f257c9b88d3e5506eccaad111bec914102a72 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) @@ -58,16 +58,25 @@ } Slider { id: _adjustmentSlider - width : Variables.ultrafiltrationProgressbarWidth / 2 + // TODO : These two values shall get from a model + // TEST : These two values shall get from a model + property int minGapValue: 500 + property int maxGapValue: 500 + + readonly property int minGapWidth: (minGapValue * _rangeProgressBar.width) / (_rangeProgressBar.maximum - _rangeProgressBar.minimum) + readonly property int maxGapWidth: (maxGapValue * _rangeProgressBar.width) / (_rangeProgressBar.maximum - _rangeProgressBar.minimum) + height : 2 anchors { top: _rangeProgressBar.bottom topMargin: 50 - right: _rangeProgressBar.right } bgColor: "#0c2135" - minimum: 4000 - maximum: 8000 + + width : _rangeProgressBar.width - _rangeProgressBar.progressWidth - ( maxGapWidth + minGapWidth ) + x : _rangeProgressBar.x + _rangeProgressBar.progressWidth + minGapWidth + minimum : _rangeProgressBar.value + minGapValue + maximum : _rangeProgressBar.maximum - minGapValue } TouchRect { id: _nextButton