Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -40,16 +40,22 @@ signal sectionUltrafiltrationClicked() // ---------- COLUMN LEFT - TreatmentFlows { id: _flowsTouchArea - x : Variables.screenGridLeftColumnX - y : Variables.screenGridRow3Y - width : Variables.screenGridAreaWidth - height : Variables.screenGridAreaHeightRow3 + + TreatmentPressures { id: _pressuresTouchArea + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow1Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow1 onClicked: { - sectionFlowClicked() + sectionPressuresClicked() } } - Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength } + Line { + anchors.top : _pressuresTouchArea.bottom + length: Variables.screenGridLineLength + } + + TreatmentVitals { id: _vitalsTouchArea x : Variables.screenGridLeftColumnX y : Variables.screenGridRow2Y @@ -78,19 +84,27 @@ font.pixelSize: 16 } } + Line { + anchors.top : _vitalsTouchArea.bottom + anchors.topMargin: 10 + length: Variables.screenGridLineLength + } - Line { x: 0; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength } - - TreatmentPressures { id: _pressuresTouchArea - x : Variables.screenGridLeftColumnX - y : Variables.screenGridRow1Y - width : Variables.screenGridAreaWidth - height : Variables.screenGridAreaHeightRow1 + TreatmentFlows { id: _flowsTouchArea + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow3Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow3 onClicked: { - sectionPressuresClicked() + sectionFlowClicked() } } + Line { + anchors.top : _flowsTouchArea.bottom + length: Variables.screenGridLineLength + } + // ---------- COLUMN RIGHT TreatmentUltrafiltration { id: _ultrafiltrationTouchArea; x : Variables.screenGridRightColumnX @@ -101,20 +115,37 @@ sectionUltrafiltrationClicked() } } - Line { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength } + Line { + anchors.right: _root.right + anchors.top : _ultrafiltrationTouchArea.bottom + length: Variables.screenGridLineLength + } + + TreatmentSaline { id: _salineTouchArea x : Variables.screenGridRightColumnX y : Variables.screenGridRow2Y width : Variables.screenGridAreaWidth height : Variables.screenGridAreaHeightRow2 } - Line { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength; } + Line { + anchors.right: _root.right + anchors.top : _salineTouchArea.bottom + anchors.topMargin: 10 + length: Variables.screenGridLineLength + } + TreatmentHeparin { id: _heparinTouchArea x : Variables.screenGridRightColumnX y : Variables.screenGridRow3Y width : Variables.screenGridAreaWidth height : Variables.screenGridAreaHeightRow3 } + Line { + anchors.right: _root.right + anchors.top : _heparinTouchArea.bottom + length: Variables.screenGridLineLength + } // ---------- Center TreatmentTime { id: _treatmentTime