Index: leahi.qrc
===================================================================
diff -u -r90fec29e26dde73ba3cc6db04c5334fff430d2f7 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- leahi.qrc (.../leahi.qrc) (revision 90fec29e26dde73ba3cc6db04c5334fff430d2f7)
+++ leahi.qrc (.../leahi.qrc) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -79,11 +79,12 @@
resources/images/Unlock.png
resources/images/Wifi.png
resources/images/PauseOrange.png
- resources/images/arrowDownActive.png
- resources/images/arrowDownInactive.png
- resources/images/arrowsExpanding.png
- resources/images/arrowUpActive.png
- resources/images/arrowUpInactive.png
+ resources/images/arrowDownActive.png
+ resources/images/arrowDownInactive.png
+ resources/images/arrowsExpanding.png
+ resources/images/arrowUpActive.png
+ resources/images/arrowUpInactive.png
+ resources/images/HomeBackground.png
sources/gui/qml/components/MainMenu.qml
Index: sources/gui/qml/components/Circle.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/components/Circle.qml (.../Circle.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/components/Circle.qml (.../Circle.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -68,7 +68,6 @@
strokeColor: Colors.borderButton
strokeWidth: 1
capStyle: ShapePath.RoundCap
-
PathAngleArc { id: _arc
centerX: _root.width / 2
centerY: _root.height / 2
@@ -80,15 +79,15 @@
}
}
- ConicalGradient {
- id: borderGradient
+ ConicalGradient { id: borderGradient
anchors.fill: _shape
- angle: -7
- source: _shape
+ angle : -7
+ source : _shape
gradient: Gradient {
- GradientStop { position: 0.0; color: showGradient ? _root.startGradientColor :_root.color }
+ GradientStop { position: 0.0; color: showGradient ? _root.startGradientColor :
+ _root.color }
GradientStop { position: 1.0; color: _root.color }
}
}
@@ -118,6 +117,5 @@
! runAnimation ? restart() : target.opacity = 1
}
}
-
}
}
Index: sources/gui/qml/components/ContentArea.qml
===================================================================
diff -u -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/components/ContentArea.qml (.../ContentArea.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315)
+++ sources/gui/qml/components/ContentArea.qml (.../ContentArea.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -2,21 +2,21 @@
Item {
id: _contentArea
- height: contentItem ? contentItem.height : 0
+ height: contentItem ? contentItem.height :
+ 0
- property Item contentItem: Item {
- id: defaultContentItem
- parent: _contentArea
- height: 10
+ property Item contentItem: Item { id: defaultContentItem
+ parent : _contentArea
+ height : 10
}
onContentItemChanged: {
if (contentItem) {
- contentItem.parent = _contentArea
- contentItem.anchors.top = _contentArea.top
- contentItem.anchors.left = _contentArea.left
- contentItem.anchors.right = _contentArea.right
- contentItem.anchors.bottom = _contentArea.bottom
+ contentItem.parent = _contentArea
+ 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 -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24)
+++ sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -26,47 +26,51 @@
Text { id: _topText
anchors {
- top: parent.top
- left: leftAlign ? parent.left: undefined
- horizontalCenter: leftAlign ? undefined : parent.horizontalCenter
+ top : parent.top
+ left : leftAlign ? parent.left :
+ undefined
+ horizontalCenter: leftAlign ? undefined :
+ parent.horizontalCenter
}
- text: _root.topText
- color: topTextColor
- font.pixelSize: Fonts.fontPixelTextRectLabel
+ text : _root.topText
+ color : topTextColor
+ font.pixelSize : Fonts.fontPixelTextRectLabel
}
Text { id: _centerText
anchors {
- top : _topText.bottom
- topMargin: 10
- left : _topText.left
+ top : _topText.bottom
+ topMargin : 10
+ left : _topText.left
}
- text: _root.centerText
- color: topTextColor
- font.pixelSize: 20
- font.weight: Font.Light
+ text : _root.centerText
+ color : topTextColor
+ font.pixelSize : 20
+ font.weight : Font.Light
}
Text { id: _bottomText
anchors {
- top : showCenterText ? _centerText.bottom :_topText.bottom
+ top : showCenterText ? _centerText.bottom :
+ _topText.bottom
topMargin : bottomTextTopMargin
- horizontalCenter: leftAlign ? undefined : _topText.horizontalCenter
+ horizontalCenter: leftAlign ? undefined :
+ _topText.horizontalCenter
}
- text: _root.bottomText
- color: bottomTextColor
- font.pixelSize: Fonts.fontPixelTextRectExtra
+ text : _root.bottomText
+ color : bottomTextColor
+ font.pixelSize : Fonts.fontPixelTextRectExtra
}
Text { id: _unitText
anchors {
- left: _bottomText.right
- leftMargin: 5
- bottom: _bottomText.bottom
+ left : _bottomText.right
+ leftMargin : 5
+ bottom : _bottomText.bottom
bottomMargin: 10
}
- text: _root.unitText
- color: topTextColor
- font.pixelSize: 22
+ text : _root.unitText
+ color : topTextColor
+ font.pixelSize : 22
}
}
Index: sources/gui/qml/components/ProgressBarEx.qml
===================================================================
diff -u -r90fec29e26dde73ba3cc6db04c5334fff430d2f7 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 90fec29e26dde73ba3cc6db04c5334fff430d2f7)
+++ sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -45,18 +45,19 @@
minimum : _root.minimum
maximum : _root.maximum
value : _root.valueEx
-
- maxText.visible: visible
margin : 0
- onClicked: extraClicked()
+ maxText.visible : visible
+
+ onClicked : extraClicked()
}
Rectangle { id: _rightBackground // to match design and get the right end of progress bar straight edged and not rounded
property int percent: ((value / (maximum - minimum)) * 100)
- color: gradientEnd
- height: parent.height
- width: percent < 3 ? 2 : 8
- anchors.right: progress.right
- visible: percent > 3
+
+ color : gradientEnd
+ height : parent.height
+ width : percent < 3 ? 2 : 8
+ anchors.right : progress.right
+ visible : percent > 3
}
}
Index: sources/gui/qml/components/RangeMarker.qml
===================================================================
diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/components/RangeMarker.qml (.../RangeMarker.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24)
+++ sources/gui/qml/components/RangeMarker.qml (.../RangeMarker.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -72,12 +72,14 @@
bold : true
}
anchors {
- right : parent.left
- top : valueOnTop ? undefined : parent.top
- bottom : valueOnTop ? _handle.top : undefined
+ right : parent.left
+ top : valueOnTop ? undefined :
+ parent.top
+ bottom : valueOnTop ? _handle.top :
+ undefined
bottomMargin: valueOnTop ? 5 : 0
- rightMargin: valueOnTop ? -12 : 5
- topMargin : valueOnTop ? 0 : -5
+ rightMargin : valueOnTop ? -12 : 5
+ topMargin : valueOnTop ? 0 : -5
}
color : _root.color
text : value.toFixed(decimal) + " " + unitText
Index: sources/gui/qml/components/TimeText.qml
===================================================================
diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/components/TimeText.qml (.../TimeText.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9)
+++ sources/gui/qml/components/TimeText.qml (.../TimeText.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -58,52 +58,51 @@
property string time : hourText + separator + minuteText + (_root.secondsVisible ? (separator + secondText) : "")
}
- Text { id: _timeSeparator
- objectName: "_TimeText_timeSeparator" //SquishQt testability
+ Text { id : _timeSeparator
+ objectName : "_TimeText_timeSeparator" //SquishQt testability
- text: _private.separator
+ text : _private.separator
- font.pixelSize: _root.textPixelSize
- font.weight: _root.textWeight
- color: _root.textColor
+ font.pixelSize : _root.textPixelSize
+ font.weight : _root.textWeight
+ color : _root.textColor
anchors.centerIn: _root
}
- Text { id: _hourText
- objectName: "_TimeText_hour" //SquishQt testability
+ Text { id : _hourText
+ objectName : "_TimeText_hour" //SquishQt testability
- text: _private.hourText
- font.pixelSize: _root.textPixelSize
- font.weight: _root.textWeight
- color: _root.textColor
+ text : _private.hourText
+ font.pixelSize : _root.textPixelSize
+ font.weight : _root.textWeight
+ color : _root.textColor
horizontalAlignment: Text.AlignRight
anchors.right : _timeSeparator.left
anchors.baseline: _timeSeparator.baseline
}
- Text { id: _minuteText
- objectName: "_TimeText_minute" //SquishQt testability
+ Text { id : _minuteText
+ objectName : "_TimeText_minute" //SquishQt testability
- text: _private.minuteText
- font.pixelSize: _root.textPixelSize
- font.weight: _root.textWeight
- color: _root.textColor
+ text : _private.minuteText
+ font.pixelSize : _root.textPixelSize
+ font.weight : _root.textWeight
+ color : _root.textColor
horizontalAlignment: Text.AlignLeft
- anchors.left: _timeSeparator.right
+ anchors.left : _timeSeparator.right
anchors.baseline: _timeSeparator.baseline
}
- Text { id: _secondText
- objectName: "_TimeText_second" //SquishQt testability
+ Text { id : _secondText
+ objectName : "_TimeText_second" //SquishQt testability
- visible: _root.secondsVisible
-
- text: _private.secondText
- font.pixelSize: _root.secsPixelSize
- color: _root.textColor
- horizontalAlignment: Text.AlignLeft
- anchors.left: _minuteText.right
- anchors.leftMargin: _root.secondsLeftMargin
- anchors.baseline: _timeSeparator.baseline
+ visible : _root.secondsVisible
+ text : _private.secondText
+ font.pixelSize : _root.secsPixelSize
+ color : _root.textColor
+ horizontalAlignment : Text.AlignLeft
+ anchors.left : _minuteText.right
+ anchors.leftMargin : _root.secondsLeftMargin
+ anchors.baseline : _timeSeparator.baseline
}
}
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -44,7 +44,7 @@
readonly property color treatmentSectionHeader : "#1A2E42"
readonly property color treatmentSectionMain : "#1A3046"
readonly property color mainTreatmentLighterBlue : "#1F3D5A"
- readonly property color mainTreatmentDarkerBlue : "#142C49"
+ readonly property color mainTreatmentDarkerBlue : "#142C49"
readonly property color sliderHighlightColor : "orange"
readonly property color sliderProgressBorderActive : white
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -129,6 +129,8 @@
readonly property int createTreatmentSliderWidth : 750
readonly property int createTreatmentSwitchYDisplacement : 15
+ readonly property int treatmentFlowsComponentWidth : 150
+
readonly property int ultrafiltrationProgressbarWidth : 880
readonly property int ultrafiltrationAdjustmtenOptionWidth : 520
readonly property int ultrafiltrationAdjustmtenOptionHeight : 275
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
===================================================================
diff -u -rcf3ef3656c06ade00b6bc6c09e8e0f858ee1af24 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision cf3ef3656c06ade00b6bc6c09e8e0f858ee1af24)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -29,11 +29,11 @@
TreatmentSection { id: _root
property bool editEnabled : header.editEnabled
- header.title: qsTr("Treatment Parameters")
- header.showLock: true
+ header.title : qsTr("Treatment Parameters")
+ header.showLock : true
- contentItem: Row { id: _row
- objectName: "row"
+ contentItem: Row { id : _row
+ objectName : "row"
property int cellWidth : (contentItem.width / 4) - (Variables.defaultMargin) + 5
property int cellHeight : contentItem.height - 10
@@ -46,7 +46,7 @@
title : qsTr("Blood Flow")
height : _row.cellHeight
width : _row.cellWidth
- value : "320"//Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+ value : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
unitText : Variables.unitTextFlowRate
buttonsEnabled : editEnabled
@@ -59,7 +59,7 @@
title : qsTr("Dialysate Flow")
height : _row.cellHeight
width : _row.cellWidth
- value : "20"//Variables.notSetVariable(vTreatmentBloodFlow.dialysateFlow_PresFlow)
+ value : Variables.notSetVariable(vTreatmentBloodFlow.dialysateFlow_PresFlow)
unitText : Variables.unitTextFlowRate
buttonsEnabled : editEnabled // TODO
extraText : "OFF" // TODO
@@ -73,7 +73,7 @@
title : qsTr("Dialysate Temp.")
height : _row.cellHeight
width : _row.cellWidth
- value : "145"//Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+ value : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
unitText : Variables.unitTextTemperature
buttonsEnabled : editEnabled // TODO
@@ -86,7 +86,7 @@
title : qsTr("Dialysate Cond.")
height : _row.cellHeight
width : _row.cellWidth
- value : "55"//Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
+ value : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow)
unitText : Variables.unitTextDialCond
showButtons : false
dropShadowEnabled : false
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -22,8 +22,8 @@
property int iconSize : 70
property bool dropShadowEnabled : true
- color: Colors.mainTreatmentLighterBlue
- radius: 5
+ color : Colors.mainTreatmentLighterBlue
+ radius : 5
signal increment
signal decrement
@@ -54,24 +54,24 @@
objectName: "row"
anchors {
- top : _title.bottom
- horizontalCenter : _root.horizontalCenter
+ top : _title.bottom
+ horizontalCenter : _root.horizontalCenter
}
LabelValue { id: _value
objectName: "value"
anchors {
- top: parent.top
+ top : parent.top
topMargin : Variables.defaultMargin
}
- height: 50
- width: 150
- topTextFont.pixelSize: 60
- topTextFont.weight: Font.Medium
- topText: value
- bottomText: _root.unitText
+ height : Variables.contentHeight
+ width : Variables.treatmentFlowsComponentWidth
+ topText : value
+ topTextFont.pixelSize : 60
+ topTextFont.weight : Font.Medium
+ bottomText : _root.unitText
bottomTextFont.pixelSize: 22
- bottomTextTopMargin: Variables.defaultMargin
+ bottomTextTopMargin : Variables.defaultMargin
}
Column { id: _column
@@ -81,20 +81,20 @@
spacing: Variables.defaultMargin
TreatmentSectionIcon { id : _upArrowIcon
- objectName: "upArrowIcon"
+ objectName : "upArrowIcon"
enabled : buttonsEnabled
iconSize : _root.iconSize
- iconImage.source : enabled ? "qrc:/images/arrowUpActive" :
- "qrc:/images/arrowUpInactive"
+ iconImage.source : enabled ? "qrc:/images/iArrowUpActive" :
+ "qrc:/images/iArrowUpInactive"
onClicked : _root.increment()
}
TreatmentSectionIcon { id : _downArrowIcon
- objectName: "downArrowIcon"
+ objectName : "downArrowIcon"
enabled : buttonsEnabled
iconSize : _root.iconSize
- iconImage.source : enabled ? "qrc:/images/arrowDownActive" :
- "qrc:/images/arrowDownInactive"
+ iconImage.source : enabled ? "qrc:/images/iArrowDownActive" :
+ "qrc:/images/iArrowDownInactive"
onClicked : _root.decrement()
}
}
@@ -122,15 +122,14 @@
horizontalAlignment : Text.AlignHCenter
}
- layer.enabled: _root.dropShadowEnabled
- layer.effect: DropShadow {
- id: _dropShadow
+ layer.enabled : _root.dropShadowEnabled
+ layer.effect : DropShadow { id: _dropShadow
horizontalOffset: 0
- verticalOffset: 5
- radius: 3.0
- samples: 7
- color: "#50000000"
- source: _root
- anchors.fill: _root
+ verticalOffset : 5
+ radius : 3.0
+ samples : 7
+ color : "#50000000"
+ source : _root
+ anchors.fill : _root
}
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -16,48 +16,51 @@
property alias title : _title.text
property color barColor : Colors.backgroundRangeRect
- property bool valueOutRangeNotify : true
property int barHeight : 15
property int titleSize : 35
property int valueSize : 70
property int prevMaximum : _rangeBar.maximum
property int prevMinimum : _rangeBar.minimum
- spacing: Variables.defaultMargin
+ property bool valueOutRangeNotify : true
+ spacing : Variables.defaultMargin
+
Text { id: _title
- width : 200
- height : 50
- color : Colors.pressuresText
+ width : 200
+ height : 50
+ color : Colors.pressuresText
font {
- pixelSize : _row.titleSize
- weight : Font.Medium
+ pixelSize : _row.titleSize
+ weight : Font.Medium
}
- verticalAlignment : Text.AlignVCenter
+ verticalAlignment : Text.AlignVCenter
}
Text { id: _value
width : 50
height : 50
- text : pressure > 0 ? "+" + pressure : pressure
+ text : pressure > 0 ? "+" + pressure :
+ pressure
color : Colors.pressuresText
font {
pixelSize : _row.valueSize
weight : Font.Bold
}
- verticalAlignment : Text.AlignVCenter
- horizontalAlignment: Text.AlignRight
+ verticalAlignment : Text.AlignVCenter
+ horizontalAlignment : Text.AlignRight
}
RangeBar { id: _rangeBar
height : barHeight
width : _row.width * 0.60
- anchors.verticalCenter: parent.verticalCenter
+ anchors.verticalCenter : parent.verticalCenter
anchors.verticalCenterOffset: Variables.defaultMargin
rangebar.color : barColor
markerOutRangeNotify: _root.valueOutRangeNotify
- color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color
+ color : valueOutRangeNotify ? Colors.backgroundRangeRect :
+ rangebar.color
markerBoundColor : Colors.rangeMarker
Behavior on minimum { NumberAnimation { duration: 1000 } }
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -27,40 +27,44 @@
* \brief Treatment Screen Pressure section
*/
TreatmentSection { id: _root
- property int arterialMinimum : -250//vTreatmentRanges.arterialPressureMonitorMin
- property int arterialMaximum : 0//vTreatmentRanges.arterialPressureMonitorMax
- property int venousMinimum : 40//vTreatmentRanges.venousPressureMonitorMin
- property int venousMaximum : 260//vTreatmentRanges.venousPressureMonitorMax
- property int tmpMinimum : -180 // vTreatmentRanges.tmpPressureMonitorMin
- property int tmpMaximum : 50 // vTreatmentRanges.tmpPressureMonitorMax
+ property int arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin
+ property int arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax
+ property int venousMinimum : vTreatmentRanges.venousPressureMonitorMin
+ property int venousMaximum : vTreatmentRanges.venousPressureMonitorMax
+ property int tmpMinimum : 0//vTreatmentRanges.tmpPressureMonitorMin
+ property int tmpMaximum : 100//vTreatmentRanges.tmpPressureMonitorMax
- property int arterialLowerBound : -169//vTreatmentPressureOcclusion.arterialPressureLimitLowerBound
- property int arterialUpperBound : -48//vTreatmentPressureOcclusion.arterialPressureLimitUpperBound
- property int venousLowerBound : 112//vTreatmentPressureOcclusion.venousPressureLimitLowerBound
- property int venousUpperBound : 212//vTreatmentPressureOcclusion.venousPressureLimitUpperBound
- property int tmpLowerBound : -80 // vTreatmentPressureOcclusion.tmpPressureLimitLowerBound
- property int tmpUpperBound : 20 // vTreatmentPressureOcclusion.tmpPressureLimitUpperBound
+ property int arterialLowerBound : vTreatmentPressureOcclusion.arterialPressureLimitLowerBound
+ property int arterialUpperBound : vTreatmentPressureOcclusion.arterialPressureLimitUpperBound
+ property int venousLowerBound : vTreatmentPressureOcclusion.venousPressureLimitLowerBound
+ property int venousUpperBound : vTreatmentPressureOcclusion.venousPressureLimitUpperBound
+ property int tmpLowerBound : 20//vTreatmentPressureOcclusion.tmpPressureLimitLowerBound
+ property int tmpUpperBound : 80//vTreatmentPressureOcclusion.tmpPressureLimitUpperBound
- property int arterialPressure : -108//vTreatmentPressureOcclusion.arterialPressure
- property int venousPressure : 132//vTreatmentPressureOcclusion.venousPressure
- property int tmpPressure : -30 // vTreatmentPressureOcclusion.tmpPressure
+ property int arterialPressure : vTreatmentPressureOcclusion.arterialPressure
+ property int venousPressure : vTreatmentPressureOcclusion.venousPressure
+ property int tmpPressure : 65//vTreatmentPressureOcclusion.tmpPressure
property bool valueOutRangeNotify : true
- header.title: qsTr("Pressures") + " (" + qsTr("mmHg") + ")"
+ header.title : qsTr("Pressures") + " (" + qsTr("mmHg") + ")"
- contentArea.anchors.topMargin: Variables.defaultMargin
+ contentArea.anchors.topMargin : Variables.defaultMargin
contentItem: Column { id: _column
- spacing: Variables.defaultMargin * 4
- topPadding : Variables.defaultMargin
- leftPadding : Variables.defaultMargin
- rightPadding: Variables.defaultMargin
+ property int cellHeight : Variables.contentHeight / 3
+ property int cellWidth : contentItem.width * 0.75
+ spacing : Variables.defaultMargin * 4
+ topPadding : Variables.defaultMargin
+ leftPadding : Variables.defaultMargin
+ rightPadding : Variables.defaultMargin
+
+
TreatmentPressureComponent { id: _arterialRangeBar
title : qsTr("Arterial:")
- height : Variables.contentHeight / 3
- width : contentItem.width * 0.75
+ height : _column.cellHeight
+ width : _column.cellWidth
barColor : Colors.pressuresArterialBar
minimum : _root.arterialMinimum
@@ -74,8 +78,8 @@
TreatmentPressureComponent { id: _venousRangeBar
title : qsTr("Venous:")
- height : Variables.contentHeight / 3
- width : contentItem.width * 0.75
+ height : _column.cellHeight
+ width : _column.cellWidth
barColor : Colors.pressuresVenousBar
minimum : _root.venousMinimum
@@ -89,8 +93,8 @@
TreatmentPressureComponent { id: _tmpRangeBar
title : qsTr("TMP:")
- height : Variables.contentHeight / 3
- width : contentItem.width * 0.75
+ height : _column.cellHeight
+ width : _column.cellWidth
barColor : Colors.pressuresTmpBar
minimum : _root.tmpMinimum
@@ -111,7 +115,7 @@
}
iconSize : 65
- iconImage.source : "qrc:/images/arrowsExpanding"
+ iconImage.source : "qrc:/images/iArrowsExpanding"
enabled : ! expandingTimer.running
onClicked : {
@@ -121,10 +125,10 @@
}
Timer {
- id: expandingTimer
- interval: 30000 // 30 second expand timer
- repeat: false
- onTriggered: resetAllRangeBars()
+ id : expandingTimer
+ interval : 30000 // 30 second expand timer
+ repeat : false
+ onTriggered : resetAllRangeBars()
}
function expandAllRangeBars() {
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -35,18 +35,18 @@
// if saline started but still is waiting for pump the button is disabled so user won't tap multiple times.
readonly property bool isDisabled : vHDTreatmentStates.sbMaxReached
readonly property bool isWaitPump : vHDTreatmentStates.sbWaitPump
- readonly property string unit : Variables.unitTextFluid
+ readonly property string unit : Variables.unitTextFluid
property int valueDecimal : Variables.salinePrecision
property int valueTarget : vTreatmentSaline.target || vTreatmentAdjustmentSaline.target
- property int valueCumulative: 100// vTreatmentSaline.cumulative
- property int valueDelivered : 30// vTreatmentSaline.delivered
+ property int valueCumulative: vTreatmentSaline.cumulative
+ property int valueDelivered : vTreatmentSaline.delivered
property string buttonText : ( isDisabled || isWaitPump ) ? _private.textStart :
isStarted ? _private.textStop :
_private.textStart
- header.title: qsTr("Saline" )
- header.showEdit: false
+ header.title : qsTr("Saline" )
+ header.showEdit : false
QtObject { id: _private
readonly property string textStart : qsTr("Start Bolus") + "" + textVolumeTarget + "<\b>"
@@ -60,73 +60,70 @@
VTreatmentSaline { id: vTreatmentSaline }
contentItem: Column { id :_content
- spacing : Variables.defaultMargin * 3
+ spacing : Variables.defaultMargin * 3
Text { id: _descriptionText
text : qsTr("Total Saline Delivered")
- height: Variables.contentHeight
+ height : Variables.contentHeight
font.pixelSize : Fonts.fontPixelFluidText
color : Colors.fluidText
horizontalAlignment: Text.AlignHCenter
}
Item { id: _progressBarArea
- height: 30
- width: parent.width - Variables.defaultMargin
+ height : 30
+ width : parent.width - Variables.defaultMargin
ProgressBar { id: _fluidProgressBar
- width: _progressBarArea.width + 10
-
- height : Variables.progressbarFluidHeight * 3
+ width : _progressBarArea.width + 10
+ height : Variables.progressbarFluidHeight * 3
minText.visible : false
maxText.visible : false
marker.visible : false
gradientStart : Colors.progressBarGradientStart
gradientEnd : Colors.progressBarGradientEnd
- maximum : valueCumulative
- value : valueDelivered
- decimal : _root.valueDecimal
- radius: 9
- progressRadius: radius
+ maximum : valueCumulative
+ value : valueDelivered
+ decimal : _root.valueDecimal
+ radius : 9
+ progressRadius : radius
}
Label { id: _valueDelivered
property real value: valueDelivered
anchors {
- verticalCenter: __valueDeliveredUnit.verticalCenter
- right: __valueDeliveredUnit.left
- rightMargin: 5
+ verticalCenter : __valueDeliveredUnit.verticalCenter
+ right : __valueDeliveredUnit.left
+ rightMargin : 5
}
font.pixelSize : 18
font.weight : Font.DemiBold
- text: value
- width: contentWidth
-
+ text : value
+ width : contentWidth
}
Label { id: __valueDeliveredUnit
property real value: 0
anchors {
- bottom: _fluidProgressBar.top
+ bottom : _fluidProgressBar.top
bottomMargin: Variables.defaultMargin
- right: _fluidProgressBar.right
+ right : _fluidProgressBar.right
}
font.pixelSize : 18
- text: _root.unit
- width: contentWidth
+ text : _root.unit
+ width : contentWidth
}
}
TouchRect { id: _startFluidButton
- width : _fluidProgressBar.width
- height: Variables.contentHeight + 10
-
- radius: 9
- text.textFormat: Text.RichText
- text.text: buttonText
- backgroundColor: borderColor
- textColor: Colors.textButton
+ width : _fluidProgressBar.width
+ height : Variables.contentHeight + 10
+ radius : 9
+ text.textFormat : Text.RichText
+ text.text : buttonText
+ backgroundColor : borderColor
+ textColor : Colors.textButton
text.font {
weight : Font.DemiBold
pixelSize : 20
@@ -136,16 +133,15 @@
if ( isStarted ) vTreatmentAdjustmentSaline.doStop () // IN_PROGRESS
}
- layer.enabled: true
- layer.effect: DropShadow {
- id: _dropShadow
+ layer.enabled : true
+ layer.effect : DropShadow { id: _dropShadow
horizontalOffset: 0
- verticalOffset: 3
- radius: 3.0
- samples: 7
- color: "#50000000"
- source: _startFluidButton
- anchors.fill: _startFluidButton
+ verticalOffset : 3
+ radius : 3.0
+ samples : 7
+ color : "#50000000"
+ source : _startFluidButton
+ anchors.fill : _startFluidButton
}
}
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -rcf3ef3656c06ade00b6bc6c09e8e0f858ee1af24 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision cf3ef3656c06ade00b6bc6c09e8e0f858ee1af24)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -31,67 +31,69 @@
property int minimum : 0
property int maximum : vTreatmentTime.time_Total
property int progressValue : vTreatmentTime.time_Elapsed
- property int timeTextValue : 30000//vTreatmentTime.time_Remaining
+ property int timeTextValue : vTreatmentTime.time_Remaining
property bool isRunning : vHDTreatmentStates.txDialysis &&
!( vHDTreatmentStates.sbWaitPump || vHDTreatmentStates.sbRunning )
+ color : "transparent"
+ width : _circle.width
+ height : _circle.height
+
signal clicked()
- color: "transparent"
- width: _circle.width
- height: _circle.height
-
ProgressCircle { id: _circle
- objectName: "circle"
+ objectName : "circle"
+ minimum : _root.minimum
+ maximum : _root.maximum
- minimum: 0//_root.minimum
- maximum: 60//_root.maximum
-
- anchors.fill : parent
- value: 45//_root.progressValue
- thickness : 35
- circle.shadow.color: Colors.mainTreatmentLighterBlue
- circle.fillColor: Colors.mainTreatmentDarkerBlue
- circle.showGradient: _root.isRunning
- circle.runAnimation: _root.isRunning
+ anchors.fill : parent
+ value : _root.progressValue
+ thickness : 35
+ circle.shadow.color : Colors.mainTreatmentLighterBlue
+ circle.fillColor : Colors.mainTreatmentDarkerBlue
+ circle.showGradient : _root.isRunning
+ circle.runAnimation : _root.isRunning
circle.startGradientColor: "#2A5A93"
- color: _root.isRunning ? Colors.borderButton : "#9B864E"
+ color: _root.isRunning ? Colors.borderButton :
+ "#9B864E"
}
TimeText { id: _timeText
objectName: "timeText"
- anchors.centerIn : parent
- anchors.horizontalCenterOffset: -Variables.defaultMargin
- seconds : _root.timeTextValue
- textWeight: Font.Normal
- secsPixelSize: 35
- secondsLeftMargin: 10
+ anchors {
+ centerIn : parent
+ horizontalCenterOffset : -Variables.defaultMargin
+ }
+ seconds : _root.timeTextValue
+ textWeight : Font.Normal
+ secsPixelSize : 35
+ secondsLeftMargin : 10
}
Item { id: _timeTitleRect
objectName: "timeTextRect"
anchors {
horizontalCenter: _root.horizontalCenter
- bottom: _timeText.top
- bottomMargin: Variables.defaultMargin * 2
+ bottom : _timeText.top
+ bottomMargin : Variables.defaultMargin * 2
}
- width : _root.width
+ width : _root.width
Text { id: _timeTitle
- objectName: "timeTitle"
- text: qsTr("Time Remaining")
+ objectName : "timeTitle"
+ text : qsTr("Time Remaining")
anchors {
horizontalCenter: parent.horizontalCenter
}
- font.pixelSize: 26
- font.weight: Font.Normal
- color: Colors.textMain
+ font.pixelSize : 26
+ font.weight : Font.Normal
+ color : Colors.textMain
}
TreatmentSectionIcon { id : _editTimeIcon
@@ -103,45 +105,42 @@
}
iconSize : 30
iconImage.source : "qrc:/images/iEdit"
- onClicked : _root.isRunning = ! _root.isRunning // REMOVE Testing***********8
-// onClicked : _root.clicked()
+ onClicked : _root.clicked()
}
}
NotificationBarSmall { id: _notification
objectName: "notification"
anchors {
- left: _timeTitleRect.left
- leftMargin: Variables.defaultMargin
- top: _timeTitleRect.bottom
- topMargin: Variables.defaultMargin * 2
+ left : _timeTitleRect.left
+ leftMargin : Variables.defaultMargin
+ top : _timeTitleRect.bottom
+ topMargin : Variables.defaultMargin * 2
}
- visible : ! _root.isRunning
- height : 25
- color: "transparent"
- image.width: 25
- image.height: 25
+ visible : ! _root.isRunning
+ height : 25
+ color : "transparent"
+ image.width : 25
+ image.height : 25
image.anchors.topMargin: 4
-
- imageSource : "qrc:/images/iPauseOrange"
- text : qsTr("Treatment Paused")
- textColor : "#FFB836"
- textfontSize: 26
- textfontWeight: Font.Medium
+ imageSource : "qrc:/images/iPauseOrange"
+ text : qsTr("Treatment Paused")
+ textColor : "#FFB836"
+ textfontSize : 26
+ textfontWeight : Font.Medium
}
layer.enabled: true
- layer.effect: DropShadow {
- id: _dropShadow
+ layer.effect: DropShadow { id: _dropShadow
horizontalOffset: 0
- verticalOffset: 5
- radius: 3.0
- samples: 7
- color: "#50000000"
- source: _root
- anchors.fill: _root
+ verticalOffset : 5
+ radius : 3.0
+ samples : 7
+ color : "#50000000"
+ source : _root
+ anchors.fill : _root
}
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -28,9 +28,9 @@
*/
TreatmentSection { id: _root
- readonly property real minimum : 0//vTreatmentUltrafiltration.minimum
- readonly property real maximum : 2.00//vTreatmentUltrafiltration.maximum
- readonly property real value : 1.0//vTreatmentUltrafiltration.ultrafiltration_RefUFVol
+ readonly property real minimum : vTreatmentUltrafiltration.minimum
+ readonly property real maximum : vTreatmentUltrafiltration.maximum
+ readonly property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol
readonly property int topTextFontSize : 25
readonly property int bottomTextFontSize : 60
@@ -46,38 +46,41 @@
leftPadding : Variables.defaultMargin
Column { id: _leftColumn
- spacing : Variables.defaultMargin * 7
+ spacing : Variables.defaultMargin * 7
width : contentItem.width * 0.2
height : _root.height
LabelValue { id: _ufVolume
- height: 40
- width: contentItem.width * 0.2
- topTextFont.pixelSize: topTextFontSize
- topTextFont.weight: Font.Medium
- topText: qsTr("UF Volume")
- bottomText: "1.00"// TODO
+ height : 40
+ width : contentItem.width * 0.2
+
+ topText : qsTr("UF Volume")
+ topTextFont.pixelSize : topTextFontSize
+ topTextFont.weight : Font.Medium
+
+ bottomText : "1.00"// TODO
bottomTextFont.pixelSize: bottomTextFontSize
- bottomTextFont.weight: Font.Normal
- showCenterText: true
- leftAlign: true
- centerText: "Isolated UF" // TODO
- unitText: Variables.unitVolume
+ bottomTextFont.weight : Font.Normal
+ showCenterText : true
+ leftAlign : true
+ centerText : "Isolated UF" // TODO
+ unitText : Variables.unitVolume
}
LabelValue { id: _ufRate
- height: 40
- width: contentItem.width * 0.2
- topTextFont.pixelSize: topTextFontSize
- topTextFont.weight: Font.Medium
- topText: qsTr("UF Rate")
- bottomText: vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate.toFixed(0)
- bottomTextFont.pixelSize: bottomTextFontSize
+ height : 40
+ width : contentItem.width * 0.2
- bottomTextFont.weight: Font.Normal
- leftAlign: true
- unitText: Variables.unitTextRate
- bottomTextTopMargin: Variables.defaultMargin
+ topText : qsTr("UF Rate")
+ topTextFont.pixelSize : topTextFontSize
+ topTextFont.weight : Font.Medium
+
+ bottomText : vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate.toFixed(0)
+ bottomTextFont.pixelSize: bottomTextFontSize
+ bottomTextFont.weight : Font.Normal
+ leftAlign : true
+ unitText : Variables.unitTextRate
+ bottomTextTopMargin : Variables.defaultMargin
}
}
@@ -86,7 +89,6 @@
width : contentItem.width
height : _root.height
-
ProgressBarEx { id: _progressbarex
enabled : ! isSBInProgress
width : contentItem.width * 0.6
@@ -98,14 +100,14 @@
value : _root.value
valueEx : 0
unitText: Variables.unitVolume
- marker.handle.width: 12
+ marker.handle.width : 12
marker.handle.height: marker.handle.width
marker.text.anchors {
- bottom: marker.handle.top
+ bottom : marker.handle.top
bottomMargin: 10
- right: marker.handle.right
+ right : marker.handle.right
// center align text above handle until about 75% through progress bar then right align to not cut off value
- rightMargin: (_root.value / (_root.maximum - _root.minimum)) > 0.75 ? 0 : -Variables.defaultMargin * 3
+ rightMargin : (_root.value / (_root.maximum - _root.minimum)) > 0.75 ? 0 : -Variables.defaultMargin * 3
}
gradientStart : "#2184FA"
@@ -133,14 +135,14 @@
Text { id: _volumeRemovedText
anchors {
- top: parent.bottom
- topMargin: Variables.defaultMargin * 2.5
- right: parent.right
+ top : parent.bottom
+ topMargin : Variables.defaultMargin * 2.5
+ right : parent.right
}
- text: qsTr("Volume Removed")
- color: Colors.textTextRectLabel
- font.pixelSize: 20
- font.weight: Font.Medium
+ text : qsTr("Volume Removed")
+ color : Colors.textTextRectLabel
+ font.pixelSize : 20
+ font.weight : Font.Medium
}
Behavior on marker.text.anchors.rightMargin { NumberAnimation {duration: 200} }
@@ -156,16 +158,16 @@
rightMargin : Variables.defaultMargin * 2
}
- width : 250
- height : 60
- radius : height
- text.text: ufButtonText
- backgroundColor: Colors.backgroundMain
- borderColor : backgroundColor
- textColor: ufButtonColor
+ width : 250
+ height : 60
+ radius : height
+ text.text : ufButtonText
+ backgroundColor : Colors.backgroundMain
+ borderColor : backgroundColor
+ textColor : ufButtonColor
text.font {
- weight: Font.DemiBold
- pixelSize : 20
+ weight : Font.DemiBold
+ pixelSize : 20
}
onPressed : {
// TODO
Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -r1ce1716e378804663a3b8d8e8257b7b72d364006 -r7caa737179a8c31825ae6445f593ac7ff5f95080
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 1ce1716e378804663a3b8d8e8257b7b72d364006)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
@@ -29,44 +29,44 @@
TreatmentSection { id: _root
readonly property string bloodSDSeparator: "/"
- header.title: qsTr("Vitals" )
- contentArea.anchors.topMargin: 0
+ header.title : qsTr("Vitals" )
+ contentArea.anchors.topMargin : 0
contentItem: Column { id: _content
- spacing : Variables.defaultMargin * 4.5
+ spacing : Variables.defaultMargin * 4.5
LabelValue { id: _bloodPressure
- height: 40
- width: contentItem.width
- topTextFont.pixelSize: Fonts.fontPixelVitals
- topTextFont.weight: Font.Bold
- topText: Variables.notSetVariable(vTreatmentVitals.systolic, 2) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2)
- bottomText: Variables.unitTextBloodPressure
+ height : 40
+ width : contentItem.width
+ topTextFont.pixelSize : Fonts.fontPixelVitals
+ topTextFont.weight : Font.Bold
+ topText : Variables.notSetVariable(vTreatmentVitals.systolic, 2) + bloodSDSeparator + Variables.notSetVariable(vTreatmentVitals.diastolic, 2)
+ bottomText : Variables.unitTextBloodPressure
bottomTextFont.pixelSize: 20
- bottomTextFont.weight: Font.Light
- bottomTextTopMargin: 10
+ bottomTextFont.weight : Font.Light
+ bottomTextTopMargin : 10
}
LabelValue { id: _heartBeat
- height: 45
- width: contentItem.width
- topTextFont.pixelSize: Fonts.fontPixelVitals
- topTextFont.weight: Font.Bold
- topText: Variables.notSetVariable(vTreatmentVitals.heartRate, 2)
- bottomText: Variables.unitTextHeartBeat
+ height : 45
+ width : contentItem.width
+ topTextFont.pixelSize : Fonts.fontPixelVitals
+ topTextFont.weight : Font.Bold
+ topText : Variables.notSetVariable(vTreatmentVitals.heartRate, 2)
+ bottomText : Variables.unitTextHeartBeat
bottomTextFont.pixelSize: 20
- bottomTextFont.weight: Font.Light
- bottomTextTopMargin: 10
+ bottomTextFont.weight : Font.Light
+ bottomTextTopMargin : 10
}
Text { id: _lastRecorded
- height: 30
- width: contentItem.width
- text: qsTr("Last Recorded: " )
- font.pixelSize: 18
- font.weight: Font.Normal
- verticalAlignment: Text.AlignBottom
- color : Colors.textMain
+ height : 30
+ width : contentItem.width
+ text : qsTr("Last Recorded: " )
+ font.pixelSize : 18
+ font.weight : Font.Normal
+ verticalAlignment : Text.AlignBottom
+ color : Colors.textMain
}
}