Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -ra563e719d85e3274b0cd0fa831ef8257032e49bc
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision 93b7d7da5dea9e0392e139b59117eb0315d6c343)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml	(.../PreTreatmentCreateContent.qml)	(revision a563e719d85e3274b0cd0fa831ef8257032e49bc)
@@ -30,7 +30,7 @@
     readonly property int rowSpacing    : Variables.defaultMargin * 3
     readonly property int columnSpacing : 15
     readonly property bool isValidated  : vTreatmentCreate.parametersValidated
-    readonly property bool heparinFeatured: true // TODO: vSettings.heparinSyringePump
+    readonly property bool heparinFeatured: vSettings.heparinSyringePump
 
     readonly property string editRx     : qsTr( "Edit Rx"    )
     readonly property string selectRx   : qsTr( "Select Rx"  )
@@ -67,6 +67,7 @@
         _heparinStopTimeControl         .refresh()
         _dialysateTemperatureControl    .refresh()
         _salineBolusVolumeControl       .refresh()
+        _bpMeasurementIntervalControl   .refresh()
     }
 
     function clear () {
@@ -106,9 +107,9 @@
         return  _bloodFlowRateControl           .isActive     && _bloodFlowRate           .valid  &&
                 _dialysateFlowRateControl       .isActive     && _dialysateFlowRate       .valid  &&
                 _durationControl                .isActive     && _duration                .valid  &&
-                _heparinDispensingRateControl   .isActive     && _heparinDispensingRate   .valid  &&
+                ( _root.heparinFeatured ? _heparinDispensingRateControl   .isActive     && _heparinDispensingRate   .valid  &&
                 _heparinBolusVolumeControl      .isActive     && _heparinBolusVolume      .valid  &&
-                _heparinStopTimeControl         .isActive     && _heparinStopTime         .valid  &&
+                _heparinStopTimeControl         .isActive     && _heparinStopTime         .valid : true ) &&
                 _acidConcentrateComboBox        .isActive     &&
                 _bicarbonateConcentrateComboBox .isActive     &&
                 _dialyzerTypeComboBox           .isActive     &&
@@ -121,10 +122,12 @@
         vTreatmentCreate                    .patientID = _pretreatmentPatientIDEntry.text
         vPostTreatmentAdjustmentTreatmentLog.patientID = _pretreatmentPatientIDEntry.text // store for the TreatmentLog
 
-        vTreatmentCreate.arterialPressureLimitWindow = vTreatmentRanges.arterialPressureLimitWindowDef  // these parameters don't have a user option on create treatment, so sending the default.
-        vTreatmentCreate.venousPressureLimitWindow   = vTreatmentRanges.venousPressureLimitWindowDef    // these parameters don't have a user option on create treatment, so sending the default.
-        vTreatmentCreate.venousPressureLimitAsymtrc  = vTreatmentRanges.venousPressureLimitAsymtrcDef   // these parameters don't have a user option on create treatment, so sending the default.
-        vTreatmentCreate.rinsebackFlowRate           = vTreatmentRanges.rinsebackFlowRateDef            // these parameters don't have a user option on create treatment, so sending the default.
+        vTreatmentCreate.arterialPressureLimitWindow        = vTreatmentRanges.arterialPressureLimitWindowDef       // these parameters don't have a user option on create treatment, so sending the default.
+        vTreatmentCreate.venousPressureLimitWindow          = vTreatmentRanges.venousPressureLimitWindowDef         // these parameters don't have a user option on create treatment, so sending the default.
+        vTreatmentCreate.venousPressureLimitAsymtrc         = vTreatmentRanges.venousPressureLimitAsymtrcDef        // these parameters don't have a user option on create treatment, so sending the default.
+        vTreatmentCreate.transmembranePressureLimitWindow   = vTreatmentRanges.transmembranePressureLimitWindowDef  // these parameters don't have a user option on create treatment, so sending the default.
+        vTreatmentCreate.rinsebackVolume                    = vTreatmentRanges.rinsebackVolumeDef                   // these parameters don't have a user option on create treatment, so sending the default.
+        vTreatmentCreate.rinsebackFlowRate                  = vTreatmentRanges.rinsebackFlowRateDef                 // these parameters don't have a user option on create treatment, so sending the default.
         vTreatmentCreate.doValidation       (        )
     }
 
@@ -315,6 +318,8 @@
                     if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason }
                     vTreatmentCreate.acidConcentrate    = _acidConcentrateComboBox.currentIndex
                     vTreatmentCreate.acidConcentrateSet = true
+                    vTreatmentRanges.doPopulateAcidConcentrate( vTreatmentCreate.acidConcentrateSet,
+                                                                vTreatmentCreate.acidConcentrate)
                 }
             }
         }
@@ -437,28 +442,23 @@
             unitText    : Variables.unitTextDuration
             valid       : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason
 
-            contentItem : BaseComboBox { id: _bpMeasurementIntervalControl
-                anchors.rightMargin : Variables.defaultMargin * 2
-                anchors.leftMargin  : anchors.rightMargin
-                anchors.topMargin   : Variables.defaultMargin / 2
-                anchors.bottomMargin: anchors.topMargin
-                isActive            : vTreatmentCreate.bloodPressureMeasureIntervalSet
-                enabled             : _root.editingEnabled
-                currentIndex        : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString())
-                model               : vTreatmentRanges.bloodPressureMeasureInterval
-                canOff              : true
-                centerHorizontally  : true
+            contentItem : ValueAdjusterCustom { id: _bpMeasurementIntervalControl
+                editable        : _root.editingEnabled
+                isActive        : vTreatmentCreate.bloodPressureMeasureIntervalSet
+                defaultValue    : vTreatmentRanges.vitalsInterval
+                value           : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString())
+                model           : vTreatmentRanges.bloodPressureMeasureInterval
+                canOff          : true
 
-                onClear             : {
-                    vTreatmentCreate.bloodPressureMeasureIntervalSet = false
-                }
+                onDidActiveChange: function(vState) {  vTreatmentCreate.bloodPressureMeasureIntervalSet = vState }
 
-                onActivated         : {
+                onDidChange     : function(vValue) {
                     if ( ! _bpMeasurementInterval.valid ) {
                         vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason
                     }
-                    vTreatmentCreate.bloodPressureMeasureInterval    = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex]
-                    vTreatmentCreate.bloodPressureMeasureIntervalSet = true
+
+                    vTreatmentCreate.bloodPressureMeasureInterval       = vTreatmentRanges.bloodPressureMeasureInterval[vValue]
+                    vTreatmentCreate.bloodPressureMeasureIntervalSet    = true
                 }
             }
         }
@@ -526,7 +526,7 @@
         }
 
         LabelUnitContainer { id: _heparinStopTime
-            text        : qsTr("Heparin Stop Time")
+            text        : qsTr("Heparin Delivery Duration")
             unitText    : Variables.unitTextDuration
             valid       : ! vTreatmentCreate.heparinStopTimeRejectReason
             visible     : _root.heparinFeatured