Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -r07d06c2d00ca6f4d7a8246a3405e77961ff393dc -rbd12a330df798024c3de30f727058d971dfc2cbe
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision 07d06c2d00ca6f4d7a8246a3405e77961ff393dc)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(.../PreTreatmentCreate.qml)	(revision bd12a330df798024c3de30f727058d971dfc2cbe)
@@ -29,6 +29,9 @@
  */
 PreTreatmentBase { id: _root
     objectName: "_PreTreatmentCreate" // SquishQt testability
+    readonly property int dryDemoBloodFlowRateMLPMDef     : 400
+    readonly property int dryDemoDialysateFlowRateMLPMDef : 600
+    readonly property int dryDemoTreatmentDurationMinDef  : 240
 
     header.confirmEnabled:
         _bloodFlowRate          .active      && _bloodFlowRate          .          valid &&
@@ -134,7 +137,7 @@
         anchors.rightMargin : Variables.minVGap
     }
 
-    Flickable { id: _flickable
+    Flickable { id: _flickable       
         objectName: "TreatmentCreateFlickable"
         clip: true
         anchors {
@@ -170,7 +173,7 @@
                 minimum     : vTreatmentRanges.bloodFlowRateMin
                 maximum     : vTreatmentRanges.bloodFlowRateMax
                 step        : vTreatmentRanges.bloodFlowRateRes
-                defaultValue: _GuiView.dryDemoMode ? 400 : vTreatmentRanges.bloodFlowRateDef
+                defaultValue: _GuiView.dryDemoMode ? _root.dryDemoBloodFlowRateMLPMDef : vTreatmentRanges.bloodFlowRateDef
                 valid       : !vTreatmentCreate.bloodFlowRateRejectReason
                 onValueChanged : {
                     // Reset the valid state to allow repositioning to the next invalid parameter
@@ -189,7 +192,7 @@
                 minimum     : vTreatmentRanges.dialysateFlowRateMin
                 maximum     : vTreatmentRanges.dialysateFlowRateMax
                 step        : vTreatmentRanges.dialysateFlowRateRes
-                defaultValue: _GuiView.dryDemoMode ? 600 : vTreatmentRanges.dialysateFlowRateDef
+                defaultValue: _GuiView.dryDemoMode ? _root.dryDemoDialysateFlowRateMLPMDef : vTreatmentRanges.dialysateFlowRateDef
                 valid       : !vTreatmentCreate.dialysateFlowRateRejectReason                  
                 onValueChanged : {
                     // Reset the valid state to allow repositioning to the next invalid parameter
@@ -208,7 +211,7 @@
                 minimum     : vTreatmentRanges.treatmentDurationMin
                 maximum     : vTreatmentRanges.treatmentDurationMax
                 step        : vTreatmentRanges.treatmentDurationRes
-                defaultValue: _GuiView.dryDemoMode ? 240 : vTreatmentRanges.treatmentDurationDef
+                defaultValue: _GuiView.dryDemoMode ? _root.dryDemoTreatmentDurationMinDef : vTreatmentRanges.treatmentDurationDef
                 valid       : !vTreatmentCreate.treatmentDurationRejectReason
                 onValueChanged: {
                     // Reset the valid state to allow repositioning to the next invalid parameter