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