Index: sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml =================================================================== diff -u -r09089dd9771aa0f79dba07879e65c8e3b221662c -ref8be521484c69132550e0d183fcaf964951d6dc --- sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml (.../WaterSampleDialysatePage.qml) (revision 09089dd9771aa0f79dba07879e65c8e3b221662c) +++ sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml (.../WaterSampleDialysatePage.qml) (revision ef8be521484c69132550e0d183fcaf964951d6dc) @@ -32,23 +32,21 @@ spacing : Variables.defaultMargin LabelUnitContainer { id: _acidConcentrateContainer - objectName : "_acidConcentrateContainer" + objectName : "_acidConcentrateContainer" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Acid Concentrate") contentItem : Text { id: _acidConcentrateText anchors.centerIn: parent - text : qsTr("%1%2 %3%4") .arg(vTreatmentRanges.potassium.toFixed(Variables.potassiumPrecision)) - .arg(Variables.unitTextPotassium) - .arg(vTreatmentRanges.calcium.toFixed(Variables.calciumPrecision)) - .arg(Variables.unitTextCalcium) + text : vTreatmentCreate.acidConcentrateSet ? vTreatmentRanges.acidConcentrateOptions[vTreatmentCreate.acidConcentrate] : + Variables.emptyEntry color : Colors.offWhite font.pixelSize : Fonts.fontPixelValueControl } } LabelUnitContainer { id: _bicarbonateCartrideSizeContainer - objectName : "_bicarbonateCartrideSizeContainer" + objectName : "_bicarbonateCartrideSizeContainer" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Bicarbonate Cartridge Size") @@ -62,7 +60,7 @@ LabelUnitContainer { id: _sodiumContainer - objectName : "_sodiumContainer" + objectName : "_sodiumContainer" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Sodium") @@ -76,7 +74,7 @@ } LabelUnitContainer { id: _bicarbonateContainer - objectName : "_bicarbonateContainer" + objectName : "_bicarbonateContainer" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Bicarbonate") @@ -94,7 +92,7 @@ spacing : Variables.defaultMargin LabelUnitContainer { id: _theoriticalCondictivityContainer - objectName : "_theoriticalCondictivityContainer" + objectName : "_theoriticalCondictivityContainer" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Theoretical Conductivity") @@ -108,7 +106,7 @@ } LabelUnitContainer { id: _independentConductivityReadingContainer1 - objectName : "_independentConductivityReadingContainer1" + objectName : "_independentConductivityReadingContainer1" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Independent Conductivity Reading 1") @@ -122,7 +120,7 @@ } LabelUnitContainer { id: _independentConductivityReadingContainer2 - objectName : "_independentConductivityReadingContainer2" + objectName : "_independentConductivityReadingContainer2" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Independent Conductivity Reading 2") @@ -136,7 +134,7 @@ } LabelUnitContainer { id: _dialsateTemperatureContainer - objectName : "_dialsateTemperatureContainer" + objectName : "_dialsateTemperatureContainer" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Dialysate Temperature") @@ -150,7 +148,7 @@ } LabelUnitContainer { id: _actualRORejectionPercentageContainer - objectName : "_actualRORejectionPercentageContainer" + objectName : "_actualRORejectionPercentageContainer" width : _content.cellWidth height : Variables.adjustmentLabelUnitContainerHeight text : qsTr("Actual RO Rejection Percentage")