Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r50a109da2a76b335793c2b95fa668733fb7df684 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file TreatmentAdjustmentUltrafiltrationEdit.qml - * \author (last) Behrouz NematiPour - * \date (last) 20-Aug-2020 - * \author (original) Behrouz NematiPour - * \date (original) 15-May-2020 + * \file TreatmentAdjustmentUltrafiltrationEdit.qml + * \author (last) Vy + * \date (last) 20-Mar-2023 + * \author (original) Behrouz NematiPour + * \date (original) 15-May-2020 * */ @@ -59,11 +59,12 @@ ProgressBarEx { id: _rangeProgressBar width : Variables.ultrafiltrationProgressbarWidth - height : Variables.progressbarHeight + height : Variables.ultraFiltrationProgressBarHeight anchors { - top: parent.top - topMargin: 250 - horizontalCenter: parent.horizontalCenter + top : parent.top + topMargin : 250 + right : parent.right + rightMargin : _volumeSliderArrows.width + Variables.sliderAdjustButtonSpacing*2 } decimal : _private.decimal minimum : _private.min // suppose to be always 0 // DEN-6022 // _private.maxAdjust => _private.min @@ -83,15 +84,14 @@ readonly property int minGapWidth: minPrgWidth > 0 ? (minGapValue * _rangeProgressBar.width) / minPrgWidth : 0 readonly property int maxGapWidth: maxPrgWidth > 0 ? (maxGapValue * _rangeProgressBar.width) / maxPrgWidth : 0 - height : 2 anchors { top: _rangeProgressBar.bottom topMargin: 50 } - bgColor: "#0c2135" x : _rangeProgressBar.x + minGapWidth + _rangeProgressBar.progressWidth width : _rangeProgressBar.width - maxGapWidth - minGapWidth - _rangeProgressBar.progressWidth + height : Variables.ultraFiltrationEditSliderHeight step : 0.100 stepSnap: true ticks : true @@ -100,9 +100,19 @@ maximum : _private.maxAdjust - maxGapValue } + SliderArrows{ id: _volumeSliderArrows + visible : true + anchors.verticalCenter : _volumeSlider.verticalCenter + anchors.right : parent.right + anchors.rightMargin : Variables.sliderAdjustButtonSpacing + + onIncrementValue : _volumeSlider.incrementValue(true) + onDecrementValue : _volumeSlider.decrementValue(true) + } + Text { id: _textVolume visible : true - color : "white" + color : Colors.textMain text : _private.valAdjust.toFixed(_private.decimal) font { pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentEditValue @@ -122,9 +132,7 @@ topMargin: 460 horizontalCenter: parent.horizontalCenter } - - backgroundColor: Colors.backgroundButtonSelect - + isDefault: true text { text: qsTr("NEXT") font.weight : Font .DemiBold