Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml =================================================================== diff -u -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 --- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9) @@ -4,47 +4,53 @@ // Project // Qml imports -//import "qrc:/globals" -//import "qrc:/components" +import "qrc:/globals" +import "qrc:/components" -import "../../../globals" -import "../../../components" -import "../" - Row { id: _row - property alias minimum : _rangeBar.minimum - property alias maximum : _rangeBar.maximum -// property alias maximum : _rangeBar.maximum -// property alias maximum : _rangeBar.maximum -// property alias maximum : _rangeBar.maximum -// property alias maximum : _rangeBar.maximum + property alias minimum : _rangeBar.minimum + property alias maximum : _rangeBar.maximum + property alias lowerBound : _rangeBar.lowerBound + property alias upperBound : _rangeBar.upperBound + property alias pressure : _rangeBar.value + property alias title : _title.text + property color barColor : Colors.backgroundRangeRect + property bool valueOutRangeNotify : true + property int barHeight : 25 + property int titleSize : 35 + property int valueSize : 60 - RangeBar { id: _rangeBar + spacing: Variables.defaultMargin * 2 - width : contentItem.width * 0.75 - height : 25 - rangebar.color: Colors.pressuresArterialBar - markerOutRangeNotify: _root.valueOutRangeNotify + Text { id: _title + width : 100 + height : 50 + color : Colors.pressuresText + font { + pixelSize : _row.titleSize + weight : Font.DemiBold + } + verticalAlignment : Text.AlignVCenter + } - minimum : _root.arterialMinimum - lowerBound : _root.arterialLowerBound - upperBound : _root.arterialUpperBound - maximum : _root.arterialMaximum - value : _root.arterialPressure - color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color - - Text { id: _arterialText - anchors { - left: parent.left - top: parent.bottom - topMargin: 35 - } - text: qsTr("Arterial") - font.pixelSize: Fonts.fontPixelPresseuresText - color: Colors.pressuresText + Text { id: _value + width : 100 + height : 50 + text : pressure + color : Colors.pressuresText + font { + pixelSize : _row.valueSize + weight : Font.Bold } + verticalAlignment : Text.AlignVCenter + } -// onClicked: _root.clicked() + RangeBar { id: _rangeBar + height : barHeight + width : _row.width * 0.60 + rangebar.color : barColor + markerOutRangeNotify: _root.valueOutRangeNotify + color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color } }