Index: leahi.qrc
===================================================================
diff -u -r26af78da75502c56dcff8ad402e63d64a496f341 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- leahi.qrc (.../leahi.qrc) (revision 26af78da75502c56dcff8ad402e63d64a496f341)
+++ leahi.qrc (.../leahi.qrc) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -237,6 +237,7 @@
sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
Index: sources/gui/qml/components/ContentArea.qml
===================================================================
diff -u -r26af78da75502c56dcff8ad402e63d64a496f341 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/components/ContentArea.qml (.../ContentArea.qml) (revision 26af78da75502c56dcff8ad402e63d64a496f341)
+++ sources/gui/qml/components/ContentArea.qml (.../ContentArea.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -16,6 +16,7 @@
contentItem.anchors.top = _contentArea.top
contentItem.anchors.left = _contentArea.left
contentItem.anchors.right = _contentArea.right
+ contentItem.anchors.bottom = _contentArea.bottom
}
}
}
Index: sources/gui/qml/components/LabelValue.qml
===================================================================
diff -u -r26af78da75502c56dcff8ad402e63d64a496f341 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision 26af78da75502c56dcff8ad402e63d64a496f341)
+++ sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -11,44 +11,29 @@
property string topTextColor : Colors.textTextRectLabel
property alias topTextFont : _topText.font
- property string centerText : ""
- property string centerTextColor : Colors.textTextRectLabel
- property bool showCenterText : false
-
property string bottomText : ""
property string bottomTextColor : Colors.textTextRectLabel
- property alias bottomTextHeight : _bottomText.height
- property int verticalSpacing : 0
-
clip: false
- Column { id: _column
- anchors.horizontalCenter: parent.horizontalCenter
-
- spacing: verticalSpacing
-
- Text { id: _topText
- text: _root.topText
- color: topTextColor
- font.pixelSize: Fonts.fontPixelTextRectLabel
- verticalAlignment: Text.AlignBottom
- horizontalAlignment: Text.AlignHCenter
+ Text { id: _topText
+ anchors {
+ top: parent.top
+ horizontalCenter: parent.horizontalCenter
}
- Text { id: _centerText
- text: _root.centerText
- color: centerTextColor
- visible: showCenterText
- font.pixelSize: Fonts.fontPixelTextRectExtra
- horizontalAlignment: Text.AlignLeft
- }
+ text: _root.topText
+ color: topTextColor
+ font.pixelSize: Fonts.fontPixelTextRectLabel
+ }
- Text { id: _bottomText
- text: _root.bottomText
- color: bottomTextColor
- font.pixelSize: Fonts.fontPixelTextRectExtra
- horizontalAlignment: Text.AlignHCenter
+ Text { id: _bottomText
+ anchors {
+ top: _topText.bottom
+ horizontalCenter: _topText.horizontalCenter
}
+ text: _root.bottomText
+ color: bottomTextColor
+ font.pixelSize: Fonts.fontPixelTextRectExtra
}
}
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rf91362971e3b7af39c96e20fd553cdbd49741f85 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision f91362971e3b7af39c96e20fd553cdbd49741f85)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -55,7 +55,7 @@
readonly property int arrowHeight : 16
readonly property int alarmListIconDiameter : 45
- readonly property int treatmentSectionIconSize : 40
+ readonly property int treatmentSectionIconSize : 35
readonly property int borderWidth : 2
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -71,11 +71,11 @@
// venousLowerBound : 0 // requested to hide the bounds
// venousUpperBound : 0 // requested to hide the bounds
- isTouchable : false
- x : Variables.screenGridLeftColumnX
- y : Variables.screenGridRow1Y
- width : Variables.screenGridAreaWidth
- height : Variables.screenGridAreaHeightRow1
+// isTouchable : false
+// x : Variables.screenGridLeftColumnX
+// y : Variables.screenGridRow1Y
+// width : Variables.screenGridAreaWidth
+// height : Variables.screenGridAreaHeightRow1
}
Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength }
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -64,11 +64,11 @@
// venousLowerBound : 0 // requested to hide the bounds
// venousUpperBound : 0 // requested to hide the bounds
- isTouchable : false
- x : Variables.screenGridLeftColumnX
- y : Variables.screenGridRow1Y
- width : Variables.screenGridAreaWidth
- height : Variables.screenGridAreaHeightRow1
+// isTouchable : false
+// x : Variables.screenGridLeftColumnX
+// y : Variables.screenGridRow1Y
+// width : Variables.screenGridAreaWidth
+// height : Variables.screenGridAreaHeightRow1
}
Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength }
Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -73,11 +73,11 @@
// venousLowerBound : 0 // requested to hide the bounds
// venousUpperBound : 0 // requested to hide the bounds
- isTouchable : false
- x : Variables.screenGridLeftColumnX
- y : Variables.screenGridRow1Y
- width : Variables.screenGridAreaWidth
- height : Variables.screenGridAreaHeightRow1
+// isTouchable : false
+// x : Variables.screenGridLeftColumnX
+// y : Variables.screenGridRow1Y
+// width : Variables.screenGridAreaWidth
+// height : Variables.screenGridAreaHeightRow1
}
Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength }
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
Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
===================================================================
diff -u -r26af78da75502c56dcff8ad402e63d64a496f341 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 26af78da75502c56dcff8ad402e63d64a496f341)
+++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -28,16 +28,15 @@
signal editClicked
color: Colors.treatmentSectionHeader
- height : Variables.contentHeight + Variables.defaultMargin
+ height : Variables.contentHeight + (Variables.defaultMargin * 2)
width : parent.width
radius: 15
anchors.top: parent.top
Label { id: _title
anchors {
- top : parent.top
- topMargin : Variables.defaultMargin
+ verticalCenter: parent.verticalCenter
left : parent.left
leftMargin : Variables.defaultMargin * 2
}
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r3aee99e86a02eee80e15a157399a5b9968958ec1 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 3aee99e86a02eee80e15a157399a5b9968958ec1)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -209,6 +209,7 @@
_bphrEntry.diastolic ,
_bphrEntry.heartRate
)
+ _treatmentHome.logVitalTime()
}
onCloseClicked : {
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml
===================================================================
diff -u
--- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (revision 0)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -0,0 +1,50 @@
+// Qt
+import QtQuick 2.12
+
+// Project
+
+// Qml imports
+//import "qrc:/globals"
+//import "qrc:/components"
+
+import "../../../globals"
+import "../../../components"
+import "../"
+
+Row { id: _row
+ property alias minimum : _rangeBar.minimum
+ property alias maximum : _rangeBar.maximum
+// property alias maximum : _rangeBar.maximum
+// property alias maximum : _rangeBar.maximum
+// property alias maximum : _rangeBar.maximum
+// property alias maximum : _rangeBar.maximum
+
+
+ RangeBar { id: _rangeBar
+
+ 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
+ }
+
+// onClicked: _root.clicked()
+ }
+}
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()
}
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r26af78da75502c56dcff8ad402e63d64a496f341 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 26af78da75502c56dcff8ad402e63d64a496f341)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -60,12 +60,11 @@
VTreatmentSaline { id: vTreatmentSaline }
contentItem: Column { id :_content
- spacing : Variables.defaultMargin * 4
- leftPadding : Variables.defaultMargin
- rightPadding: Variables.defaultMargin
+ spacing : Variables.defaultMargin * 3
Text { id: _descriptionText
text : qsTr("Total Saline Delivered")
+ height: Variables.contentHeight
font.pixelSize : Fonts.fontPixelFluidText
color : Colors.fluidText
horizontalAlignment: Text.AlignHCenter
@@ -76,26 +75,28 @@
width: parent.width - Variables.defaultMargin
ProgressBar { id: _fluidProgressBar
- width: progressBarArea.width - Variables.defaultMargin
+ width: progressBarArea.width + 10 //- Variables.defaultMargin
- height : Variables.progressbarFluidHeight * 4
+ height : Variables.progressbarFluidHeight * 3
minText.visible : false
maxText.visible : false
marker.visible : false
color: "cyan"// update later
- maximum : _fluidTarget.value
+ maximum : valueCumulative
value : valueDelivered
decimal : _root.valueDecimal
radius: 9
progressRadius: radius
}
- Label { id: _fluidTarget
- property real value: valueCumulative
+ Label { id: _valueDelivered
+ property real value: valueDelivered
+
anchors {
- verticalCenter: _fluidTargetUnit.verticalCenter
- right: _fluidTargetUnit.left
+ verticalCenter: __valueDeliveredUnit.verticalCenter
+ right: __valueDeliveredUnit.left
+ rightMargin: 5
}
font.pixelSize : Fonts.fontPixelFluidText
font.weight : Font.DemiBold
@@ -104,10 +105,11 @@
}
- Label { id: _fluidTargetUnit
+ Label { id: __valueDeliveredUnit
property real value: 0
anchors {
bottom: _fluidProgressBar.top
+ bottomMargin: Variables.defaultMargin
right: _fluidProgressBar.right
}
font.pixelSize : Fonts.fontPixelFluidText
@@ -117,9 +119,11 @@
}
TouchRect { id: _startFluidButton
- width : progressBarArea.width - Variables.defaultMargin
- height: Variables.contentHeight
+ width : _fluidProgressBar.width
+ height: Variables.contentHeight + 10
+ radius: 9
+
text.text: buttonText
backgroundColor: borderColor
textColor: isDisabled || isWaitPump ? Colors.textButton : Colors.textDisableButton
Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -r26af78da75502c56dcff8ad402e63d64a496f341 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 26af78da75502c56dcff8ad402e63d64a496f341)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
@@ -32,11 +32,10 @@
header.title: qsTr("Vitals" )
contentItem: Column { id: _content
- spacing : Variables.defaultMargin * 5
- anchors.fill: parent
+ spacing : Variables.defaultMargin * 4
LabelValue { id: _bloodPressure
- height: 45
+ height: 40
width: contentItem.width
topTextFont.pixelSize: Fonts.fontPixelVitals
topTextFont.weight: Font.Bold
@@ -45,7 +44,7 @@
}
LabelValue { id: _heartBeat
- height: 30
+ height: 45
width: contentItem.width
topTextFont.pixelSize: Fonts.fontPixelVitals
topTextFont.weight: Font.Bold
@@ -59,8 +58,12 @@
text: qsTr("Last Recorded: " )
font.pixelSize: 18
font.weight: Font.Light
+ verticalAlignment: Text.AlignBottom
}
+ }
+ function updateVitalTime() {
+ _lastRecorded.text = qsTr("Last Recorded: " ) + vDateTime.time
}
// TODO