Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) @@ -25,8 +25,7 @@ /*! * \brief Treatment Screen Pressure section */ -TouchArea { id: _root - +TreatmentSection { id: _root property int arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin property int arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax property int venousMinimum : vTreatmentRanges.venousPressureMonitorMin @@ -41,67 +40,67 @@ property bool valueOutRangeNotify : true - clip: false - x : 0 - y : 0 - width : 200 - height : 200 - isTouchable: true - title: qsTr("PRESSURE") + " " + qsTr("(mmHg)") + header.title: qsTr("Pressures") + " (" + qsTr("mmHg") + ")" - RangeBar { id: _arterialRangeBar - x: 0 - y: 80 - width : 175 - height : 15 - rangebar.color: Colors.pressuresArterialBar - markerOutRangeNotify: _root.valueOutRangeNotify - minimum : _root.arterialMinimum - lowerBound : _root.arterialLowerBound - upperBound : _root.arterialUpperBound - maximum : _root.arterialMaximum - value : _root.arterialPressure - color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color + contentItem: Column { id: _column + spacing: Variables.defaultMargin * 5 + leftPadding : Variables.defaultMargin + rightPadding: Variables.defaultMargin - Text { id: _arterialText - anchors { - left: parent.left - top: parent.bottom - topMargin: 35 + RangeBar { id: _arterialRangeBar + + width : contentItem.width * 0.75 + height : 25 + rangebar.color: Colors.pressuresArterialBar + markerOutRangeNotify: _root.valueOutRangeNotify + + 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: qsTr("Arterial") - font.pixelSize: Fonts.fontPixelPresseuresText - color: Colors.pressuresText + +// onClicked: _root.clicked() } - onClicked: _root.clicked() - } - RangeBar { id: _venousRangeBar - x: 210 - y: 80 - width : 175 - height : 15 - rangebar.color: Colors.pressuresVenousBar - markerOutRangeNotify: _root.valueOutRangeNotify + RangeBar { id: _venousRangeBar - minimum : _root.venousMinimum - lowerBound : _root.venousLowerBound - upperBound : _root.venousUpperBound - maximum : _root.venousMaximum - value : _root.venousPressure - color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color + width : contentItem.width * 0.75 + height : 25 + rangebar.color: Colors.pressuresVenousBar + markerOutRangeNotify: _root.valueOutRangeNotify - Text { id: _venousText - anchors { - left: parent.left - top: parent.bottom - topMargin: 35 + minimum : _root.venousMinimum + lowerBound : _root.venousLowerBound + upperBound : _root.venousUpperBound + maximum : _root.venousMaximum + value : _root.venousPressure + color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color + + Text { id: _venousText + anchors { + left: parent.left + top: parent.bottom + topMargin: 35 + } + text: qsTr("Venous") + font.pixelSize: Fonts.fontPixelPresseuresText + color: Colors.pressuresText } - text: qsTr("Venous") - font.pixelSize: Fonts.fontPixelPresseuresText - color: Colors.pressuresText +// onClicked: _root.clicked() } - onClicked: _root.clicked() } }