Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs
===================================================================
diff -u -r2783 -r2787
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs	(.../Scenario.cs)	(revision 2783)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs	(.../Scenario.cs)	(revision 2787)
@@ -269,76 +269,30 @@
             }
         }
 
-        /// <summary>
-        /// Gets or sets the required safety factor stability inner slope.
-        /// </summary>
-        /// <value>
-        /// The required safety factor stability inner slope.
-        /// </value>
         [PropertyOrder(1, 4)]
+        [Unit(UnitType.Length)]
         [Format("F2")]
-        [Label("Required safety factor stability inner slope")]
-        [Description("Required safety factor stability inner slope")]
-        public double RequiredSafetyFactorStabilityInnerSlope
+        public double? PolderLevel
         {
-            get { return ModelFactors.RequiredSafetyFactorStabilityInnerSlope; }
-            set
+            get
             {
-                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorStabilityInnerSlope);
-                ModelFactors.RequiredSafetyFactorStabilityInnerSlope = value;
-                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorStabilityInnerSlope);
+                return polderLevel;
             }
-        }
-
-        /// <summary>
-        /// Gets or sets the required safety factor stability outer slope.
-        /// </summary>
-        /// <value>
-        /// The required safety factor stability outer slope.
-        /// </value>
-        [PropertyOrder(1, 5)]
-        [Format("F2")]
-        [Label("Required safety factor stability outer slope")]
-        [Description("Required safety factor stability outer slope")]
-        public double RequiredSafetyFactorStabilityOuterSlope
-        {
-            get { return ModelFactors.RequiredSafetyFactorStabilityOuterSlope; }
             set
             {
-                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorStabilityOuterSlope);
-                ModelFactors.RequiredSafetyFactorStabilityOuterSlope = value;
-                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorStabilityOuterSlope);
+                DataEventPublisher.BeforeChange(this, ExpressionPolderLevel);
+                polderLevel = value;
+                DataEventPublisher.AfterChange(this, ExpressionPolderLevel);
             }
         }
 
         /// <summary>
-        /// Gets or sets the required safety factor piping.
-        /// </summary>
-        /// <value>
-        /// The required safety factor piping.
-        /// </value>
-        [PropertyOrder(1, 6)]
-        [Format("F2")]
-        [Label("Required safety factor piping")]
-        [Description("Required safety factor piping")]
-        public double RequiredSafetyFactorPiping
-        {
-            get { return ModelFactors.RequiredSafetyFactorPiping; }
-            set
-            {
-                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorPiping);
-                ModelFactors.RequiredSafetyFactorPiping = value;
-                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorPiping);
-            }
-        }
-
-        /// <summary>
         /// Gets or sets the uplift criterion piping.
         /// </summary>
         /// <value>
         /// The uplift criterion piping.
         /// </value>
-        [PropertyOrder(1, 8)]
+        [PropertyOrder(1, 5)]
         [Format("F2")]
         [Label("Uplift criterion piping")]
         [Description("Uplift criterion piping")]
@@ -359,7 +313,7 @@
         /// <value>
         /// The uplift criterion stability.
         /// </value>
-        [PropertyOrder(1, 9)]
+        [PropertyOrder(1, 6)]
         [Format("F2")]
         [Label("Uplift criterion stability")]
         [Description("Uplift criterion stability")]
@@ -374,7 +328,7 @@
             }
         }
 
-        [PropertyOrder(1, 10)]
+        [PropertyOrder(1, 7)]
         [Unit(UnitType.Length)]
         [Format("F2")]
         public double PlLineOffsetBelowDikeTopAtRiver
@@ -397,7 +351,7 @@
         /// <value>
         /// The pl line offset below dike top at polder.
         /// </value>
-        [PropertyOrder(1, 10)]
+        [PropertyOrder(1, 8)]
         [Unit(UnitType.Length)]
         [Format("F2")]
         public double PlLineOffsetBelowDikeTopAtPolder
@@ -420,7 +374,7 @@
         /// <value>
         /// The pl line offset below shoulder base inside.
         /// </value>
-        [PropertyOrder(1, 11)]
+        [PropertyOrder(1, 9)]
         [Unit(UnitType.Length)]
         [Format("F2")]
         public double PlLineOffsetBelowShoulderBaseInside
@@ -443,7 +397,7 @@
         /// <value>
         /// The pl line offset below dike toe at polder.
         /// </value>
-        [PropertyOrder(1, 12)]
+        [PropertyOrder(1, 10)]
         [Unit(UnitType.Length)]
         [Format("F2")]
         public double PlLineOffsetBelowDikeToeAtPolder
