Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -r8fa24e534368d2baad16f262d31630996798977f -r7caa737179a8c31825ae6445f593ac7ff5f95080 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080) @@ -27,40 +27,44 @@ * \brief Treatment Screen Pressure section */ TreatmentSection { id: _root - property int arterialMinimum : -250//vTreatmentRanges.arterialPressureMonitorMin - property int arterialMaximum : 0//vTreatmentRanges.arterialPressureMonitorMax - property int venousMinimum : 40//vTreatmentRanges.venousPressureMonitorMin - property int venousMaximum : 260//vTreatmentRanges.venousPressureMonitorMax - property int tmpMinimum : -180 // vTreatmentRanges.tmpPressureMonitorMin - property int tmpMaximum : 50 // vTreatmentRanges.tmpPressureMonitorMax + property int arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin + property int arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax + property int venousMinimum : vTreatmentRanges.venousPressureMonitorMin + property int venousMaximum : vTreatmentRanges.venousPressureMonitorMax + property int tmpMinimum : 0//vTreatmentRanges.tmpPressureMonitorMin + property int tmpMaximum : 100//vTreatmentRanges.tmpPressureMonitorMax - property int arterialLowerBound : -169//vTreatmentPressureOcclusion.arterialPressureLimitLowerBound - property int arterialUpperBound : -48//vTreatmentPressureOcclusion.arterialPressureLimitUpperBound - property int venousLowerBound : 112//vTreatmentPressureOcclusion.venousPressureLimitLowerBound - property int venousUpperBound : 212//vTreatmentPressureOcclusion.venousPressureLimitUpperBound - property int tmpLowerBound : -80 // vTreatmentPressureOcclusion.tmpPressureLimitLowerBound - property int tmpUpperBound : 20 // vTreatmentPressureOcclusion.tmpPressureLimitUpperBound + property int arterialLowerBound : vTreatmentPressureOcclusion.arterialPressureLimitLowerBound + property int arterialUpperBound : vTreatmentPressureOcclusion.arterialPressureLimitUpperBound + property int venousLowerBound : vTreatmentPressureOcclusion.venousPressureLimitLowerBound + property int venousUpperBound : vTreatmentPressureOcclusion.venousPressureLimitUpperBound + property int tmpLowerBound : 20//vTreatmentPressureOcclusion.tmpPressureLimitLowerBound + property int tmpUpperBound : 80//vTreatmentPressureOcclusion.tmpPressureLimitUpperBound - property int arterialPressure : -108//vTreatmentPressureOcclusion.arterialPressure - property int venousPressure : 132//vTreatmentPressureOcclusion.venousPressure - property int tmpPressure : -30 // vTreatmentPressureOcclusion.tmpPressure + property int arterialPressure : vTreatmentPressureOcclusion.arterialPressure + property int venousPressure : vTreatmentPressureOcclusion.venousPressure + property int tmpPressure : 65//vTreatmentPressureOcclusion.tmpPressure property bool valueOutRangeNotify : true - header.title: qsTr("Pressures") + " (" + qsTr("mmHg") + ")" + header.title : qsTr("Pressures") + " (" + qsTr("mmHg") + ")" - contentArea.anchors.topMargin: Variables.defaultMargin + contentArea.anchors.topMargin : Variables.defaultMargin contentItem: Column { id: _column - spacing: Variables.defaultMargin * 4 - topPadding : Variables.defaultMargin - leftPadding : Variables.defaultMargin - rightPadding: Variables.defaultMargin + property int cellHeight : Variables.contentHeight / 3 + property int cellWidth : contentItem.width * 0.75 + spacing : Variables.defaultMargin * 4 + topPadding : Variables.defaultMargin + leftPadding : Variables.defaultMargin + rightPadding : Variables.defaultMargin + + TreatmentPressureComponent { id: _arterialRangeBar title : qsTr("Arterial:") - height : Variables.contentHeight / 3 - width : contentItem.width * 0.75 + height : _column.cellHeight + width : _column.cellWidth barColor : Colors.pressuresArterialBar minimum : _root.arterialMinimum @@ -74,8 +78,8 @@ TreatmentPressureComponent { id: _venousRangeBar title : qsTr("Venous:") - height : Variables.contentHeight / 3 - width : contentItem.width * 0.75 + height : _column.cellHeight + width : _column.cellWidth barColor : Colors.pressuresVenousBar minimum : _root.venousMinimum @@ -89,8 +93,8 @@ TreatmentPressureComponent { id: _tmpRangeBar title : qsTr("TMP:") - height : Variables.contentHeight / 3 - width : contentItem.width * 0.75 + height : _column.cellHeight + width : _column.cellWidth barColor : Colors.pressuresTmpBar minimum : _root.tmpMinimum @@ -111,7 +115,7 @@ } iconSize : 65 - iconImage.source : "qrc:/images/arrowsExpanding" + iconImage.source : "qrc:/images/iArrowsExpanding" enabled : ! expandingTimer.running onClicked : { @@ -121,10 +125,10 @@ } Timer { - id: expandingTimer - interval: 30000 // 30 second expand timer - repeat: false - onTriggered: resetAllRangeBars() + id : expandingTimer + interval : 30000 // 30 second expand timer + repeat : false + onTriggered : resetAllRangeBars() } function expandAllRangeBars() {