Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml =================================================================== diff -u -r53ec19e12772f2a73190323438106dc93e4a12df -r7d2122a9a4330ebc2ff4c22be36f32e9a82417ec --- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision 53ec19e12772f2a73190323438106dc93e4a12df) +++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision 7d2122a9a4330ebc2ff4c22be36f32e9a82417ec) @@ -21,13 +21,16 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/compounds" import "qrc:/pages/pretreatment/create" ModalDialog { id : _root property int controlWidth : 770 property int controlHeight : 86 - readonly property string adjustment: ("%1 K, %2 Ca, 1 Mg") .arg(_potassiumVolumeControl.value.toFixed(Variables.potassiumPrecision)) - .arg(_calciumVolumeControl.value.toFixed(Variables.calciumPrecision)) + readonly property string adjustment: ("%1 %2, %3 %4, 1 Mg") .arg(_potassiumVolumeControl.value.toFixed(Variables.potassiumPrecision)) + .arg(Variables.unitTextPotassium) + .arg(_calciumVolumeControl.value.toFixed(Variables.calciumPrecision)) + .arg(Variables.unitTextCalcium) width : 1000 height : 600 @@ -74,10 +77,10 @@ height : _root.controlHeight contentItem : ValueControl { id: _potassiumVolumeControl - minimum : 0.0 // TODO: NR - Update to .conf values when available - maximum : 4.0 // LEAHI-PRS-660 , LEAHI-PRS-241 - step : 1.0 - defaultValue : 2.0 + minimum : Variables.potassiumMin // TODO: NR - Update to .conf values when available + maximum : Variables.potassiumMax // LEAHI-PRS-660 , LEAHI-PRS-241 + step : Variables.potassiumResolution + defaultValue : Variables.potassiumDefault decimal : Variables.potassiumPrecision } } @@ -95,10 +98,10 @@ height : _root.controlHeight contentItem : ValueControl { id: _calciumVolumeControl - minimum : 0.0 // TODO: NR - Update to .conf values when available - maximum : 3.5 // LEAHI-PRS-660 , LEAHI-PRS-241 - step : 0.25 - defaultValue : 2.5 + minimum : Variables.calciumMin // TODO: NR - Update to .conf values when available + maximum : Variables.calciumMax // LEAHI-PRS-660 , LEAHI-PRS-241 + step : Variables.calciumResolution + defaultValue : Variables.calciumDefault decimal : Variables.calciumPrecision } }