Index: leahi.qrc
===================================================================
diff -u -r85ccb77b7343cb0ba133b6c13585e95a23ac237e -rf7bc98de488100270b004af851174e1329028d9a
--- leahi.qrc (.../leahi.qrc) (revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
+++ leahi.qrc (.../leahi.qrc) (revision f7bc98de488100270b004af851174e1329028d9a)
@@ -122,6 +122,8 @@
resources/images/water_sample.png
resources/images/ArrowDownDisabled.png
resources/images/ArrowUpDisabled.png
+ resources/images/recirculate_main.png
+ resources/images/bloodpump.png
sources/gui/qml/components/MainMenu.qml
Index: sources/gui/qml/compounds/LabelUnitText.qml
===================================================================
diff -u -rf66e9731c3c643653bacbf47c0e34a9e05774f00 -rf7bc98de488100270b004af851174e1329028d9a
--- sources/gui/qml/compounds/LabelUnitText.qml (.../LabelUnitText.qml) (revision f66e9731c3c643653bacbf47c0e34a9e05774f00)
+++ sources/gui/qml/compounds/LabelUnitText.qml (.../LabelUnitText.qml) (revision f7bc98de488100270b004af851174e1329028d9a)
@@ -24,6 +24,7 @@
property alias label : _label.text
property alias labelColor : _label.color
+ property alias labelWeight : _label.font.weight
property string unit : ""
property alias value : _value.text
property alias valueColor : _value.color
Index: sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml
===================================================================
diff -u -r61dfcbb2c8f58d1190a6665c4ad9427db76b51cc -rf7bc98de488100270b004af851174e1329028d9a
--- sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision 61dfcbb2c8f58d1190a6665c4ad9427db76b51cc)
+++ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml (.../EndTreatmentRecirculateProgress.qml) (revision f7bc98de488100270b004af851174e1329028d9a)
@@ -11,11 +11,12 @@
EndTreatmentBase { id: _root
headerTitle : qsTr("Recirculate In Progress")
+ footer.anchors.bottomMargin: Variables.notificationHeight + Variables.defaultMargin
readonly property bool timeoutTotal : vTreatmentRecirculate .timeoutTotal
readonly property int timeoutCountdown : vTreatmentRecirculate .timeoutCountDown
readonly property int bloodFlowRate : vTreatmentParametersSetPoint.bloodFlow
- readonly property string recirculationImage : ""
+ readonly property string recirculationImage : "qrc:/images/iRecirculate"
Row { id: _infoRow
objectName: "_infoRow"
@@ -33,12 +34,13 @@
objectName : "_timeElapsed"
width : _infoRow.cellWidth
label : qsTr("Recirculation Time Elapsed:")
+ labelWeight : Font.Medium
TimeText { id: _timeText
objectName: "timeText"
anchors {
right : parent.right
- rightMargin : Variables.defaultMargin * 2
+ rightMargin : Variables.defaultMargin * 3
verticalCenter : parent.verticalCenter
verticalCenterOffset: -2
}
@@ -55,17 +57,32 @@
label : qsTr("Blood Flow Rate:")
unit : Variables.unitTextFlowRate
value : _root.bloodFlowRate.toFixed(Variables.bloodFlowPrecision)
+ labelWeight : Font.Medium
}
}
Image { id: _image
anchors {
top : _infoRow.bottom
topMargin : Variables.defaultMargin * 2
- bottom: footer.top
horizontalCenter: parent.horizontalCenter
}
- onHeightChanged: print(height)
+
source: _root.recirculationImage
+
+ Image { id: _rotatingImage
+ source: "qrc:/images/iBloodpump"
+
+ x: 190
+ y: 287
+
+ RotationAnimator on rotation {
+ running : _root.visible
+ from : 0
+ to : 360
+ loops : Animation.Infinite
+ duration: 7200
+ }
+ }
}
}