Index: sources/gui/qml/components/Circle.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/components/Circle.qml (.../Circle.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/components/Circle.qml (.../Circle.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -88,7 +88,7 @@ source: _shape gradient: Gradient { - GradientStop { position: 0.4; color: showGradient ? _root.startGradientColor :_root.color } + GradientStop { position: 0.0; color: showGradient ? _root.startGradientColor :_root.color } GradientStop { position: 1.0; color: _root.color } } } Index: sources/gui/qml/components/LabelValue.qml =================================================================== diff -u -rdb6925e589ca85f2272af31d5f90f41452b342a7 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) +++ sources/gui/qml/components/LabelValue.qml (.../LabelValue.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -38,11 +38,13 @@ Text { id: _centerText anchors { top : _topText.bottom + topMargin: 10 left : _topText.left } text: _root.centerText color: topTextColor font.pixelSize: 20 + font.weight: Font.Light } Text { id: _bottomText Index: sources/gui/qml/components/NotificationBarSmall.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -25,13 +25,15 @@ Rectangle { id: _root objectName: "NotificationBar" // SquishQt + property alias image : _image property alias imageSource : _image.source property bool imageAutoSize : false property bool imageAnimated : false property alias text : _text.text property alias textColor : _text.color property alias textfontSize : _text.font.pixelSize + property alias textfontWeight : _text.font.weight property alias rowAnchors : _row.anchors property int level : 0 Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -35,6 +35,7 @@ property alias marker : _marker property alias markerHeight : _marker.height + property string unitText : "" property alias decimal : _root.decimal property alias minimum : _root.minimum @@ -76,6 +77,7 @@ height : Variables.rangeMarkerHeight hasHandle : true + unitText : _root.unitText decimal : _root.decimal value : _root.value Index: sources/gui/qml/components/RangeBar.qml =================================================================== diff -u -r526fb054edbbeebdcce33ca630ae08ba04067fac -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 526fb054edbbeebdcce33ca630ae08ba04067fac) +++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -31,6 +31,7 @@ property int upperBound : 0 property alias rangebar : _rangeRect + property alias marker : _rangeMarkerValue QtObject { id: _private property int val : isOutLower ? min : isOutUpper ? max : value Index: sources/gui/qml/components/RangeMarker.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/components/RangeMarker.qml (.../RangeMarker.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/components/RangeMarker.qml (.../RangeMarker.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -28,11 +28,13 @@ property int decimal : 0 property alias text : _textValue + property alias handle : _handle property alias font : _textValue.font property color color : Colors.rangeMarker property alias thickness : _root.width property alias hasHandle : _handle.visible property bool valueOnTop : false + property string unitText : "" height: parent.height width : Variables.rangeMarkerWidth @@ -73,10 +75,11 @@ right : parent.left top : valueOnTop ? undefined : parent.top bottom : valueOnTop ? _handle.top : undefined - rightMargin: valueOnTop ? -8 : 5 + bottomMargin: valueOnTop ? 5 : 0 + rightMargin: valueOnTop ? -12 : 5 topMargin : valueOnTop ? 0 : -5 } color : _root.color - text : value.toFixed(decimal) + text : value.toFixed(decimal) + " " + unitText } } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -132,7 +132,7 @@ readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 - readonly property int ultraFiltrationProgressBarHeight : 30 + readonly property int ultraFiltrationProgressBarHeight : 25 readonly property int ultraFiltrationEditSliderHeight : sliderDefaultBodyHeight // to be consistent with other sliders readonly property int silenceIconMargin : 10 Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -42,9 +42,9 @@ 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 + readonly property int cellHeight: _root.height / 2 - Variables.notificationHeight - Variables.defaultMargin // = screen height / # rows - header bar - onLogVitalTime: _vitalsTreatmentArea.updateVitalTime() + onLogVitalTime: _treatmentVitals.updateVitalTime() AutoHideInfo { id: _lockDialog objectName : "lockDialog" @@ -64,7 +64,7 @@ width : height radius : height color: "transparent" - border.color: treatmentFlows.editEnabled ? "#6697D2" : + border.color: _treatmentFlows.editEnabled ? "#6697D2" : "#A47E38" border.width: 3 @@ -75,7 +75,7 @@ height : 80 width : 80 fillMode: Image.PreserveAspectFit - source : treatmentFlows.editEnabled ? "qrc:/images/iUnlock" : + source : _treatmentFlows.editEnabled ? "qrc:/images/iUnlock" : "qrc:/images/iLock" } @@ -84,7 +84,7 @@ anchors.centerIn: parent color: "transparent" - border.color: treatmentFlows.editEnabled ? "#8FC1FE" : + border.color: _treatmentFlows.editEnabled ? "#8FC1FE" : "#CDAF78" border.width: 2 height: parent.height - 20 @@ -118,14 +118,14 @@ onClicked: sectionTimeClicked() } - TreatmentSaline { id: treatmentSaline + TreatmentSaline { id: _treatmentSaline objectName: "treatmentSaline" width: cellWidth + Variables.defaultMargin height: cellHeight } - TreatmentVitals { id: treatmentVitals + TreatmentVitals { id: _treatmentVitals objectName: "treatmentVitals" width: cellWidth + Variables.defaultMargin @@ -151,7 +151,7 @@ } } - TreatmentPressures { id: treatmentPressures + TreatmentPressures { id: _treatmentPressures objectName: "treatmentPressures" width: (cellWidth * 3) - (Variables.defaultMargin * 2) // without auto layouts needs to fine tune @@ -166,15 +166,15 @@ spacing: Variables.defaultMargin height: cellHeight - TreatmentUltrafiltration { id: treatmentUltrafiltration; + TreatmentUltrafiltration { id: _treatmentUltrafiltration; objectName: "treatmentUltrafiltration" width: cellWidth * 3 height: cellHeight onEditClicked : sectionUltrafiltrationClicked() } - TreatmentFlows { id: treatmentFlows + TreatmentFlows { id: _treatmentFlows objectName: "treatmentFlows" width: cellWidth * 4 Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 - +import QtGraphicalEffects 1.12 import "qrc:/globals" import "qrc:/components" import "qrc:/pages/treatment" @@ -49,4 +49,15 @@ contentItem: _root.contentItem } + +// DropShadow { +// anchors.fill: _root +// source: _root + +// horizontalOffset: 0 +// verticalOffset: 5 +// radius: 3.0 +// samples: 7 +// color: "#3F000000" +// } } Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -43,7 +43,11 @@ } text: title - font.pixelSize: 30 + font { + pixelSize: 30 + weight: Font.Medium + } + color: Colors.textTextRectLabel } TreatmentSectionIcon { id : _lockButton Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -rdb6925e589ca85f2272af31d5f90f41452b342a7 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision db6925e589ca85f2272af31d5f90f41452b342a7) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -14,12 +14,13 @@ property string title : "" property string value : "" property string unitText : "" + property string extraText : "" property bool showButtons : true property bool buttonsEnabled: true property int iconSize : 70 - color: Colors.treatmentFlowComponent + color: Colors.mainTreatmentLighterBlue radius: 5 signal increment @@ -29,9 +30,10 @@ objectName: "title" anchors { - horizontalCenter : _root.horizontalCenter - top : parent.top - topMargin : Variables.defaultMargin + horizontalCenter : _root.horizontalCenter + horizontalCenterOffset : Variables.defaultMargin * 1.5 + top : parent.top + topMargin : Variables.defaultMargin } font { @@ -43,22 +45,25 @@ height : Variables.contentHeight text : _root.title color : Colors.pressuresText - horizontalAlignment : Text.AlignHCenter + horizontalAlignment : Text.AlignLeft } Row { id: _row objectName: "row" anchors { top : _title.bottom - topMargin : Variables.defaultMargin horizontalCenter : _root.horizontalCenter } LabelValue { id: _value objectName: "value" + anchors { + top: parent.top + topMargin : Variables.defaultMargin + } height: 50 - width: 150//_root.width + width: 150 topTextFont.pixelSize: 60 topTextFont.weight: Font.Medium topText: value @@ -71,7 +76,7 @@ objectName: "column" visible: showButtons - spacing: Variables.defaultMargin * 2 + spacing: Variables.defaultMargin TreatmentSectionIcon { id : _upArrowIcon objectName: "upArrowIcon" @@ -92,4 +97,26 @@ } } } + + Text { id: _extraText + objectName: "extraText" + + anchors { + left : _root.left + leftMargin : Variables.defaultMargin * 3 + bottom : _root.bottom + bottomMargin : 10 + } + + font { + pixelSize : 28 + weight : Font.Bold + } + + text : _root.extraText + width : 40 + height : Variables.contentHeight + color : "orange" + horizontalAlignment : Text.AlignHCenter + } } Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -17,46 +17,51 @@ property color barColor : Colors.backgroundRangeRect property bool valueOutRangeNotify : true - property int barHeight : 20 + property int barHeight : 15 property int titleSize : 35 - property int valueSize : 60 + property int valueSize : 70 property int prevMaximum : _rangeBar.maximum property int prevMinimum : _rangeBar.minimum - spacing: Variables.defaultMargin * 2 + spacing: Variables.defaultMargin Text { id: _title - width : 100 + width : 200 height : 50 color : Colors.pressuresText font { pixelSize : _row.titleSize - weight : Font.DemiBold + weight : Font.Medium } verticalAlignment : Text.AlignVCenter } Text { id: _value - width : 100 + width : 50 height : 50 - text : pressure + text : pressure > 0 ? "+" + pressure : pressure color : Colors.pressuresText font { pixelSize : _row.valueSize weight : Font.Bold } verticalAlignment : Text.AlignVCenter + horizontalAlignment: Text.AlignRight } RangeBar { id: _rangeBar height : barHeight width : _row.width * 0.60 anchors.verticalCenter: parent.verticalCenter + anchors.verticalCenterOffset: Variables.defaultMargin rangebar.color : barColor markerOutRangeNotify: _root.valueOutRangeNotify color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color markerBoundColor : Colors.rangeMarker + marker.text.anchors { + + } } function expandRangeBar() { Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -27,22 +27,22 @@ * \brief Treatment Screen Pressure section */ TreatmentSection { id: _root - property int arterialMinimum : vTreatmentRanges.arterialPressureMonitorMin - property int arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax - property int venousMinimum : vTreatmentRanges.venousPressureMonitorMin - property int venousMaximum : vTreatmentRanges.venousPressureMonitorMax + 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 arterialLowerBound : vTreatmentPressureOcclusion.arterialPressureLimitLowerBound - property int arterialUpperBound : vTreatmentPressureOcclusion.arterialPressureLimitUpperBound - property int venousLowerBound : vTreatmentPressureOcclusion.venousPressureLimitLowerBound - property int venousUpperBound : vTreatmentPressureOcclusion.venousPressureLimitUpperBound + 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 arterialPressure : vTreatmentPressureOcclusion.arterialPressure - property int venousPressure : vTreatmentPressureOcclusion.venousPressure + property int arterialPressure : -108//vTreatmentPressureOcclusion.arterialPressure + property int venousPressure : 132//vTreatmentPressureOcclusion.venousPressure property int tmpPressure : -30 // vTreatmentPressureOcclusion.tmpPressure property bool valueOutRangeNotify : true Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -49,8 +49,8 @@ header.showEdit: false QtObject { id: _private - readonly property string textStart : qsTr("START BOLUS") + textVolumeTarget - readonly property string textStop : qsTr("STOP BOLUS" ) + textVolumeTarget + readonly property string textStart : qsTr("Start Bolus") + textVolumeTarget + readonly property string textStop : qsTr("Stop Bolus" ) + textVolumeTarget readonly property string textVolumeTarget : " (" + valueTarget + unit + ")" readonly property string mesgDisabled : qsTr("Maximum cumulative saline bolus volume delivered") readonly property string mesgWaitForPump : "" // qsTr("Saline Bolus is starting") // Not sure if we shouls show any message at this point @@ -98,7 +98,7 @@ right: __valueDeliveredUnit.left rightMargin: 5 } - font.pixelSize : Fonts.fontPixelFluidText + font.pixelSize : 18//Fonts.fontPixelFluidText font.weight : Font.DemiBold text: value width: contentWidth @@ -112,7 +112,7 @@ bottomMargin: Variables.defaultMargin right: _fluidProgressBar.right } - font.pixelSize : Fonts.fontPixelFluidText + font.pixelSize : 18//Fonts.fontPixelFluidText text: _root.unit width: contentWidth } @@ -126,10 +126,10 @@ text.text: buttonText backgroundColor: borderColor - textColor: isDisabled || isWaitPump ? Colors.textButton : Colors.textDisableButton + textColor: Colors.textButton text.font { - weight: Font.DemiBold - pixelSize : 16 + weight : Font.DemiBold + pixelSize : 20 } onPressed : { if ( isIdle ) vTreatmentAdjustmentSaline.doStart() // IDLE Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -54,16 +54,15 @@ circle.showGradient: _root.isRunning circle.runAnimation: _root.isRunning circle.startGradientColor: "#2A5A93" -// circle.opacity: 0 color: _root.isRunning ? Colors.borderButton : "#9B864E" } TimeText { id: _timeText objectName: "timeText" anchors.centerIn : parent + anchors.horizontalCenterOffset: -Variables.defaultMargin seconds : _root.timeTextValue - secondsVisible: _root.isRunning textWeight: Font.Normal secsPixelSize: 35 secondsLeftMargin: 10 @@ -114,17 +113,21 @@ left: _timeTitleRect.left leftMargin: Variables.defaultMargin top: _timeTitleRect.bottom - topMargin: Variables.defaultMargin + topMargin: Variables.defaultMargin * 2 } 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 } } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r7805806e4370be4d9207872e916f478875bd4ba6 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 7805806e4370be4d9207872e916f478875bd4ba6) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -28,36 +28,37 @@ */ TreatmentSection { id: _root - readonly property real minimum : vTreatmentUltrafiltration.minimum - readonly property real maximum : vTreatmentUltrafiltration.maximum - readonly property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol - readonly property int topTextFontSize : 30 - readonly property int bottomTextFontSize : 72 + 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 int topTextFontSize : 25 + readonly property int bottomTextFontSize : 60 property string ufButtonText : qsTr("Isolated UF in Progress") // TODO property color ufButtonColor : "#C3F9FF" // TODO header.title: qsTr("Ultrafiltration") + " (" + qsTr("UF") + ")" + contentArea.anchors.topMargin: Variables.defaultMargin contentItem: Row { id: _row spacing : Variables.defaultMargin * 6 rightPadding: Variables.defaultMargin leftPadding : Variables.defaultMargin Column { id: _leftColumn - spacing : Variables.defaultMargin * 6 + 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.Normal + topTextFont.weight: Font.Medium topText: qsTr("UF Volume") bottomText: "1.00"// TODO bottomTextFont.pixelSize: bottomTextFontSize - bottomTextFont.weight: Font.DemiBold + bottomTextFont.weight: Font.Normal showCenterText: true leftAlign: true centerText: "Isolated UF" // TODO @@ -68,33 +69,44 @@ height: 40 width: contentItem.width * 0.2 topTextFont.pixelSize: topTextFontSize - topTextFont.weight: Font.Normal + topTextFont.weight: Font.Medium topText: qsTr("UF Rate") bottomText: vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate.toFixed(0) bottomTextFont.pixelSize: bottomTextFontSize - bottomTextFont.weight: Font.DemiBold + bottomTextFont.weight: Font.Normal leftAlign: true unitText: Variables.unitTextRate + bottomTextTopMargin: Variables.defaultMargin } } Column { id: _rightColumn - topPadding : Variables.defaultMargin * 7 + topPadding : Variables.defaultMargin * 9.5 width : contentItem.width height : _root.height ProgressBarEx { id: _progressbarex enabled : ! isSBInProgress width : contentItem.width * 0.6 - height : Variables.ultraFiltrationProgressBarHeight + height : 20 decimal : Variables.ultrafiltrationPrecision minimum : _root.minimum maximum : _root.maximum value : _root.value valueEx : 0 + unitText: Variables.unitVolume + marker.handle.width: 12 + marker.handle.height: marker.handle.width + marker.text.anchors { + bottom: marker.handle.top + bottomMargin: 10 + 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 + } gradientStart : "#2184FA" gradientEnd : "#67ACFF" @@ -122,14 +134,16 @@ Text { id: _volumeRemovedText anchors { top: parent.bottom - topMargin: Variables.defaultMargin * 2 + topMargin: Variables.defaultMargin * 2.5 right: parent.right } text: qsTr("Volume Removed") color: Colors.textTextRectLabel - font.pixelSize: topTextFontSize + font.pixelSize: 20 font.weight: Font.Medium } + + Behavior on marker.text.anchors.rightMargin { NumberAnimation {duration: 200} } } } } Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml =================================================================== diff -u -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 -rdff9d50ebfa80ec99313586e1d48662b72940d24 --- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) +++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) @@ -30,9 +30,10 @@ readonly property string bloodSDSeparator: " / " header.title: qsTr("Vitals" ) + contentArea.anchors.topMargin: Variables.defaultMargin contentItem: Column { id: _content - spacing : Variables.defaultMargin * 4 + spacing : Variables.defaultMargin * 4.5 LabelValue { id: _bloodPressure height: 40 @@ -41,6 +42,9 @@ 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 } LabelValue { id: _heartBeat @@ -50,14 +54,17 @@ topTextFont.weight: Font.Bold topText: Variables.notSetVariable(vTreatmentVitals.heartRate, 2) bottomText: Variables.unitTextHeartBeat + bottomTextFont.pixelSize: 20 + bottomTextFont.weight: Font.Light + bottomTextTopMargin: 10 } Label { id: _lastRecorded height: 30 width: contentItem.width text: qsTr("Last Recorded: " ) font.pixelSize: 18 - font.weight: Font.Light + font.weight: Font.Normal verticalAlignment: Text.AlignBottom } }