Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r9327fae7b109203ca698d361b113a81d139a0cf9 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -24,8 +24,7 @@ /*! * \brief Slider component with a title and the currently selected value */ -Rectangle { - id: _root +Rectangle { id: _root property alias text: _text.text property var units: "" @@ -38,16 +37,14 @@ property alias stepSnap: _slider.stepSnap property alias sliderWidth: _slider.width property alias isActive: _slider.isActive - property alias sliderObjectName: _slider.objectName - property alias selectedValueObjectName: _selected_value.objectName signal pressed() signal released() height: Variables.createTreatmentSliderHeight width: Variables.createTreatmentSliderWidth anchors.horizontalCenter: parent.horizontalCenter - color: "transparent"; + color: "transparent" function setValid(valid) { if (valid) { @@ -65,53 +62,50 @@ anchors.top: parent.top anchors.left: parent.left font.pixelSize: Fonts.fontPixelFluidText - color: Colors.textMain; + color: Colors.textMain } - Text { - id: _selected_value + Text { id: _selected_value + objectName: _root.objectName + "Value" anchors.top: parent.top anchors.right: parent.right - text: "__ " + _root.units + text: qsTr("__") + " " + _root.units font.pixelSize: Fonts.fontPixelFluidUnit - color: Colors.textDisableButton; - + color: Colors.textDisableButton } Slider { id : _slider - anchors.horizontalCenter: parent.horizontalCenter; - anchors.bottom: parent.bottom; - width : Variables.createTreatmentSliderWidth - diameter: Variables.sliderCircleDiameter - color : Colors.createTreatmentInactive + objectName: _root.objectName + "Slider" + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom : parent.bottom + width : Variables.createTreatmentSliderWidth + diameter : Variables.sliderCircleDiameter + color : Colors.createTreatmentInactive handlerColor: Colors.createTreatmentInactive - touchMargin: Variables.createTreatmentSliderMargin - height : 5 - minimum : 100 - maximum : 500 - unit : qsTr("") - step : Variables.bloodFlowResolution - ticks : true + touchMargin : Variables.createTreatmentSliderMargin + height : 5 + isActive : false + ticks : true onValueChanged: { - _selected_value.text = value + " " + _root.units + if (isActive) + _selected_value.text = value + " " + _root.units } - onActiveChanged: { if (isActive) { + _selected_value.text = value + " " + _root.units _selected_value.color = Colors.textMain _text.color = Colors.textMain } else { _selected_value.color = Colors.textDisableButton _text.color = Colors.textDisableButton } } - - onProgressRectClicked: { setActive(true); setValid(true); } - onProgressRectDragged: { setActive(true); setValid(true); } - onPressed: { _root.pressed(); } - onReleased: { _root.released(); } - onDragged: { setActive(true); setValid(true); } - onClicked: { setActive(true); setValid(true); } + onProgressRectClicked : { setActive (true); setValid(true); } + onProgressRectDragged : { setActive (true); setValid(true); } + onPressed : { _root.pressed ( ); } + onReleased : { _root.released ( ); } + onDragged : { setActive (true); setValid(true); } + onClicked : { setActive (true); setValid(true); } } }