Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs =================================================================== diff -u -r453 -r454 --- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 453) +++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 454) @@ -1292,8 +1292,9 @@ { Soil.AllowedUserColumnFilters = new[] { - UserColumnFilters.MacrostabilityBasicModule, - UserColumnFilters.PipingRingtoets, + UserColumnFilters.MacrostabilityWti, + UserColumnFilters.PipingWti, + UserColumnFilters.FlowSlideWti, }; } Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs =================================================================== diff -u -r385 -r454 --- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs (.../DSoilModelContextTest.cs) (revision 385) +++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs (.../DSoilModelContextTest.cs) (revision 454) @@ -35,8 +35,8 @@ #endregion - [TestCase(UserColumnFilters.MacrostabilityBasicModule, Mechanism.Stability)] - [TestCase(UserColumnFilters.PipingRingtoets, Mechanism.Piping)] + [TestCase(UserColumnFilters.MacrostabilityWti, Mechanism.Stability)] + [TestCase(UserColumnFilters.PipingWti, Mechanism.Piping)] public void SoilFiltering_UserColumnFilterForMechanism_HasMembersWithSameMechanism(UserColumnFilters filter, Mechanism mechanism) { var membersInFilterDefinition = GetFilterDefinition(filter); @@ -119,24 +119,31 @@ var visibleProperties = new List { StaticReflection.GetMemberName(s => s.AbovePhreaticLevel), + StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), StaticReflection.GetMemberName(s => s.BelowPhreaticLevel), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), StaticReflection.GetMemberName(s => s.Cohesion), + StaticReflection.GetMemberName(s => s.CohesionStochast), StaticReflection.GetMemberName(s => s.FrictionAngle), + StaticReflection.GetMemberName(s => s.FrictionAngleStochast), StaticReflection.GetMemberName(s => s.RatioCuPc), + StaticReflection.GetMemberName(s => s.RatioCuPcStochast), StaticReflection.GetMemberName(s => s.StrengthIncreaseExponent), + StaticReflection.GetMemberName(s => s.StrengthIncreaseExponentStochast), StaticReflection.GetMemberName(s => s.POP), + StaticReflection.GetMemberName(s => s.POPStochast), StaticReflection.GetMemberName(s => s.ShearStrengthModel), StaticReflection.GetMemberName(s => s.UsePop) }; visibleProperties.AddRange(alwaysVisibleProperties); - AdhereToFilter(UserColumnFilters.MacrostabilityBasicModule, visibleProperties); + AdhereToFilter(UserColumnFilters.MacrostabilityWti, visibleProperties); } [Test] - public void DSoilModelContext_SoilMemberIsEnabled_AdhereToFilterMacrostabilityBasicModule() + public void DSoilModelContext_SoilMemberIsEnabled_AdhereToFilterMacrostabilityWti() { - var context = SetupDSoilModelContext(UserColumnFilters.MacrostabilityBasicModule); + var context = SetupDSoilModelContext(UserColumnFilters.MacrostabilityWti); var soil = new Soil { ShearStrengthModel = ShearStrengthModel.CPhi, @@ -165,21 +172,50 @@ } [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterPipingRingToets() + public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterPipingWti() { var visibleProperties = new List { + StaticReflection.GetMemberName(s => s.AbovePhreaticLevel), + StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevel), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), + StaticReflection.GetMemberName(s => s.DiameterD70), StaticReflection.GetMemberName(s => s.DiameterD70Stochast), + StaticReflection.GetMemberName(s => s.PermeabKx), StaticReflection.GetMemberName(s => s.PermeabKxStochast), - StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), - StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast) }; visibleProperties.AddRange(alwaysVisibleProperties); - AdhereToFilter(UserColumnFilters.PipingRingtoets, visibleProperties); + AdhereToFilter(UserColumnFilters.PipingWti, visibleProperties); } [Test] + public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterFlowslideWti() + { + var visibleProperties = new List + { + StaticReflection.GetMemberName(s => s.DiameterD15), + StaticReflection.GetMemberName(s => s.DiameterD50), + StaticReflection.GetMemberName(s => s.FrictionAngle), + StaticReflection.GetMemberName(s => s.Porosity), + StaticReflection.GetMemberName(s => s.MinPorosity), + StaticReflection.GetMemberName(s => s.MaxPorosity), + StaticReflection.GetMemberName(s => s.Evoldm), + StaticReflection.GetMemberName(s => s.Ks0), + StaticReflection.GetMemberName(s => s.GammaKorrel), + StaticReflection.GetMemberName(s => s.ParM), + StaticReflection.GetMemberName(s => s.ParU), + StaticReflection.GetMemberName(s => s.ParV), + StaticReflection.GetMemberName(s => s.ParR), + }; + visibleProperties.AddRange(alwaysVisibleProperties); + + AdhereToFilter(UserColumnFilters.FlowSlideWti, visibleProperties); + } + + + [Test] public void DSoilModelContext_ParameterViewForPreconsolidationStress_Visibility() { var dSoilModelContext = SetupDSoilModelContext(null); Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs =================================================================== diff -u -r435 -r454 --- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 435) +++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 454) @@ -22,27 +22,55 @@ StaticReflection.GetMemberName(s => s.SoilType), }; - private readonly HashSet macrostabilityBasicProperties = new HashSet + private readonly HashSet macrostabilitySoilProperties = new HashSet { StaticReflection.GetMemberName(s => s.AbovePhreaticLevel), + StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), StaticReflection.GetMemberName(s => s.BelowPhreaticLevel), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), StaticReflection.GetMemberName(s => s.ShearStrengthModel), StaticReflection.GetMemberName(s => s.Cohesion), + StaticReflection.GetMemberName(s => s.CohesionStochast), StaticReflection.GetMemberName(s => s.FrictionAngle), + StaticReflection.GetMemberName(s => s.FrictionAngleStochast), StaticReflection.GetMemberName(s => s.UsePop), StaticReflection.GetMemberName(s => s.POP), + StaticReflection.GetMemberName(s => s.POPStochast), StaticReflection.GetMemberName(s => s.RatioCuPc), + StaticReflection.GetMemberName(s => s.RatioCuPcStochast), StaticReflection.GetMemberName(s => s.StrengthIncreaseExponent), + StaticReflection.GetMemberName(s => s.StrengthIncreaseExponentStochast) }; - private readonly HashSet pipingRingtoetsProperties = new HashSet + private readonly HashSet pipingSoilProperties = new HashSet { - StaticReflection.GetMemberName(s => s.DiameterD70Stochast), - StaticReflection.GetMemberName(s => s.PermeabKxStochast), + StaticReflection.GetMemberName(s => s.AbovePhreaticLevel), StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevel), + StaticReflection.GetMemberName(s => s.DiameterD70), + StaticReflection.GetMemberName(s => s.DiameterD70Stochast), + StaticReflection.GetMemberName(s => s.PermeabKx), + StaticReflection.GetMemberName(s => s.PermeabKxStochast), }; + private readonly HashSet flowslideSoilProperties = new HashSet + { + StaticReflection.GetMemberName(s => s.DiameterD15), + StaticReflection.GetMemberName(s => s.DiameterD50), + StaticReflection.GetMemberName(s => s.FrictionAngle), + StaticReflection.GetMemberName(s => s.Porosity), + StaticReflection.GetMemberName(s => s.MinPorosity), + StaticReflection.GetMemberName(s => s.MaxPorosity), + StaticReflection.GetMemberName(s => s.Evoldm), + StaticReflection.GetMemberName(s => s.Ks0), + StaticReflection.GetMemberName(s => s.GammaKorrel), + StaticReflection.GetMemberName(s => s.ParM), + StaticReflection.GetMemberName(s => s.ParU), + StaticReflection.GetMemberName(s => s.ParV), + StaticReflection.GetMemberName(s => s.ParR), + }; + #endregion /// @@ -340,14 +368,18 @@ { switch ((UserColumnFilters)soilUserFilter) { - case UserColumnFilters.MacrostabilityBasicModule: + case UserColumnFilters.MacrostabilityWti: { - return macrostabilityBasicProperties; + return macrostabilitySoilProperties; } - case UserColumnFilters.PipingRingtoets: + case UserColumnFilters.PipingWti: { - return pipingRingtoetsProperties; + return pipingSoilProperties; } + case UserColumnFilters.FlowSlideWti: + { + return flowslideSoilProperties; + } } }