Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -r9ac163d4aeadc39a1bcd1d8110991f32e37fc806 -raac9d5d70abbd8d75c6e3782722e5daaf7355153 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 9ac163d4aeadc39a1bcd1d8110991f32e37fc806) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision aac9d5d70abbd8d75c6e3782722e5daaf7355153) @@ -67,8 +67,10 @@ property bool maxAdjusted : false ///< first time user adjustment happens property bool hasAdjust : false ///< if set to true then component is grayed out until both min and max are adjusted - property bool showTickmarks : true ///< Indicate whether tickMarks should be shown - property bool isTickMarksRound : true ///< Indicate whether the tickmakrs are round + property bool showTickmarks : true ///< Indicate whether tickMarks should be shown + property bool isTickMarksRound : true ///< Indicate whether the tickmarks are round + property bool isTickMarksCentered : false ///< Indicate whether the tickmarks are centered in the slider body + property int tickMarkYDisplacement : (-diameter + Variables.progressbarHandlerBorderWidth*2) ///< The amount of y displacement if the TickMarks are not centered property bool isRoundedEnds : true property bool hasBorder : true @@ -254,11 +256,11 @@ minText { visible: false - anchors.topMargin: -40 + anchors.topMargin: -60 } maxText { visible: false - anchors.topMargin: -40 + anchors.topMargin: -60 } // propagation is not working on drag ! @@ -297,8 +299,14 @@ textColor : _root.color lineTickMarkHeight: _rangeRect.height isTickMarkRound : _root.isTickMarksRound - yDisplacement : _root.border.width/2 - 1 // had to subtract 1 to center on the _rangeRect - showEndMarks : false + yDisplacement : { + if ( _root.isTickMarksCentered ) { + return (_root.border.width/2 - 1) // had to subtract 1 to center on the _rangeRect + } else { + return _root.tickMarkYDisplacement + } + } + showEndMarks : true color: _root.isActive ? Colors.borderButton : Colors.borderDisableButton } } @@ -336,7 +344,7 @@ /// Left most handler Rectangle { id: _handlerLeft - property real diameter : _root.diameter + property real diameter : _root.diameter anchors.verticalCenter : parent.verticalCenter anchors.horizontalCenter: _rangeRect.left @@ -346,7 +354,7 @@ radius : diameter color : Colors.highlightProgressBar border { - width : 4 + width : Variables.progressbarHandlerBorderWidth color : Colors.textMain } MouseArea { id: _leftHandleMouseArea @@ -376,7 +384,7 @@ radius : diameter color : Colors.highlightProgressBar border { - width : 4 + width : Variables.progressbarHandlerBorderWidth color : Colors.textMain } MouseArea { id: _rightHandlerMouseArea Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000 -raac9d5d70abbd8d75c6e3782722e5daaf7355153 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision aac9d5d70abbd8d75c6e3782722e5daaf7355153) @@ -113,7 +113,7 @@ anchors.bottom : parent.bottom width : Variables.createTreatmentSliderWidth height : Variables.sliderDefaultBodyHeight - diameter : Variables.sliderCircleDiameter + diameter : Variables.progressbarHandler touchMargin : Variables.createTreatmentSliderMargin handlerColor : Colors.createTreatmentInactive handlerVisible : _root.adjustable Index: sources/gui/qml/compounds/PressureRangeSlider.qml =================================================================== diff -u -r3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000 -raac9d5d70abbd8d75c6e3782722e5daaf7355153 --- sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000) +++ sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision aac9d5d70abbd8d75c6e3782722e5daaf7355153) @@ -67,7 +67,7 @@ property real step : 10 ///< minimum space/movement between each range slider values property int limitGap : 0 ///< the closest the two of lowerBound and upperBound can get. - property bool ticksVisible : false ///< hide or show the tick marks help of the step + property alias ticksVisible : _pressureSlider.ticks ///< hide or show the tick marks help of the step property string titleText : "" ///< the component title property string titleUnit : Variables.unitTextBloodPressure ///< the component unit @@ -150,8 +150,6 @@ rightMargin : _pressureRangeBar.maxDiff } - diameter: Variables.sliderCircleDiameter - decimal : 1 bgColor : Colors.pressuresOutOfRangeBg @@ -192,7 +190,6 @@ unit : Variables.unitTextBloodPressure step : _root.step - ticks : _root.ticksVisible // The min/max edge line markers' visibility minVerticalEdgeVisible: false Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r74de6c3e36568bf842648d1a9f8d5bb6949fca5b -raac9d5d70abbd8d75c6e3782722e5daaf7355153 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 74de6c3e36568bf842648d1a9f8d5bb6949fca5b) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision aac9d5d70abbd8d75c6e3782722e5daaf7355153) @@ -69,15 +69,15 @@ readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 - readonly property int rangeRectTextMargin : 7 + readonly property int rangeRectTextMargin : 10 readonly property int rangeRectBorderWidth : 2 readonly property int rangeMarkerHeight : 60 readonly property int rangeMarkerHeightMidle : 40 readonly property int rangeMarkerHeightShort : 20 readonly property int rangeMarkerWidth : 2 readonly property int progressbarHeight : 30 - readonly property int progressbarHandler : 35 + readonly property int progressbarHandler : 30 readonly property int progressbarHandlerBorderWidth : 4 readonly property int progressbarRectMargin : 0 // default as 0 to avoid progressRect having a thicker border than slider body Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000 -raac9d5d70abbd8d75c6e3782722e5daaf7355153 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 3bf1c89cba7851e7658d4a7f2e7054ee6a4ff000) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision aac9d5d70abbd8d75c6e3782722e5daaf7355153) @@ -418,7 +418,6 @@ // dimension height : Variables.sliderDefaultBodyHeight width : Variables.createTreatmentSliderWidth - diameter : Variables.sliderCircleDiameter anchors.horizontalCenter: parent.horizontalCenter ticks : true stepSnap : true @@ -428,13 +427,13 @@ lowerText.visible : true lowerText.font.pixelSize : Fonts.fontPixelFluidText lowerText.font.bold : false - lowerText.anchors.topMargin : -50 + lowerText.anchors.topMargin : -60 lowerTextHorizontalCenter : true upperText.visible : true upperText.font.pixelSize : Fonts.fontPixelFluidText upperText.font.bold : false - upperText.anchors.topMargin : -50 + upperText.anchors.topMargin : -60 upperTextHorizontalCenter : true minText.visible : true @@ -504,7 +503,6 @@ // dimension height : Variables.sliderDefaultBodyHeight width : Variables.createTreatmentSliderWidth - diameter : Variables.sliderCircleDiameter anchors.horizontalCenter: parent.horizontalCenter ticks : true stepSnap : true @@ -519,13 +517,13 @@ lowerText.visible : true lowerText.font.pixelSize : Fonts.fontPixelFluidText lowerText.font.bold : false - lowerText.anchors.topMargin : -50 + lowerText.anchors.topMargin : -60 lowerTextHorizontalCenter : true upperText.visible : true upperText.font.pixelSize : Fonts.fontPixelFluidText upperText.font.bold : false - upperText.anchors.topMargin : -50 + upperText.anchors.topMargin : -60 upperTextHorizontalCenter : true minText.visible : true Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -raac9d5d70abbd8d75c6e3782722e5daaf7355153 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision aac9d5d70abbd8d75c6e3782722e5daaf7355153) @@ -64,6 +64,7 @@ maximumMargin : Math.abs(vTreatmentRanges.arterialPressureMonitorMax - vTreatmentRanges.arterialPressureLimitHighMax) limitGap : vTreatmentRanges.arterialPressureLimitLowGap // currently min & max are on the same slider/scale so used min as the main res step : arterialPressureStep + ticksVisible : true } Line { @@ -85,6 +86,7 @@ maximumMargin : Math.abs(vTreatmentRanges.venousPressureMonitorMax - vTreatmentRanges.venousPressureLimitHighMax) limitGap : vTreatmentRanges.venousPressureLimitLowGap // currently min & max are on the same slider/scale so used min as the main res step : venousPressureStep + ticksVisible : true } } }