Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml
===================================================================
diff -u -rfeb708952ab1311368560d025d1e241c68b5413c -ree594afa3a2084c03395570954d723d04bbae215
--- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision feb708952ab1311368560d025d1e241c68b5413c)
+++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml	(.../AcidConcentrateAdjustment.qml)	(revision ee594afa3a2084c03395570954d723d04bbae215)
@@ -27,16 +27,22 @@
 ModalDialog { id : _root
     property int controlWidth   : 770
     property int controlHeight  : 86
-    readonly property string adjustment: ("%1 %2, %3 %4, 1 Mg") .arg(_potassiumVolumeControl.value.toFixed(Variables.potassiumPrecision))
+    readonly property string adjustment: ("%1 %2, %3 %4, 1 Mg") .arg(_potassiumValueControl.value.toFixed(Variables.potassiumPrecision))
                                                                 .arg(Variables.unitTextPotassium)
-                                                                .arg(_calciumVolumeControl.value.toFixed(Variables.calciumPrecision))
+                                                                .arg(_calciumValueControl.value.toFixed(Variables.calciumPrecision))
                                                                 .arg(Variables.unitTextCalcium)
 
     width           : 1000
     height          : 600
     padding         : Variables.defaultMargin
-    onVisibleChanged: notificationText = ""
+    onVisibleChanged: visible ? vTreatmentRanges.doPopulateAcidConcentrate( vTreatmentCreate.acidConcentrateSet,
+                                                                            vTreatmentCreate.acidConcentrate) :
+                                notificationText = ""
 
+    Connections { target: vTDOpMode
+        function onPreTreatmentChanged() { if (vTDOpMode.preTreatment) { _root.close() } }
+    }
+
     Item { id : _contentItem
         anchors.fill: parent
 
@@ -59,8 +65,8 @@
                 margins : 0
             }
             onClicked: {
-                _potassiumVolumeControl.clear()
-                _calciumVolumeControl.clear()
+                _potassiumValueControl.clear()
+                _calciumValueControl.clear()
                 _root.close()
             }
         }
@@ -77,12 +83,16 @@
             width           : _root.controlWidth
             height          : _root.controlHeight
 
-            contentItem : ValueAdjuster{ id: _potassiumVolumeControl
-                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
+            contentItem : ValueAdjuster{ id: _potassiumValueControl
+                minimum         : vTreatmentRanges.acidConcentratePotassiumMin
+                maximum         : vTreatmentRanges.acidConcentratePotassiumMax
+                step            : vTreatmentRanges.acidConcentratePotassiumRes
+                defaultValue    : vTreatmentRanges.acidConcentratePotassiumDef
                 decimal         : Variables.potassiumPrecision
+                value           : vTreatmentRanges.potassium
+                isActive        : vTreatmentRanges.potassiumSet
+                onDidActiveChange   : function(vState) { vTreatmentRanges.potassiumSet  = vState    }
+                onDidChange         : function(vValue) { vTreatmentRanges.potassium     = vValue    }
             }
         }
 
@@ -98,12 +108,16 @@
             width           : _root.controlWidth
             height          : _root.controlHeight
 
-            contentItem : ValueAdjuster { id: _calciumVolumeControl
-                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
+            contentItem : ValueAdjuster { id: _calciumValueControl
+                minimum         : vTreatmentRanges.acidConcentrateCalciumMin
+                maximum         : vTreatmentRanges.acidConcentrateCalciumMax
+                step            : vTreatmentRanges.acidConcentrateCalciumRes
+                defaultValue    : vTreatmentRanges.acidConcentrateCalciumDef
                 decimal         : Variables.calciumPrecision
+                value           : vTreatmentRanges.calcium
+                isActive        : vTreatmentRanges.calciumSet
+                onDidActiveChange   : function(vState) { vTreatmentRanges.calciumSet    = vState    }
+                onDidChange         : function(vValue) { vTreatmentRanges.calcium       = vValue    }
             }
         }
 
@@ -118,7 +132,7 @@
             width       : 250
             height      : 75
             pixelSize   : 30
-            enabled     : _potassiumVolumeControl.active && _calciumVolumeControl.active
+            enabled     : _potassiumValueControl.isActive && _calciumValueControl.isActive
 
             onClicked   : {
                 if ( vTreatmentCreate.acidConcentrateRejectReason ) { vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason }
@@ -131,14 +145,23 @@
         Connections { target: vTreatmentRanges
             function onAcidConcentrateAcceptedChanged ( vAccepted ) {
                 if ( vAccepted ) {
-                    _potassiumVolumeControl.clear()
-                    _calciumVolumeControl.clear()
+                    _potassiumValueControl.clear()
+                    _calciumValueControl.clear()
+                    vTreatmentCreate.acidConcentrateSet = true
                     _root.accept()
                 }
                 else {
                     notificationText = qsTr("Duplicate Acid Concentrate Entry")
                 }
             }
+
+            function onDidPopulateAcidConcentrate () {
+                _potassiumValueControl  .refresh()
+                _calciumValueControl    .refresh()
+                vTreatmentRanges.potassiumSet   = true
+                vTreatmentRanges.calciumSet     = true
+                notificationText = qsTr("Duplicate Acid Concentrate Entry")
+            }
         }
     }
 }