Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -62,6 +62,9 @@ color : Colors.highlightProgressBar onClicked : progressClicked() + + isRoundedEnds: _root.isRoundedEnds + hasBorder : _root.hasBorder } RangeMarker { id: _marker Index: sources/gui/qml/components/ProgressBarEx.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -48,5 +48,8 @@ maxText.visible: visible margin : 0 onClicked: extraClicked() + + isRoundedEnds: _root.isRoundedEnds + hasBorder : _root.hasBorder } } Index: sources/gui/qml/components/RangeBar.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -44,6 +44,9 @@ property bool lowerTextHorizontalCenter: true property bool upperTextHorizontalCenter: true + isRoundedEnds: false + hasBorder : false + RangeRect { id: _rangeRect color: "red" x : ((parent.width * (lowerBound - parent.minimum)) / (parent.maximum - parent.minimum)) @@ -61,6 +64,9 @@ minText.anchors.leftMargin : lowerTextHorizontalCenter ? -minText.width / 2 : 0 maxText.anchors.rightMargin : upperTextHorizontalCenter ? -maxText.width / 2 : 0 + isRoundedEnds : false + hasBorder : false + RangeMarker { id: _rangeMarkerLowerBound decimal : _root.decimal text.visible: false Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 828e0b187e2fa3f75d769938bede41ef34683493) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -300,9 +300,9 @@ lineTickMarkHeight: _rangeRect.height isTickMarkRound : _root.isTickMarksRound yDisplacement : _root.isTickMarksRound ? (-_rangeRect.height) : 0 + isDebugPrint: true } } - onDragged: { // Need to account for the extended touch areas setBound(vMouseEvent.x - _rangeRect.leftRightTouchMargin) Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 828e0b187e2fa3f75d769938bede41ef34683493) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -154,7 +154,7 @@ } function update(vValue) { - _root.value = vValue + _root.value = Number(vValue).toFixed(decimal) } function calculateValue(x, isSnappingToTicks) { Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 828e0b187e2fa3f75d769938bede41ef34683493) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -142,4 +142,5 @@ _slider.decrementValue(true) } } + } Index: sources/gui/qml/components/TickMarks.qml =================================================================== diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/components/TickMarks.qml (.../TickMarks.qml) (revision 828e0b187e2fa3f75d769938bede41ef34683493) +++ sources/gui/qml/components/TickMarks.qml (.../TickMarks.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -47,6 +47,8 @@ property bool textVisible : false property color textColor : Colors.textMain + property bool isDebugPrint: false + anchors.fill: parent Repeater { id : _repeater Index: sources/gui/qml/compounds/PressureRangeSlider.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -117,6 +117,9 @@ maximum : _root.maximum value : _root.value + isRoundedEnds: false + hasBorder : false + minText.visible : _root.lowerBound !== minimum maxText.visible : _root.upperBound !== maximum @@ -156,6 +159,9 @@ decimal : 1 bgColor : Colors.pressuresOutOfRaneBg + isRoundedEnds: false + hasBorder : false + minText { text : qsTr("LOW") font.bold: true Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 828e0b187e2fa3f75d769938bede41ef34683493) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -183,6 +183,7 @@ readonly property int bloodFlowMin : 100 // PRS 30 readonly property int bloodFlowMax : 500 // PRS 30 readonly property int bloodFlowResolution : 25 // PRS 30 + readonly property int bloodFlowPrecision : 0 // Dialysate flow rate readonly property int dialysateFlowResolution : 50 // PRS 345 Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 828e0b187e2fa3f75d769938bede41ef34683493) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -92,6 +92,8 @@ topMargin : 15 horizontalCenter: parent.horizontalCenter } + isRoundedEnds: false + hasBorder : false } WaitDone { id: _hdWaitdone Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -70,7 +70,6 @@ } isActive: false width : parent.width / 2 - height : 5 step : 0.100 stepSnap: true ticks : false @@ -82,4 +81,5 @@ maxText.font.pixelSize: Fonts.fontPixelFluidText onPressed: isActive = true } + } Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -52,7 +52,6 @@ step : 20 // no zero minimum : 20 // 1 maximum : 100 // 10 - height : 5 ticks : true unit : qsTr("%") onReleased : vDevice.brightness = _brightness.value @@ -85,7 +84,6 @@ step : 20 // no zero minimum : 20 // 1 maximum : 100 // 5 - height : 5 ticks : true unit : qsTr("%") onReleased : { @@ -141,7 +139,6 @@ step : 20 // no zero minimum : 20 // 1 maximum : 100 // 5 - height : 5 ticks : true unit : qsTr("%") } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -53,7 +53,6 @@ Slider { id : _durationSlider anchors.horizontalCenter: parent.horizontalCenter width : 880 - height : 5 minimum : vTreatmentRanges.treatmentRanges_Duration_Min // in Minutes maximum : vTreatmentRanges.treatmentRanges_Duration_Max // in Minutes step : Variables.durationResolution Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -96,9 +96,9 @@ Slider { id : _bloodFlowSlider anchors.verticalCenter: parent.verticalCenter width : 600 - height : 5 minimum : Variables.bloodFlowMin maximum : Variables.bloodFlowMax + decimal : Variables.bloodFlowPrecision unit : Variables.unitTextFlowRate step : Variables.bloodFlowResolution ticks : true @@ -124,7 +124,6 @@ Slider { id : _dialysateFlowSlider anchors.verticalCenter: parent.verticalCenter width : 600 - height : 5 minimum : vTreatmentRanges.treatmentRanges_Dialysate_Flow_Min maximum : vTreatmentRanges.treatmentRanges_Dialysate_Flow_Max unit : Variables.unitTextFlowRate Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -71,6 +71,9 @@ value : _private.val valueEx : _private.valAdjust progressEx.maxText.visible: false + + isRoundedEnds: false + hasBorder : false } Slider { id: _volumeSlider @@ -83,7 +86,6 @@ 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 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -60,6 +60,9 @@ maximum : _private.maximum value : _private.value valueEx : 0 + + isRoundedEnds: false + hasBorder : false } TouchRect { id: _editButton Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -60,6 +60,9 @@ maximum : _private.maximum value : _private.value valueEx : 0 + + isRoundedEnds: false + hasBorder : false } TouchRect { id: _pauseButton Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -126,6 +126,8 @@ maximum : _fluidTarget.value value : 0 decimal : _root.valueDecimal + isRoundedEnds: false + hasBorder: false } Text { id: _cumulativeText Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r7b4219600ec64c2860113225ced0b5fc839b8ad2 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) @@ -62,5 +62,8 @@ valueEx : 0 marker.color : isUFPaused ? "dimgray" : Colors.rangeMarker + + isRoundedEnds: false + hasBorder : false } }