Index: DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs =================================================================== diff -u -r2398 -r2774 --- DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs (.../DamContext.cs) (revision 2398) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamContext.cs (.../DamContext.cs) (revision 2774) @@ -69,7 +69,8 @@ StaticReflection.GetMemberName(x => x.DikeTableHeight), StaticReflection.GetMemberName(x => x.RequiredSafetyFactorStabilityInnerSlope), StaticReflection.GetMemberName(x => x.HeadPl3), - StaticReflection.GetMemberName(x => x.HeadPl4) + StaticReflection.GetMemberName(x => x.HeadPl4), + StaticReflection.GetMemberName(x => x.PolderLevel) }); locationScenarioFilter.Add(LocationScenarioPiping, new List @@ -79,7 +80,8 @@ StaticReflection.GetMemberName(x => x.DikeTableHeight), StaticReflection.GetMemberName(x => x.RequiredSafetyFactorPiping), StaticReflection.GetMemberName(x => x.HeadPl3), - StaticReflection.GetMemberName(x => x.HeadPl4) + StaticReflection.GetMemberName(x => x.HeadPl4), + StaticReflection.GetMemberName(x => x.PolderLevel) }); locationScenarioFilter.Add(LocationScenarioPlLineSchematization, new List @@ -93,7 +95,8 @@ StaticReflection.GetMemberName(x => x.PlLineOffsetBelowDikeCrestMiddle), StaticReflection.GetMemberName(x => x.PlLineOffsetFactorBelowShoulderCrest), StaticReflection.GetMemberName(x => x.UsePlLineOffsetBelowDikeCrestMiddle), - StaticReflection.GetMemberName(x => x.UsePlLineOffsetFactorBelowShoulderCrest) + StaticReflection.GetMemberName(x => x.UsePlLineOffsetFactorBelowShoulderCrest), + StaticReflection.GetMemberName(x => x.PolderLevel) }); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs =================================================================== diff -u -r2578 -r2774 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2578) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Scenario.cs (.../Scenario.cs) (revision 2774) @@ -85,6 +85,8 @@ private static readonly Expression> ExpressionPlLineOffsetFactorBelowShoulderCrest = x => x.PlLineOffsetFactorBelowShoulderCrest; private static readonly Expression> ExpressionHeadPl3 = x => x.HeadPl3; private static readonly Expression> ExpressionHeadPl4 = x => x.HeadPl4; + private static readonly Expression> ExpressionPolderLevel = x => x.PolderLevel; + #endregion @@ -112,6 +114,7 @@ private double? plLineOffsetFactorBelowShoulderCrest; private double? headPl3; private double? headPl4; + private double? polderLevel; [Browsable(false)] public CalculationResult CalculationResult @@ -589,6 +592,20 @@ } } + [PropertyOrder(1, 19)] + [Unit(UnitType.Length)] + [Format("F2")] + public double? PolderLevel + { + get { return polderLevel; } + set + { + DataEventPublisher.BeforeChange(this, ExpressionPolderLevel); + polderLevel = value; + DataEventPublisher.AfterChange(this, ExpressionPolderLevel); + } + } + [Browsable(false)] public ModelFactors ModelFactors { get; set; } @@ -939,7 +956,7 @@ /// public override string ToString() { - return String.Format("Location={0}, ID={1} RiverLevel={2} RiverLevelLow={3} DikeTableHeight={4} RequiredSafetyFactorStabilityInnerSlope={5} RequiredSafetyFactorStabilityOuterSlope={6} PlLineOffsetBelowDikeTopAtRiver={7} PlLineOffsetBelowDikeToeAtPolder={8} PlLineOffsetBelowDikeTopAtPolder={9} PlLineOffsetBelowShoulderBaseInside={10} UsePlLineOffsetBelowDikeCrestMiddle {11} PlLineOffsetBelowDikeCrestMiddle {12} UsePlLineOffsetFactorBelowShoulderCrest {13} PlLineOffsetFactorBelowShoulderCrest {14} HeadPl3={15} HeadPl4={16}", + return String.Format("Location={0}, ID={1} RiverLevel={2} RiverLevelLow={3} DikeTableHeight={4} RequiredSafetyFactorStabilityInnerSlope={5} RequiredSafetyFactorStabilityOuterSlope={6} PlLineOffsetBelowDikeTopAtRiver={7} PlLineOffsetBelowDikeToeAtPolder={8} PlLineOffsetBelowDikeTopAtPolder={9} PlLineOffsetBelowShoulderBaseInside={10} UsePlLineOffsetBelowDikeCrestMiddle {11} PlLineOffsetBelowDikeCrestMiddle {12} UsePlLineOffsetFactorBelowShoulderCrest {13} PlLineOffsetFactorBelowShoulderCrest {14} HeadPl3={15} HeadPl4={16} PolderLevel={17}", Location.Name, LocationScenarioID, RiverLevel, RiverLevelLow.HasValue ? RiverLevelLow.Value.ToString(CultureInfo.InvariantCulture) : "?", DikeTableHeight.HasValue ? DikeTableHeight.Value.ToString(CultureInfo.InvariantCulture) : "?", @@ -958,7 +975,8 @@ PlLineOffsetFactorBelowShoulderCrest.HasValue ? PlLineOffsetFactorBelowShoulderCrest.Value.ToString(CultureInfo.InvariantCulture) : "?", HeadPl3.HasValue ? HeadPl3.Value.ToString(CultureInfo.InvariantCulture) : "?", - HeadPl4.HasValue ? HeadPl4.Value.ToString(CultureInfo.InvariantCulture) : "?"); + HeadPl4.HasValue ? HeadPl4.Value.ToString(CultureInfo.InvariantCulture) : "?", + PolderLevel.HasValue ? PolderLevel.Value.ToString(CultureInfo.InvariantCulture) : "?"); } public Dictionary GetParametersAsNameValuePairs() @@ -1015,6 +1033,10 @@ { nameValuePairs.Add(ScenarioParameterNames.HeadPl4, HeadPl4.Value.ToString(numberFormatInfo)); } + if (PolderLevel != null) + { + nameValuePairs.Add(ScenarioParameterNames.PolderLevel, PolderLevel.Value.ToString(numberFormatInfo)); + } return nameValuePairs; } @@ -1060,6 +1082,8 @@ HeadPl3 = Convert.ToDouble(parameterValue, numberFormatInfo); if (parameterName.Equals(ScenarioParameterNames.HeadPl4)) HeadPl4 = Convert.ToDouble(parameterValue, numberFormatInfo); + if (parameterName.Equals(ScenarioParameterNames.PolderLevel)) + PolderLevel = Convert.ToDouble(parameterValue, numberFormatInfo); } public bool IsVisible(string property) @@ -1139,5 +1163,6 @@ public const string UsePlLineOffsetFactorBelowShoulderCrest = "UsePlLineOffsetFactorBelowShoulderCrest"; public const string HeadPl3 = "HeadPL3"; public const string HeadPl4 = "HeadPL4"; + public const string PolderLevel = "PolderLevel"; } }