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} } } } }