Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295) @@ -140,14 +140,33 @@ readonly property int settingsInputWidth : 225 readonly property int settingsNotificationMargin : 10 - readonly property int settingsContentSidesMargin : Variables.headerButtonsMargin - readonly property int settingsContentBottomMargin : Variables.mainMenuHeight + // Alarm Bar height - Variables.notificationHeight + // notification Bar height - Variables.minVGap // Min Gap to give content the min border + readonly property int settingsContentSidesMargin : headerButtonsMargin + readonly property int settingsContentBottomMargin : mainMenuHeight + // Alarm Bar height + notificationHeight + // notification Bar height + minVGap // Min Gap to give content the min border readonly property int settingsOptionWidth : 550 readonly property int settingsOptionHeight : 50 + readonly property int screenGridAreaWidth : 400 + readonly property int screenGridAreaHeightRow1 : 170 + readonly property int screenGridAreaHeightRow2 : 225 + readonly property int screenGridAreaHeightRow3 : 200 + + readonly property int screenGridLeftColumnX : 40 + readonly property int screenGridRightColumnX : applicationWidth - screenGridLeftColumnX - screenGridAreaWidth + + readonly property int screenGridRow1Y : 100 + readonly property int screenGridRow2Y : 290 // 320 + readonly property int screenGridRow3Y : 540 // 570 + + readonly property int screenGridLineLength : 450 + readonly property int screenGridLeftLinesX : 0 + readonly property int screenGridRightLinesX : applicationWidth - screenGridLineLength + readonly property int screenGridRow1LineY : 275 + readonly property int screenGridRow2LineY : 525 + + // ---------- < PRS > Related Section ---------- // blood flow rate readonly property int bloodFlowMin : 100 // PRS 30 Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision 743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295) @@ -21,6 +21,7 @@ import "qrc:/globals" import "qrc:/components" import "qrc:/pages/endtreatment" +import "qrc:/pages/treatment/sections" /*! * \brief the end treatment rinseback screen @@ -53,6 +54,23 @@ onClicked : endClicked() } + TreatmentPressures { id: _pressuresTouchArea + arterialMinimum : Variables.arterialValueMin + arterialMaximum : Variables.arterialValueMax + venousMinimum : Variables.venousValueMin + venousMaximum : Variables.venousValueMax + + arterilPressure : vTreatmentPressureOcclusion.arterialPressure + venousPressure : vTreatmentPressureOcclusion.venousPressure + + isTouchable : false + valueOutRangeNotify : false + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow1Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow1 + } + ProgressCircle { id: _circle diameter: 335 anchors { Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295 --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages/treatment/sections" /*! * \brief the in-treatment Blood Prime screen @@ -55,6 +56,23 @@ } } + TreatmentPressures { id: _pressuresTouchArea + arterialMinimum : Variables.arterialValueMin + arterialMaximum : Variables.arterialValueMax + venousMinimum : Variables.venousValueMin + venousMaximum : Variables.venousValueMax + + arterilPressure : vTreatmentPressureOcclusion.arterialPressure + venousPressure : vTreatmentPressureOcclusion.venousPressure + + isTouchable : false + valueOutRangeNotify : false + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow1Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow1 + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295) @@ -31,24 +31,6 @@ property int bloodFlow_MeasuredFlow_Precision: 0 property int dialysateInletFlow_MeasuredFlow_Precision: 0 - property int areaWidth : 400 - property int areaHeightRow1 : 170 - property int areaHeightRow2 : 225 - property int areaHeightRow3 : 200 - - property int leftColumnX : 40 - property int rightColumnX : Variables.applicationWidth - leftColumnX - areaWidth - - property int row1Y : 100 - property int row2Y : 290 // 320 - property int row3Y : 540 // 570 - - property int lineLength : 450 - property int leftLinesX : 0 - property int rightLinesX : Variables.applicationWidth - lineLength - property int row1LineY : 275 - property int row2LineY : 525 - signal backClicked() signal sectionFlowClicked() @@ -59,20 +41,24 @@ // ---------- COLUMN LEFT TreatmentFlows { id: _flowsTouchArea - x : leftColumnX - y : row1Y - width : areaWidth - height : areaHeightRow1 +// x : Variables.screenGridLeftColumnX +// y : Variables.screenGridRow1Y +// width : Variables.screenGridAreaWidth +// height : Variables.screenGridAreaHeightRow1 + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow3Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow3 onClicked: { sectionFlowClicked() } } - Line { x: 0; y: row1LineY; length: lineLength } + Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength } TreatmentVitals { id: _vitalsTouchArea - x : leftColumnX - y : row2Y - width : areaWidth - height : areaHeightRow2 + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow2Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow2 onClicked: { sectionVitalsClicked() } @@ -82,7 +68,7 @@ + qsTr("Last Read:") + " " + vTreatmentVitals.lastRead } - Line { x: 0; y: row2LineY; length: lineLength } + Line { x: 0; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength } TreatmentPressures { id: _pressuresTouchArea arterialMinimum : Variables.arterialValueMin arterialMaximum : Variables.arterialValueMax @@ -92,10 +78,14 @@ arterilPressure : vTreatmentPressureOcclusion.arterialPressure venousPressure : vTreatmentPressureOcclusion.venousPressure - x : leftColumnX - y : row3Y - width : areaWidth - height : areaHeightRow3 + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow1Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow1 +// x : Variables.screenGridLeftColumnX +// y : Variables.screenGridRow3Y +// width : Variables.screenGridAreaWidth +// height : Variables.screenGridAreaHeightRow3 onClicked: { sectionPressuresClicked() @@ -104,27 +94,27 @@ // ---------- COLUMN RIGHT TreatmentUltrafiltration { id: _ultrafiltrationTouchArea; - x : rightColumnX - y : row1Y - width : areaWidth - height : areaHeightRow1 + x : Variables.screenGridRightColumnX + y : Variables.screenGridRow1Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow1 onClicked : { sectionUltrafiltrationClicked() } } - Line { x: rightLinesX; y: row1LineY; length: lineLength } + Line { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength } TreatmentSaline { id: _salineTouchArea - x : rightColumnX - y : row2Y - width : areaWidth - height : areaHeightRow2 + x : Variables.screenGridRightColumnX + y : Variables.screenGridRow2Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow2 } - Line { x: rightLinesX; y: row2LineY; length: lineLength; } + Line { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength; } TreatmentHeparin { id: _heparinTouchArea - x : rightColumnX - y : row3Y - width : areaWidth - height : areaHeightRow3 + x : Variables.screenGridRightColumnX + y : Variables.screenGridRow3Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow3 } // ---------- Center Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 743b1bbe1b18908167d3f5f6f8b0d5c66cbe1295) @@ -39,6 +39,8 @@ property int arterilPressure : 0 property int venousPressure : 0 + property bool valueOutRangeNotify : true + clip: false x : 0 y : 0 @@ -67,13 +69,14 @@ width : 175 height : 15 rangebar.color: Colors.pressuresArterialBar - markerOutRangeNotify: true + markerOutRangeNotify: _root.valueOutRangeNotify minimum : _root.arterialMinimum lowerBound : _root.arterialLowerBound upperBound : _root.arterialUpperBound maximum : _root.arterialMaximum value : _root.arterilPressure + color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color Text { id: _arterialText anchors { @@ -89,18 +92,19 @@ } RangeBar { id: _venousRangeBar - x: 200 + x: 210 y: 80 width : 175 height : 15 rangebar.color: Colors.pressuresVenousBar - markerOutRangeNotify: true + markerOutRangeNotify: _root.valueOutRangeNotify 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 {