Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -r2212e8c9ca6b34c7a75fa2b835b28be1199c8c20 -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 2212e8c9ca6b34c7a75fa2b835b28be1199c8c20) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -28,7 +28,6 @@ property alias progress : _progressRect property int progressWidth : _progressRect.width property alias value : _progressRect.value - property alias progressRadius : _progressRect.radius property alias color : _progressRect.color property alias bgColor : _root.color @@ -62,6 +61,7 @@ minimum : _root.minimum maximum : _root.maximum value : _root.value + radius : _root.radius onClicked : progressClicked() } Index: sources/gui/qml/components/StoppedSlider.qml =================================================================== diff -u -r3da1e6ce80a0edef25d2ade3da094e18791f3553 -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/components/StoppedSlider.qml (.../StoppedSlider.qml) (revision 3da1e6ce80a0edef25d2ade3da094e18791f3553) +++ sources/gui/qml/components/StoppedSlider.qml (.../StoppedSlider.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -38,9 +38,6 @@ signal pressed () signal released() - height : Variables.createTreatmentSliderHeight - width : Variables.createTreatmentSliderWidth - function reset(vValue) { _slider.reset(vValue) } @@ -77,13 +74,15 @@ pixelSize : Fonts.fontPixelButton weight : Font.Normal } + color : Colors.progressBarMinMax text : _root.minimum.toFixed(_root.decimal) + (_root.unit.length ? (" " + _root.unit) : "") } maxText { font { pixelSize : minText.font.pixelSize weight : minText.font.weight } + color : Colors.progressBarMinMax text : _root.maximum.toFixed(_root.decimal) + (_root.unit.length ? (" " + _root.unit) : "") } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r4746b6bcbf4def7888f7b29d72431b28e6672f12 -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 4746b6bcbf4def7888f7b29d72431b28e6672f12) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -150,6 +150,7 @@ readonly property color ufProgressBarFill : "#467bbe" readonly property color ufAdjustmentDeltaFill : "#747974" readonly property color ufAdjustmentProgressBarBg : "#2c517b" + readonly property color progressBarMinMax : "#c7c7c7" // ---------- < PRS > Related Section ---------- // Alarm priority colors Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -rde68fcc0e2885ef78670ce8edf5e10f88b705d8d -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision de68fcc0e2885ef78670ce8edf5e10f88b705d8d) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -69,15 +69,10 @@ readonly property int fontPixelCirclProgressTimeSmall : 32 readonly property int fontPixelCirclProgressTimeNormal : 90 + readonly property int fontPixelUltrafiltrationAdjustmentMetrics : 32 readonly property int fontPixelUltrafiltrationAdjustmentButton : 26 - readonly property int fontPixelUltrafiltrationAdjustmentButtonL : 30 - readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : fontPixelUltrafiltrationAdjustmentButton - readonly property int fontPixelUltrafiltrationAdjustmentResumeButton : fontPixelUltrafiltrationAdjustmentButtonL - readonly property int fontPixelUltrafiltrationAdjustmentEditButton : fontPixelUltrafiltrationAdjustmentButtonL - readonly property int fontPixelUltrafiltrationAdjustmentNextButton : fontPixelUltrafiltrationAdjustmentButton - readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : fontPixelUltrafiltrationAdjustmentButton - readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 readonly property int fontPixelUltrafiltrationAdjustmentNotification : 32 + readonly property int fontPixelUltrafiltrationAdjustmentConfirmation : 50 readonly property int fontPixelUltrafiltrationRangeMarker : 32 readonly property int fontPixelUltrafiltrationRateUnit : 16 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r4746b6bcbf4def7888f7b29d72431b28e6672f12 -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 4746b6bcbf4def7888f7b29d72431b28e6672f12) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -87,8 +87,8 @@ readonly property int rangeMarkerWidthMidle : 3 readonly property int progressbarHeight : 30 - readonly property int progressbarHandler : 30 - readonly property int progressbarHandlerBorderWidth : 4 + readonly property int progressbarHandler : 40 + readonly property int progressbarHandlerBorderWidth : 3 readonly property int progressbarRectMargin : 0 // default as 0 to avoid progressRect having a thicker border than slider body readonly property int progressbarFluidHeight : 5 @@ -147,8 +147,10 @@ readonly property int ultraFiltrationEditSliderHeight : sliderDefaultBodyHeight // to be consistent with other sliders readonly property int ultrafiltrationButtonWidth : 300 readonly property int ultrafiltrationButtonHeight : 60 + readonly property int ultrafiltrationButtonBottomMargin : 60 readonly property int ultrafiltrationRangeMarkerWidth : 4 readonly property int ultrafiltrationRangeMarkerHandleWidth : 12 + readonly property int ultrafiltrationContentMargin : 200 readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -ra6ad83a73eb80978261a408ee5a92fbc8f7faa4e -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision a6ad83a73eb80978261a408ee5a92fbc8f7faa4e) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -70,11 +70,14 @@ close() _treatmentAdjustmentUltrafiltrationStart.open() } - onNextClicked : { + onContinueClicked : function(vVolume) { + close() + _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vVolume + _treatmentAdjustmentUltrafiltrationConfirm.open() // send Volume to HD and wait. // if accepted close() // not accepted show error in notification - vTreatmentAdjustmentUltrafiltrationEdit.doAdjustment(vVolume) + // vTreatmentAdjustmentUltrafiltrationEdit.doAdjustment(vVolume) } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -reecf28d1c27df3f060b6d671f209016ad62b594c -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision eecf28d1c27df3f060b6d671f209016ad62b594c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -75,7 +75,7 @@ text: titleText font { pixelSize: Fonts.fontPixelTitle - weight: Font.DemiBold + weight: Font.Medium } color: Colors.textMain width: contentWidth Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -30,16 +30,13 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationConfirm" //SquishQt testability + property real ultrafiltrationVolume : 0.000 + property real ultrafiltrationRate : 0.000 + QtObject { id: _private property int decimalVolume: Variables.ultrafiltrationPrecision property int decimalRate : 0 } - property real ultrafiltrationVolume : 0.000 - property int treatmentDuration : 0 - property int treatmentDurationDiff : 0 - property real ultrafiltrationRate : 0.000 - property real ultrafiltrationRateDiff : 0.000 - property real ultrafiltrationRateOld : 0.000 signal confirmRateClicked (real vVolume) signal confirmDurationClicked(real vVolume) @@ -49,107 +46,133 @@ backVisible : true information { - visible : true && information.text && ! notification.visible - imageSource : ufInfoImageSource - text : ufInfoText + visible : true && information.text && ! notification.visible + imageSource : ufInfoImageSource + text : ufInfoText + radius : 0 + color : Colors.ufNotificationBarBg + textColor : Colors.ufVolumeGoalText + textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification + textfontWeight : Font.Medium } - titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + Variables.unitTextUltrafiltrationVolume + titleText : qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume - function reset() { - _rateAdjustmentButton.selected = false - _durationAdjustmentButton.selected = false - } - - TitleText { id : _titleText - text: qsTr("To confirm new UF Volume (%1),\nselect a treatment adjustment:") - .arg(ultrafiltrationVolume.toFixed(_private.decimalVolume)) - font.pixelSize: Fonts.fontPixelTitle - color: Colors.textMain - height: Variables.mainMenuHeight + Item { id: _contentArea anchors { - top: parent.top - topMargin: 100 - horizontalCenter: parent.horizontalCenter + top : parent.top + bottom : _confirmButton.top + left : parent.left + right : parent.right } - } - TouchRect { id: _confirmButton - width : 530 - height : 70 - anchors { - bottom: parent.bottom - bottomMargin: 85 - horizontalCenter: parent.horizontalCenter - } - isDefault : true - enabled : _rateAdjustmentButton.selected || _durationAdjustmentButton.selected - text { - text: qsTr("CONFIRM") - font.weight: Font.DemiBold - font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentConfirmButton - } - onClicked: { - if (_rateAdjustmentButton.selected) { - confirmRateClicked(ultrafiltrationVolume) - return + Row { id: _contentRow + anchors.centerIn: parent + spacing : 150 + + Column { id: _leftContent + spacing: 20 + Text { + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification + weight : Font.Medium + } + color : "white" + text : qsTr("New UF Volume:") + } + + Item { + width : childrenRect.width + height : childrenRect.height + + Text { id: _newUfVolumeValue + width: contentWidth + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentConfirmation + weight : Font.DemiBold + } + horizontalAlignment : Text.AlignVBottom + color : Colors.ufVolumeGoalText + text : _root.ultrafiltrationVolume.toFixed(Variables.ultrafiltrationPrecision) + } + + Text { id: _newUfVolumeUnit + anchors { + left : _newUfVolumeValue.right + verticalCenter : _newUfVolumeValue.verticalCenter + verticalCenterOffset: (_newUfVolumeValue.height - height) * 0.25 + } + font { + pixelSize : _newUfVolumeValue.font.pixelSize * 0.6 + weight : Font.Medium + } + horizontalAlignment : Text.AlignVBottom + color : _newUfVolumeValue.color + text : " " + Variables.unitVolume + } + } } - if (_durationAdjustmentButton.selected) { - confirmDurationClicked(ultrafiltrationVolume) - return + + Column { id: _rightContent + spacing: _leftContent.spacing + Text { + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification + weight : Font.Medium + } + color : "white" + text : qsTr("New UF Rate:") + } + + Item { + width : childrenRect.width + height : childrenRect.height + + Text { id: _newUfRateValue + width: contentWidth + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentConfirmation + weight : Font.DemiBold + } + horizontalAlignment : Text.AlignVCenter + color : Colors.ufVolumeGoalText + text : _root.ultrafiltrationRate.toFixed(Variables.ultrafiltrationPrecision) + } + + Text { id: _newUfRateUnit + anchors { + left : _newUfRateValue.right + verticalCenter : _newUfRateValue.verticalCenter + verticalCenterOffset: (_newUfRateValue.height - height) * 0.25 + } + font { + pixelSize : _newUfVolumeUnit.font.pixelSize + weight : _newUfVolumeUnit.font.weight + } + horizontalAlignment : Text.AlignVCenter + color : _newUfVolumeValue.color + text : " " + Variables.unitTextRate + } + } } - confirmClicked() } } - Row { - spacing: 20 + TouchRect { id: _confirmButton anchors { - top: parent.top - topMargin: 205 + bottom : information.top + bottomMargin : Variables.ultrafiltrationButtonBottomMargin horizontalCenter: parent.horizontalCenter } - UltrafiltrationButton { id: _rateAdjustmentButton - titleString : qsTr("%1 UF Rate") - descriptionString : qsTr("The rate %3 by %1 %2,\nthe treatment duration remains the same.") - .arg(Math.abs(ultrafiltrationRateDiff .toFixed(_private.decimalRate))) - .arg(Variables.unitTextUltrafiltrationRate) - buttonType : UltrafiltrationButton.ButtonType.UltrafiltrationRate - isIncrease : ultrafiltrationRateDiff > 0 - valueText : qsTr( "UF Rate : %1 %2") - .arg(ultrafiltrationRate .toFixed(_private.decimalRate)) - .arg(Variables.unitTextUltrafiltrationRate) - onClicked : { - _durationAdjustmentButton.selected = false - selected = true - } - disabled: ultrafiltrationRate == 0 && ultrafiltrationRateDiff == 0 + width : Variables.ultrafiltrationButtonWidth + height : Variables.ultrafiltrationButtonHeight + isDefault : true + text { + text : qsTr("Confirm") + font.weight : Font.DemiBold + font.pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton } - UltrafiltrationButton { id: _durationAdjustmentButton - titleString : qsTr("%1 Treatment Duration") - descriptionString : qsTr("The rate remains, the treatment\nduration %2 by %1 minutes.") - .arg(Math.abs(treatmentDurationDiff)) - buttonType: UltrafiltrationButton.ButtonType.TreatmentDuration - isIncrease: treatmentDurationDiff > 0 - valueText : qsTr( "UF Rate : %1 %2") - .arg(ultrafiltrationRateOld .toFixed(_private.decimalRate)) - .arg(Variables.unitTextUltrafiltrationRate) - onClicked : { - _rateAdjustmentButton.selected = false - selected = true - } - visible : false - disabled: treatmentDuration == 0 && treatmentDurationDiff == 0 - } + onClicked: confirmClicked() } - - onConfirmClicked: { - _durationAdjustmentButton.selected = false - _rateAdjustmentButton.selected = false - } - onBackClicked: { - _durationAdjustmentButton.selected = false - _rateAdjustmentButton.selected = false - } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r3da1e6ce80a0edef25d2ade3da094e18791f3553 -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 3da1e6ce80a0edef25d2ade3da094e18791f3553) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -34,7 +34,7 @@ property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved } - signal nextClicked(real vVolume) + signal continueClicked(real vVolume) function reset() { _setVolumeSlider.reset(_private.setVolume) @@ -52,7 +52,7 @@ color : Colors.ufNotificationBarBg textColor : Colors.ufVolumeGoalText textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification - textfontWeight : Font.Normal + textfontWeight : Font.Medium } titleText : qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume @@ -67,39 +67,51 @@ volumeRemoved : _private.volumeRemoved } - StoppedSlider { id: _setVolumeSlider + Item { id: _contentArea anchors { - top : _ufMetrics.bottom - topMargin : Variables.ultrafiltrationContentMargin - left : parent.left - leftMargin : 80 - right : parent.right - rightMargin : anchors.leftMargin - horizontalCenter: undefined + top : _ufMetrics.bottom + bottom : _continueButton.top + left : parent.left + leftMargin : 80 + right : parent.right + rightMargin : anchors.leftMargin } - decimal : Variables.ultrafiltrationPrecision - minimum : 0 - minStop : _private.volumeRemoved - maximum : 8 - unit : Variables.unitVolume - step : 0.1 - defaultValue : { defaultValue = _private.setVolume } // set without binding - active : true + + StoppedSlider { id: _setVolumeSlider + anchors { + left : parent.left + right : parent.right + verticalCenter : parent.verticalCenter + } + decimal : Variables.ultrafiltrationPrecision + minimum : 0 + minStop : _private.volumeRemoved + maximum : 8 + unit : Variables.unitVolume + step : 0.1 + defaultValue : { defaultValue = _private.setVolume } // set without binding + active : true + } } TouchRect { id: _continueButton anchors { - top : _setVolumeSlider.bottom - topMargin : 110 + bottom : information.top + bottomMargin : Variables.ultrafiltrationButtonBottomMargin horizontalCenter: parent.horizontalCenter } width : Variables.ultrafiltrationButtonWidth height : Variables.ultrafiltrationButtonHeight text { text : qsTr("Continue") - font.weight : Font.DemiBold + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton + weight : Font.DemiBold + } } isDefault : true - onClicked: nextClicked( _private.valAdjust.toFixed(_private.decimal) ) + enabled : _setVolumeSlider.value.toFixed(_setVolumeSlider.decimal) !== + _private.setVolume.toFixed(_setVolumeSlider.decimal) + onClicked : continueClicked(_setVolumeSlider.value.toFixed(_setVolumeSlider.decimal)) } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationMetrics.qml =================================================================== diff -u -ra6ad83a73eb80978261a408ee5a92fbc8f7faa4e -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision a6ad83a73eb80978261a408ee5a92fbc8f7faa4e) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -32,7 +32,7 @@ TextMetrics { id: _volumeValueMetrics font { - pixelSize : Fonts.fontPixelButton + 8 + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentMetrics weight : Font.DemiBold } text : "0.00" Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r9ec7f25179b96fd06de97ce16888faf4116762c7 -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 9ec7f25179b96fd06de97ce16888faf4116762c7) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -51,7 +51,7 @@ color : Colors.ufNotificationBarBg textColor : Colors.ufVolumeGoalText textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification - textfontWeight : Font.Normal + textfontWeight : Font.Medium } titleText : qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume @@ -66,61 +66,74 @@ volumeRemoved : _private.volumeRemoved } - ProgressBarEx { id: _progressbarex + Item { id: _contentArea anchors { - top : _ufMetrics.bottom - topMargin : Variables.ultrafiltrationContentMargin - left : parent.left - leftMargin : 80 - right : parent.right - rightMargin : anchors.leftMargin + top : _ufMetrics.bottom + bottom : _pauseButton.top + left : parent.left + leftMargin : 80 + right : parent.right + rightMargin : anchors.leftMargin } - height : Variables.ultraFiltrationProgressBarHeight - decimal : Variables.ultrafiltrationPrecision - minimum : _private.minimum - maximum : _private.setVolume - value : _private.volumeRemoved - valueEx : 0 - color : Colors.ufProgressBarFill - bgColor : Colors.ufAdjustmentDeltaFill - minText { - font { - pixelSize : Fonts.fontPixelButton - weight : Font.Normal + + ProgressBarEx { id: _progressbarex + anchors { + left : parent.left + right : parent.right + verticalCenter : parent.verticalCenter } - text : minimum.toFixed(Variables.ultrafiltrationPrecision) + " " + Variables.unitVolume - } - maxText { - font { - pixelSize : minText.font.pixelSize - weight : minText.font.weight + height : Variables.ultraFiltrationProgressBarHeight + decimal : Variables.ultrafiltrationPrecision + minimum : _private.minimum + maximum : _private.setVolume + value : _private.volumeRemoved + valueEx : 0 + color : Colors.ufProgressBarFill + bgColor : Colors.ufAdjustmentDeltaFill + minText { + font { + pixelSize : Fonts.fontPixelButton + weight : Font.Normal + } + color : Colors.progressBarMinMax + text : minimum.toFixed(Variables.ultrafiltrationPrecision) + " " + Variables.unitVolume } - text : _private.setVolume.toFixed(Variables.ultrafiltrationPrecision) + " " + Variables.unitVolume - } - marker { - width : Variables.ultrafiltrationRangeMarkerWidth - handle.width : Variables.ultrafiltrationRangeMarkerHandleWidth - text { - anchors.bottomMargin: marker.valueOnTop ? 13 : 0 + maxText { font { - pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker - weight: Font.DemiBold + pixelSize : minText.font.pixelSize + weight : minText.font.weight } + color : Colors.progressBarMinMax + text : _private.setVolume.toFixed(Variables.ultrafiltrationPrecision) + " " + Variables.unitVolume } + marker { + width : Variables.ultrafiltrationRangeMarkerWidth + handle.width : Variables.ultrafiltrationRangeMarkerHandleWidth + text { + anchors.bottomMargin: marker.valueOnTop ? 13 : 0 + font { + pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker + weight: Font.DemiBold + } + } + } } } TouchRect { id: _pauseButton anchors { - top : _progressbarex.bottom - topMargin : 110 + bottom : information.top + bottomMargin : Variables.ultrafiltrationButtonBottomMargin horizontalCenter: parent.horizontalCenter } width : 360 height : Variables.ultrafiltrationButtonHeight text { text : qsTr("Pause Ultrafiltration") - font.weight : Font.DemiBold + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton + weight : Font.DemiBold + } anchors { centerIn : null // disable the parent anchor verticalCenter : _pauseButton.verticalCenter @@ -148,20 +161,19 @@ } Row { id: _pausedButtonArea - anchors { - top : _progressbarex.bottom - topMargin : _pauseButton.anchors.topMargin - horizontalCenter : parent.horizontalCenter - } - spacing : Variables.defaultMargin - visible : ! _pauseButton.visible + anchors.centerIn : _pauseButton + spacing : Variables.defaultMargin + visible : ! _pauseButton.visible TouchRect { id: _resumeButton width : Variables.ultrafiltrationButtonWidth height : Variables.ultrafiltrationButtonHeight text { text : qsTr("Resume Ultrafiltration") - font.weight : Font.DemiBold + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton + weight : Font.DemiBold + } } isDefault : true onClicked : _root.resumeClicked() @@ -172,7 +184,10 @@ height : Variables.ultrafiltrationButtonHeight text { text : qsTr("Edit UF") - font.weight : Font.DemiBold + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton + weight : Font.DemiBold + } } isDefault : true onClicked : _root.editClicked() @@ -183,7 +198,10 @@ height : Variables.ultrafiltrationButtonHeight text { text : qsTr("Isolated UF") - font.weight : Font.DemiBold + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton + weight : Font.DemiBold + } } isDefault : true onClicked : _root.isolatedUfClicked()