@@ -466,7 +420,7 @@
         /// <value>
         /// The use pl line offset below dike crest middle.
         /// </value>
-        [PropertyOrder(1, 13)]
+        [PropertyOrder(1, 11)]
         [Unit(UnitType.None)]
         [Clearable]
         public bool? UsePlLineOffsetBelowDikeCrestMiddle
@@ -489,7 +443,7 @@
         /// <value>
         /// The pl line offset below dike crest middle.
         /// </value>
-        [PropertyOrder(1, 14)]
+        [PropertyOrder(1, 12)]
         [Unit(UnitType.Length)]
         [Format("F2")]
         public double? PlLineOffsetBelowDikeCrestMiddle
@@ -509,7 +463,7 @@
         /// <value>
         /// The use pl line offset factor below shoulder crest.
         /// </value>
-        [PropertyOrder(1, 15)]
+        [PropertyOrder(1, 13)]
         [Unit(UnitType.None)]
         [Clearable]
         public bool? UsePlLineOffsetFactorBelowShoulderCrest
@@ -532,7 +486,7 @@
         /// <value>
         /// The pl line offset factor below shoulder crest.
         /// </value>
-        [PropertyOrder(1, 16)]
+        [PropertyOrder(1, 14)]
         [Unit(UnitType.Fractions)]
         [Format("F2")]
         public double? PlLineOffsetFactorBelowShoulderCrest
@@ -552,7 +506,7 @@
         /// <value>
         /// The head PL3.
         /// </value>
-        [PropertyOrder(1, 17)]
+        [PropertyOrder(1, 15)]
         [Unit(UnitType.Length)]
         [Format("F2")]
         public double? HeadPl3
@@ -575,7 +529,7 @@
         /// <value>
         /// The head PL4.
         /// </value>
-        [PropertyOrder(1, 18)]
+        [PropertyOrder(1, 16)]
         [Unit(UnitType.Length)]
         [Format("F2")]
         public double? HeadPl4
@@ -592,23 +546,69 @@
             }
         }
 
-        [PropertyOrder(1, 19)]
-        [Unit(UnitType.Length)]
+        /// <summary>
+        /// Gets or sets the required safety factor stability inner slope.
+        /// </summary>
+        /// <value>
+        /// The required safety factor stability inner slope.
+        /// </value>
+        [PropertyOrder(1, 17)]
         [Format("F2")]
-        public double? PolderLevel
+        [Label("Required safety factor stability inner slope")]
+        [Description("Required safety factor stability inner slope")]
+        public double RequiredSafetyFactorStabilityInnerSlope
         {
-            get
+            get { return ModelFactors.RequiredSafetyFactorStabilityInnerSlope; }
+            set
             {
-                return polderLevel;
+                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorStabilityInnerSlope);
+                ModelFactors.RequiredSafetyFactorStabilityInnerSlope = value;
+                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorStabilityInnerSlope);
             }
+        }
+
+        /// <summary>
+        /// Gets or sets the required safety factor stability outer slope.
+        /// </summary>
+        /// <value>
+        /// The required safety factor stability outer slope.
+        /// </value>
+        [PropertyOrder(1, 18)]
+        [Format("F2")]
+        [Label("Required safety factor stability outer slope")]
+        [Description("Required safety factor stability outer slope")]
+        public double RequiredSafetyFactorStabilityOuterSlope
+        {
+            get { return ModelFactors.RequiredSafetyFactorStabilityOuterSlope; }
             set
             {
-                DataEventPublisher.BeforeChange(this, ExpressionPolderLevel);
-                polderLevel = value;
-                DataEventPublisher.AfterChange(this, ExpressionPolderLevel);
+                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorStabilityOuterSlope);
+                ModelFactors.RequiredSafetyFactorStabilityOuterSlope = value;
+                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorStabilityOuterSlope);
             }
         }
 
+        /// <summary>
+        /// Gets or sets the required safety factor piping.
+        /// </summary>
+        /// <value>
+        /// The required safety factor piping.
+        /// </value>
+        [PropertyOrder(1, 19)]
+        [Format("F2")]
+        [Label("Required safety factor piping")]
+        [Description("Required safety factor piping")]
+        public double RequiredSafetyFactorPiping
+        {
+            get { return ModelFactors.RequiredSafetyFactorPiping; }
+            set
+            {
+                DataEventPublisher.BeforeChange(this, ExpressionRequiredSafetyFactorPiping);
+                ModelFactors.RequiredSafetyFactorPiping = value;
+                DataEventPublisher.AfterChange(this, ExpressionRequiredSafetyFactorPiping);
+            }
+        }
+
         [Browsable(false)]
         public ModelFactors ModelFactors { get; set; }