Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r26af78da75502c56dcff8ad402e63d64a496f341 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 26af78da75502c56dcff8ad402e63d64a496f341) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) @@ -38,11 +38,14 @@ signal sectionPressuresClicked() signal sectionTimeClicked() signal sectionUltrafiltrationClicked() + signal logVitalTime() readonly property int cellWidth : _root.width / 7 - 10 // = screen width / # columns readonly property int cellHeight: _root.height / 2 - Variables.notificationHeight // = screen height / # rows - header bar - Column { id: _rowLayout + onLogVitalTime: _vitalsTreatmentArea.updateVitalTime() + + Column { id: _column spacing: Variables.defaultMargin anchors { @@ -51,8 +54,7 @@ topMargin : Variables.notificationHeight + Variables.defaultMargin // FIXME: 120 - to adjust from current headerbar implementation } - - Row { id: _topRowLayout + Row { id: _topRow spacing: Variables.defaultMargin height: cellHeight @@ -66,7 +68,6 @@ sectionTimeClicked() } } - } TreatmentSaline { id: _salineTreatmentArea @@ -79,12 +80,13 @@ height: cellHeight onEditClicked: sectionVitalsClicked() + // TODO: Keep???? Text { id: _vitalCountdown color : "gray" anchors { top : parent.top + topMargin : Variables.defaultMargin * 4 right : parent.right - rightMargin : 50 } horizontalAlignment : Text.AlignHCenter verticalAlignment : Text.AlignVCenter @@ -95,19 +97,14 @@ } } - - - TreatmentSection { id: _pressureMonitor + TreatmentPressures { id: _pressureTreatmentArea width: (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune height: cellHeight - - header.title: qsTr("Pressures") + " (" + qsTr("mmHg") + ")" - + onEditClicked: sectionPressuresClicked() } - } - Row { id: _bottomRowLayout + Row { id: _bottomRow spacing: Variables.defaultMargin height: cellHeight