Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r2512 -r2529 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2512) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 2529) @@ -55,8 +55,6 @@ public const string PL1LineId = "PL1LineId"; public const string PolderLevel = "PolderLevel"; public const string HeadPL2 = "HeadPL2"; - public const string HeadPL3 = "HeadPL3"; - public const string HeadPL4 = "HeadPL4"; public const string XSoilGeometry2DOrigin = "XSoilGeometry2DOrigin"; public const string DikeEmbankmentMaterial = "DikeEmbankmentMaterial"; public const string ShoulderEmbankmentMaterial = "ShoulderEmbankmentMaterial"; @@ -66,24 +64,11 @@ public const string TrafficLoad = "TrafficLoad"; public const string TL_DegreeOfConsolidation = "TL_DegreeOfConsolidation"; public const string PLLineCreationMethod = "PLLineCreationMethod"; - public const string PLLineOffsetBelowDikeTopAtRiver = "PLLineOffsetBelowDikeTopAtRiver"; - public const string PLLineOffsetBelowDikeTopAtPolder = "PLLineOffsetBelowDikeTopAtPolder"; - public const string PLLineOffsetBelowShoulderBaseInside = "PLLineOffsetBelowShoulderBaseInside"; - public const string PLLineOffsetBelowDikeToeAtPolder = "PLLineOffsetBelowDikeToeAtPolder"; - public const string PlLineOffsetBelowDikeCrestMiddle = "PlLineOffsetBelowDikeCrestMiddle"; - public const string PlLineOffsetFactorBelowShoulderCrest = "PlLineOffsetFactorBelowShoulderCrest"; - public const string UsePlLineOffsetBelowDikeCrestMiddle = "UsePlLineOffsetBelowDikeCrestMiddle"; - public const string UsePlLineOffsetFactorBelowShoulderCrest = "UsePlLineOffsetFactorBelowShoulderCrest"; public const string StabilityShoulderGrowSlope = "StabilityShoulderGrowSlope"; public const string StabilityShoulderGrowDeltaX = "StabilityShoulderGrowDeltaX"; public const string StabilitySlopeAdaptionDeltaX = "StabilitySlopeAdaptionDeltaX"; public const string MinimalCircleDepth = "MinimalCircleDepth"; public const string DistanceToEntryPoint = "DistanceToEntryPoint"; - public const string RequiredSafetyFactorStabilityInnerSlope = "RequiredSafetyFactorStabilityInnerSlope"; - public const string RequiredSafetyFactorStabilityOuterSlope = "RequiredSafetyFactorStabilityOuterSlope"; - public const string RequiredSafetyFactorPiping = "RequiredSafetyFactorPiping"; - public const string UpliftCriterionPiping = "UpliftCriterionPiping"; - public const string UpliftCriterionStability = "UpliftCriterionStability"; public const string StabilityZoneType = "StabilityZoneType"; public const string ForbiddenZoneFactor = "ForbiddenZoneFactor"; public const string ZoneAreaRestSlopeCrestWidth = "ZoneAreaRestSlopeCrestWidth"; @@ -111,9 +96,6 @@ public const string UseNewShoulderBaseSlope = "UseNewShoulderBaseSlope"; public const string UseNewShoulderTopSlope = "UseNewShoulderTopSlope"; public const string IntrusionVerticalWaterPressure = "IntrusionVerticalWaterPressure"; - public const string DikeTableHeight = "DikeTableHeight"; - public const string RiverLevel = "RiverLevel"; - public const string RiverLevelLow = "RiverLevelLow"; } [TrackChanges] @@ -147,14 +129,11 @@ private IList gaugePLLines = new List(); private IList gauges = new List(); private double? headPL2 = null; - private double? headPL3 = null; - private double? headPL4 = null; // Start of parameters that are also defined in modelparameters private PL1Line localXZPL1Line; private SurfaceLine2 localXzSurfaceLine; private string mapForSoilGeometries2D = ""; private double minimalCircleDepth = 0; - private ModelFactors modelFactors = new ModelFactors(); private string name = ""; private double newDepthDitch = 1.0; private double newDikeSlopeInside = 1.0/3.0; // as tangent @@ -168,10 +147,6 @@ private double newWidthDitchBottom = 1.0; private PL1Line pL1Line; private PLLineCreationMethod pLLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; - private double pLLineOffsetBelowDikeToeAtPolder = 0.1; - private double pLLineOffsetBelowDikeTopAtPolder = 1.5; - private double pLLineOffsetBelowDikeTopAtRiver = 0.5; - private double pLLineOffsetBelowShoulderBaseInside = 0.1; private double penetrationLength = 0; private double polderLevel = 0; private bool redesignDikeHeight = true; @@ -208,17 +183,9 @@ private double xrd = 0; private double yrd = 0; private double zoneAreaRestSlopeCrestWidth = 3.0; - - private double? plLineOffsetFactorBelowShoulderCrest; - private double? plLineOffsetBelowDikeCrestMiddle; - + private IntrusionVerticalWaterPressureType? intrusionVerticalWaterPressure = IntrusionVerticalWaterPressureType.Standard; - private double? dikeTableHeight = null; - private double? riverLevel = null; - private double? riverLevelLow = null; - - public Location() { SoilList = null; @@ -527,59 +494,6 @@ } } - [Browsable(false)] - public virtual ModelFactors ModelFactors - { - get - { - return modelFactors; - } - set - { - DataEventPublisher.BeforeChange(this, "ModelFactors"); - modelFactors = value; - DataEventPublisher.AfterChange(this, "ModelFactors"); - } - } - - [XmlIgnore] - [Label("Uplift criterion stability")] - [Description("Uplift criterion that is used in stability calulation")] - [Unit(UnitType.None)] - [Format("F3")] - [PropertyOrder(6, 1)] - [Category(WaterCategory)] - public virtual double? UpliftCriterionStability - { - get - { - return ModelFactors.UpliftCriterionStability; - } - set - { - ModelFactors.UpliftCriterionStability = value; - } - } - - [XmlIgnore] - [Label("Uplift criterion piping")] - [Description("Uplift criterion that is used in piping calulation")] - [Unit(UnitType.None)] - [Format("F3")] - [PropertyOrder(6, 2)] - [Category(WaterCategory)] - public virtual double? UpliftCriterionPiping - { - get - { - return ModelFactors.UpliftCriterionPiping; - } - set - { - ModelFactors.UpliftCriterionPiping = value; - } - } - [Unit(UnitType.Length)] [Label("Distance to Entrypoint")] [Description("Distance from toe of dike to entry point of river in deep sandlayer")] @@ -1294,18 +1208,6 @@ }; } } - else - { - if (modelFactors.RequiredSafetyFactorStabilityInnerSlope == null) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZones"), - this, "StabilityZoneType", "ZoneTypeSafety", (IRepairer) this) - }; - } - } } return new ValidationResult[0]; } @@ -1466,37 +1368,6 @@ } /// - /// Determines whether [is pl line offset factor below shoulder crest valid]. - /// - /// - [Validate] - public ValidationResult[] IsPlLineOffsetFactorBelowShoulderCrestValid() - { - if (!IsDesign() && ArePlLineCreationExpertKnowledgeParametersNeeded() && UsePlLineOffsetFactorBelowShoulderCrest.HasValue && UsePlLineOffsetFactorBelowShoulderCrest.Value && - PlLineOffsetFactorBelowShoulderCrest.HasValue) - { - if (PlLineOffsetFactorBelowShoulderCrest.Value < DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMinValue) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooSmall"), - this, "PlLineOffsetFactorBelowShoulderCrest", "AssignMinValue", (IRepairer) this) - }; - } - if (PlLineOffsetFactorBelowShoulderCrest.Value > DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue) - { - return new[] - { - new ValidationResult(ValidationResultType.Error, - LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooLarge"), - this, "PlLineOffsetFactorBelowShoulderCrest", "AssignMaxValue", (IRepairer) this) - }; - } - } - return new ValidationResult[0]; - } - /// /// Check if DikeEmbankmentMaterial is defined and is available as soil /// /// @@ -1694,62 +1565,6 @@ } /// - /// Gets or sets the head PL3. - /// - /// - /// The head PL3. - /// - [Unit(UnitType.Length)] - [Label("Head PL3")] - [Description("Head level for PL3")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(2, 9)] - [Clearable] - [XmlOldName("HeadPL3")] - public virtual double? HeadPl3 - { - get - { - return headPL3; - } - set - { - DataEventPublisher.BeforeChange(this, "HeadPl3"); - headPL3 = value; - DataEventPublisher.AfterChange(this, "HeadPl3"); - } - } - - /// - /// Gets or sets the head PL4. - /// - /// - /// The head PL4. - /// - [Unit(UnitType.Length)] - [Label("Head PL4")] - [Description("Head level for PL4")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(2, 10)] - [Clearable] - [XmlOldName("HeadPL4")] - public virtual double? HeadPl4 - { - get - { - return headPL4; - } - set - { - DataEventPublisher.BeforeChange(this, "HeadPl4"); - headPL4 = value; - DataEventPublisher.AfterChange(this, "HeadPl4"); - } - } - - /// /// Gets or sets the damping factor pl 3. /// /// @@ -1832,180 +1647,6 @@ } } - /// - /// Gets or sets the pl line offset below dike top at river. - /// - /// - /// The pl line offset below dike top at river. - /// - [Unit(UnitType.Length)] - [Label("PL1 below top dike (river)")] - [Description("PL1 below top dike (riverside)")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(3, 2)] - [XmlOldName("PLLineOffsetBelowDikeTopAtRiver")] - public virtual double PlLineOffsetBelowDikeTopAtRiver - { - get - { - return pLLineOffsetBelowDikeTopAtRiver; - } - set - { - DataEventPublisher.BeforeChange(this, "PlLineOffsetBelowDikeTopAtRiver"); - pLLineOffsetBelowDikeTopAtRiver = value; - DataEventPublisher.AfterChange(this, "PlLineOffsetBelowDikeTopAtRiver"); - } - } - - /// - /// Gets or sets the pl line offset below dike top at polder. - /// - /// - /// The pl line offset below dike top at polder. - /// - [Unit(UnitType.Length)] - [Label("PL1 below top dike (polder)")] - [Description("PL1 below top dike (polderside)")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(3, 3)] - [XmlOldName("PLLineOffsetBelowDikeTopAtPolder")] - public virtual double PlLineOffsetBelowDikeTopAtPolder - { - get - { - return pLLineOffsetBelowDikeTopAtPolder; - } - set - { - DataEventPublisher.BeforeChange(this, "PlLineOffsetBelowDikeTopAtPolder"); - pLLineOffsetBelowDikeTopAtPolder = value; - DataEventPublisher.AfterChange(this, "PlLineOffsetBelowDikeTopAtPolder"); - } - } - - /// - /// Gets or sets the pl line offset below shoulder base inside. - /// - /// - /// The pl line offset below shoulder base inside. - /// - [Unit(UnitType.Length)] - [Label("PL1 below shoulder base (polder)")] - [Description("PL1 below shoulder base (polderside)")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(3, 4)] - [XmlOldName("PLLineOffsetBelowShoulderBaseInside")] - public virtual double PlLineOffsetBelowShoulderBaseInside - { - get - { - return pLLineOffsetBelowShoulderBaseInside; - } - set - { - DataEventPublisher.BeforeChange(this, "PlLineOffsetBelowShoulderBaseInside"); - pLLineOffsetBelowShoulderBaseInside = value; - DataEventPublisher.AfterChange(this, "PlLineOffsetBelowShoulderBaseInside"); - } - } - - /// - /// Gets or sets the pl line offset below dike toe at polder. - /// - /// - /// The pl line offset below dike toe at polder. - /// - [Unit(UnitType.Length)] - [Label("PL1 below toe of dike (polder)")] - [Description("PL1 below toe of dike (polderside)")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(3, 5)] - [XmlOldName("PLLineOffsetBelowDikeToeAtPolder")] - public virtual double PlLineOffsetBelowDikeToeAtPolder - { - get - { - return pLLineOffsetBelowDikeToeAtPolder; - } - set - { - DataEventPublisher.BeforeChange(this, "PlLineOffsetBelowDikeToeAtPolder"); - pLLineOffsetBelowDikeToeAtPolder = value; - DataEventPublisher.AfterChange(this, "PlLineOffsetBelowDikeToeAtPolder"); - } - } - - /// - /// Gets or sets the use pl line offset below dike crest middle. - /// - /// - /// The use pl line offset below dike crest middle. - /// - [Unit(UnitType.None)] - [Category(WaterCategory)] - [Clearable] - [PropertyOrder(3, 10)] - public bool? UsePlLineOffsetBelowDikeCrestMiddle { get; set; } - - /// - /// Gets or sets the pl line offset below dike crest middle. - /// - /// - /// The pl line offset below dike crest middle. - /// - [Unit(UnitType.Length)] - [Format("F2")] - [Category(WaterCategory)] - [PropertyOrder(3, 11)] - public double? PlLineOffsetBelowDikeCrestMiddle - { - get { return plLineOffsetBelowDikeCrestMiddle; } - set - { - DataEventPublisher.BeforeChange(this, x => x.PlLineOffsetBelowDikeCrestMiddle); - plLineOffsetBelowDikeCrestMiddle = value; - DataEventPublisher.AfterChange(this, x => x.PlLineOffsetBelowDikeCrestMiddle); - } - } - - /// - /// Gets or sets the use pl line offset factor below shoulder crest. - /// - /// - /// The use pl line offset factor below shoulder crest. - /// - [Unit(UnitType.None)] - [Category(WaterCategory)] - [Clearable] - [PropertyOrder(3, 12)] - public bool? UsePlLineOffsetFactorBelowShoulderCrest { get; set; } - - /// - /// Gets or sets the pl line offset factor below shoulder crest. - /// - /// - /// The pl line offset factor below shoulder crest. - /// - [Unit(UnitType.Fractions)] - [Format("F2")] - [Category(WaterCategory)] - [PropertyOrder(3, 13)] - public double? PlLineOffsetFactorBelowShoulderCrest - { - get { return plLineOffsetFactorBelowShoulderCrest; } - set - { - DataEventPublisher.BeforeChange(this, x => x.PlLineOffsetFactorBelowShoulderCrest); - plLineOffsetFactorBelowShoulderCrest = value; - DataEventPublisher.AfterChange(this, x => x.PlLineOffsetFactorBelowShoulderCrest); - } - } - // /// Gets or sets the intrusion vertical water pressure. /// @@ -2048,69 +1689,6 @@ } } - [Unit(UnitType.Length)] - [Label("River level")] - [Description("Water level in river")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(2, 6)] - [Clearable] - public virtual double? RiverLevel - { - get - { - return riverLevel; - } - set - { - DataEventPublisher.BeforeChange(this, "RiverLevel"); - riverLevel = value; - DataEventPublisher.AfterChange(this, "RiverLevel"); - } - } - - [Unit(UnitType.Length)] - [Label("River level low")] - [Description("Water height low")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(2, 7)] - [Clearable] - public virtual double? RiverLevelLow - { - get - { - return riverLevelLow; - } - set - { - DataEventPublisher.BeforeChange(this, "RiverLevelLow"); - riverLevelLow = value; - DataEventPublisher.AfterChange(this, "RiverLevelLow"); - } - } - - [Unit(UnitType.Length)] - [Label("Dike table height")] - [Description("Dike table height")] - [Format("F3")] - [Category(WaterCategory)] - [PropertyOrder(2, 8)] - [Clearable] - public virtual double? DikeTableHeight - { - get - { - return dikeTableHeight; - } - set - { - DataEventPublisher.BeforeChange(this, "DikeTableHeight"); - dikeTableHeight = value; - DataEventPublisher.AfterChange(this, "DikeTableHeight"); - } - } - #endregion /// @@ -2156,45 +1734,13 @@ { nameValuePairs.Add(LocationParameterNames.HeadPL2, HeadPL2.Value.ToString(numberFormatInfo)); } - if (HeadPl3.HasValue) - { - nameValuePairs.Add(LocationParameterNames.HeadPL3, HeadPl3.Value.ToString(numberFormatInfo)); - } - if (HeadPl4.HasValue) - { - nameValuePairs.Add(LocationParameterNames.HeadPL4, HeadPl4.Value.ToString(numberFormatInfo)); - } nameValuePairs.Add(LocationParameterNames.XSoilGeometry2DOrigin, XSoilGeometry2DOrigin.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.DikeEmbankmentMaterial, DikeEmbankmentMaterial); nameValuePairs.Add(LocationParameterNames.ShoulderEmbankmentMaterial, ShoulderEmbankmentMaterial); nameValuePairs.Add(LocationParameterNames.DampingFactorPL3, DampingFactorPL3.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.DampingFactorPL4, DampingFactorPL4.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.PenetrationLength, PenetrationLength.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.PLLineCreationMethod, PLLineCreationMethod.ToString()); - nameValuePairs.Add(LocationParameterNames.PLLineOffsetBelowDikeTopAtRiver, PlLineOffsetBelowDikeTopAtRiver.ToString(numberFormatInfo)); - nameValuePairs.Add(LocationParameterNames.PLLineOffsetBelowDikeTopAtPolder, PlLineOffsetBelowDikeTopAtPolder.ToString(numberFormatInfo)); - nameValuePairs.Add(LocationParameterNames.PLLineOffsetBelowShoulderBaseInside, PlLineOffsetBelowShoulderBaseInside.ToString(numberFormatInfo)); - nameValuePairs.Add(LocationParameterNames.PLLineOffsetBelowDikeToeAtPolder, PlLineOffsetBelowDikeToeAtPolder.ToString(numberFormatInfo)); - if (PlLineOffsetBelowDikeCrestMiddle.HasValue) - { - nameValuePairs.Add(LocationParameterNames.PlLineOffsetBelowDikeCrestMiddle, - PlLineOffsetBelowDikeCrestMiddle.Value.ToString(numberFormatInfo)); - } - if (PlLineOffsetFactorBelowShoulderCrest.HasValue) - { - nameValuePairs.Add(LocationParameterNames.PlLineOffsetFactorBelowShoulderCrest, - PlLineOffsetFactorBelowShoulderCrest.Value.ToString(numberFormatInfo)); - } - if (UsePlLineOffsetBelowDikeCrestMiddle.HasValue) - { - nameValuePairs.Add(LocationParameterNames.UsePlLineOffsetBelowDikeCrestMiddle, - UsePlLineOffsetBelowDikeCrestMiddle.Value.ToString()); - } - if (UsePlLineOffsetFactorBelowShoulderCrest.HasValue) - { - nameValuePairs.Add(LocationParameterNames.UsePlLineOffsetFactorBelowShoulderCrest, - UsePlLineOffsetFactorBelowShoulderCrest.Value.ToString()); - } if (IntrusionVerticalWaterPressure.HasValue) { nameValuePairs.Add(LocationParameterNames.IntrusionVerticalWaterPressure, @@ -2207,26 +1753,6 @@ nameValuePairs.Add(LocationParameterNames.TL_DegreeOfConsolidation, TL_DegreeOfConsolidation.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.MinimalCircleDepth, MinimalCircleDepth.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.DistanceToEntryPoint, DistanceToEntryPoint.ToString(numberFormatInfo)); - if (ModelFactors.RequiredSafetyFactorStabilityInnerSlope != null) - { - nameValuePairs.Add(LocationParameterNames.RequiredSafetyFactorStabilityInnerSlope, ModelFactors.RequiredSafetyFactorStabilityInnerSlope.Value.ToString(numberFormatInfo)); - } - if (ModelFactors.RequiredSafetyFactorStabilityOuterSlope != null) - { - nameValuePairs.Add(LocationParameterNames.RequiredSafetyFactorStabilityOuterSlope, ModelFactors.RequiredSafetyFactorStabilityOuterSlope.Value.ToString(numberFormatInfo)); - } - if (ModelFactors.RequiredSafetyFactorPiping != null) - { - nameValuePairs.Add(LocationParameterNames.RequiredSafetyFactorPiping, ModelFactors.RequiredSafetyFactorPiping.Value.ToString(numberFormatInfo)); - } - if (ModelFactors.UpliftCriterionPiping != null) - { - nameValuePairs.Add(LocationParameterNames.UpliftCriterionPiping, ModelFactors.UpliftCriterionPiping.Value.ToString(numberFormatInfo)); - } - if (ModelFactors.UpliftCriterionStability != null) - { - nameValuePairs.Add(LocationParameterNames.UpliftCriterionStability, ModelFactors.UpliftCriterionStability.Value.ToString(numberFormatInfo)); - } nameValuePairs.Add(LocationParameterNames.StabilityZoneType, StabilityZoneType.ToString()); nameValuePairs.Add(LocationParameterNames.ForbiddenZoneFactor, ForbiddenZoneFactor.ToString(numberFormatInfo)); nameValuePairs.Add(LocationParameterNames.ZoneAreaRestSlopeCrestWidth, ZoneAreaRestSlopeCrestWidth.ToString(numberFormatInfo)); @@ -2255,18 +1781,6 @@ nameValuePairs.Add(LocationParameterNames.UseNewMinDistanceDikeToeStartDitch, UseNewMinDistanceDikeToeStartDitch.ToString()); nameValuePairs.Add(LocationParameterNames.UseNewShoulderBaseSlope, UseNewShoulderBaseSlope.ToString()); nameValuePairs.Add(LocationParameterNames.UseNewShoulderTopSlope, UseNewShoulderTopSlope.ToString()); - if (DikeTableHeight.HasValue) - { - nameValuePairs.Add(LocationParameterNames.DikeTableHeight, DikeTableHeight.Value.ToString(numberFormatInfo)); - } - if (RiverLevel.HasValue) - { - nameValuePairs.Add(LocationParameterNames.RiverLevel, RiverLevel.Value.ToString(numberFormatInfo)); - } - if (RiverLevelLow.HasValue) - { - nameValuePairs.Add(LocationParameterNames.RiverLevelLow, RiverLevelLow.Value.ToString(numberFormatInfo)); - } return nameValuePairs; } @@ -2511,14 +2025,6 @@ { HeadPL2 = Convert.ToDouble(parameterValue, numberFormatInfo); } - if (parameterName.Equals(LocationParameterNames.HeadPL3)) - { - HeadPl3 = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.HeadPL4)) - { - HeadPl4 = Convert.ToDouble(parameterValue, numberFormatInfo); - } if (parameterName.Equals(LocationParameterNames.XSoilGeometry2DOrigin)) { XSoilGeometry2DOrigin = Convert.ToDouble(parameterValue, numberFormatInfo); @@ -2547,38 +2053,6 @@ { PLLineCreationMethod = (PLLineCreationMethod) Enum.Parse(typeof(PLLineCreationMethod), parameterValue); } - if (parameterName.Equals(LocationParameterNames.PLLineOffsetBelowDikeTopAtRiver)) - { - PlLineOffsetBelowDikeTopAtRiver = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.PLLineOffsetBelowDikeTopAtPolder)) - { - PlLineOffsetBelowDikeTopAtPolder = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.PLLineOffsetBelowShoulderBaseInside)) - { - PlLineOffsetBelowShoulderBaseInside = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.PLLineOffsetBelowDikeToeAtPolder)) - { - PlLineOffsetBelowDikeToeAtPolder = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.PlLineOffsetBelowDikeCrestMiddle)) - { - PlLineOffsetBelowDikeCrestMiddle = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.PlLineOffsetFactorBelowShoulderCrest)) - { - PlLineOffsetFactorBelowShoulderCrest = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.UsePlLineOffsetBelowDikeCrestMiddle)) - { - UsePlLineOffsetBelowDikeCrestMiddle = Convert.ToBoolean(parameterValue); - } - if (parameterName.Equals(LocationParameterNames.UsePlLineOffsetFactorBelowShoulderCrest)) - { - UsePlLineOffsetFactorBelowShoulderCrest = Convert.ToBoolean(parameterValue); - } if (parameterName.Equals(LocationParameterNames.IntrusionVerticalWaterPressure)) { IntrusionVerticalWaterPressure = @@ -2614,26 +2088,6 @@ { DistanceToEntryPoint = Convert.ToDouble(parameterValue, numberFormatInfo); } - if (parameterName.Equals(LocationParameterNames.RequiredSafetyFactorStabilityInnerSlope)) - { - ModelFactors.RequiredSafetyFactorStabilityInnerSlope = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.RequiredSafetyFactorStabilityOuterSlope)) - { - ModelFactors.RequiredSafetyFactorStabilityOuterSlope = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.RequiredSafetyFactorPiping)) - { - ModelFactors.RequiredSafetyFactorPiping = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.UpliftCriterionPiping)) - { - ModelFactors.UpliftCriterionPiping = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.UpliftCriterionStability)) - { - ModelFactors.UpliftCriterionStability = Convert.ToDouble(parameterValue, numberFormatInfo); - } if (parameterName.Equals(LocationParameterNames.StabilityZoneType)) { StabilityZoneType = (MStabZonesType) Enum.Parse(typeof(MStabZonesType), parameterValue); @@ -2741,18 +2195,6 @@ { UseNewShoulderTopSlope = Convert.ToBoolean(parameterValue, numberFormatInfo); } - if (parameterName.Equals(LocationParameterNames.DikeTableHeight)) - { - DikeTableHeight = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.RiverLevel)) - { - RiverLevel = Convert.ToDouble(parameterValue, numberFormatInfo); - } - if (parameterName.Equals(LocationParameterNames.RiverLevelLow)) - { - RiverLevelLow = Convert.ToDouble(parameterValue, numberFormatInfo); - } } #region IVisibleEnabled Members @@ -2857,30 +2299,6 @@ case "NewDepthDitch": case "NewSlopeAngleDitch": return isDesign && StabilityDesignMethod != StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption; - - // Next will are all parameters that are displayed by the scenarios tab - case "ModelFactorRequiredSafetyFactorPiping": - case "ModelFactorRequiredSafetyFactorStabilityInnerSlope": - case "ModelFactorRequiredSafetyFactorStabilityOuterSlope": - return false; // Probably obsolete, because it is defined in the scenario - case "PlLineOffsetBelowDikeToeAtPolder": - case "PlLineOffsetBelowDikeTopAtPolder": - case "PlLineOffsetBelowDikeTopAtRiver": - case "PlLineOffsetBelowShoulderBaseInside": - case "PlLineOffsetBelowDikeCrestMiddle": - case "PlLineOffsetFactorBelowShoulderCrest": - case "UsePlLineOffsetBelowDikeCrestMiddle": - case "UsePlLineOffsetFactorBelowShoulderCrest": - return !isDesign && arePlLineCreationExpertKnowledgeParametersNeeded; - case "UpliftCriterionStability": - case "UpliftCriterionPiping": - case "HeadPl3": - case "HeadPl4": - case "DikeTableHeight": - case "RiverLevel": - case "RiverLevelLow": - return !isDesign; - default: return true; } @@ -2969,14 +2387,6 @@ { NewDikeSlopeOutside = newDikeSlopeOutsideMinValue; } - if (id == "AssignMinValue" && property == "PlLineOffsetFactorBelowShoulderCrest") - { - PlLineOffsetFactorBelowShoulderCrest = DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMinValue; - } - if (id == "AssignMaxValue" && property == "PlLineOffsetFactorBelowShoulderCrest") - { - PlLineOffsetFactorBelowShoulderCrest = DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue; - } if (id == "AssignMinValue" && property == "PenetrationLength") { PenetrationLength = penetrationLenghtMinValue;