Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs =================================================================== diff -u -r101 -r106 --- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 101) +++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 106) @@ -1045,19 +1045,9 @@ // with the selected CurrentMechanism of the project. Soil.Mechanisms = new[] { -// Mechanism.AnchorLoading, -// Mechanism.AssessmentLevel, -// Mechanism.DAM, -// Mechanism.Koswat, Mechanism.None, -// Mechanism.Overtopping, Mechanism.Piping, -// Mechanism.BlockRevetment, -// Mechanism.Settlement, Mechanism.Stability, - Mechanism.FlowSlide -// Mechanism.Structures, -// Mechanism.Dunes }; // The MechanismSupport.Mechanisms list is the list of available mechanisme filter(s) for this program and should NEVER // be altered elsewhere in the program. @@ -1068,22 +1058,8 @@ { Soil.AllowedUserColumnFilters = new[] { - UserColumnFilters.DGeoStability, -// UserColumnFilters.DGeoStabilityCPhiModel, -// UserColumnFilters.DGeoStabilitySuCalculated, -// UserColumnFilters.DGeoStabilitySuMeasured, -// UserColumnFilters.DGeoStabilitySuGradient, -// UserColumnFilters.ShearStrengthParameters, -// UserColumnFilters.ShearStrengthInput, -// UserColumnFilters.ShearStrengthModel, - UserColumnFilters.Piping, - UserColumnFilters.FlowSlideGlobalDetailed, -// UserColumnFilters.UnitWeightFilter, -// UserColumnFilters.Probabilistic, -// UserColumnFilters.StiffnessParameters, -// UserColumnFilters.BishopProbabilistic, - UserColumnFilters.FlowSlideAdvancedLiquefaction, - UserColumnFilters.FlowSlideAdvancedBreaching + UserColumnFilters.MacrostabilityBasicModule, + UserColumnFilters.PipingRingtoets, }; } Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs =================================================================== diff -u -r72 -r106 --- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 72) +++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 106) @@ -16,12 +16,34 @@ private readonly HashSet alwaysVisibleProperties = new HashSet { - "Name", - "Description", - "Color", - "SoilType" + StaticReflection.GetMemberName(s => s.Name), + StaticReflection.GetMemberName(s => s.Description), + StaticReflection.GetMemberName(s => s.Color), + StaticReflection.GetMemberName(s => s.SoilType), }; + private readonly HashSet macrostabilityBasicProperties = new HashSet + { + StaticReflection.GetMemberName(s => s.AbovePhreaticLevel), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevel), + StaticReflection.GetMemberName(s => s.Cohesion), + StaticReflection.GetMemberName(s => s.FrictionAngle), + StaticReflection.GetMemberName(s => s.RatioCuPc), + StaticReflection.GetMemberName(s => s.StrengthIncreaseExponent), + StaticReflection.GetMemberName(s => s.POP), + StaticReflection.GetMemberName(s => s.ShearStrengthModel), + StaticReflection.GetMemberName(s => s.UsePop) + }; + + private readonly HashSet pipingRingtoetsProperties = new HashSet + { + StaticReflection.GetMemberName(s => s.DiameterD70Stochast), + StaticReflection.GetMemberName(s => s.PermeabKxStochast), + StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), + }; + + private readonly HashSet dGeoStabilityProperties = new HashSet { // "AbovePhreaticLevel", @@ -421,6 +443,14 @@ { switch ((UserColumnFilters)soilUserFilter) { + case UserColumnFilters.MacrostabilityBasicModule: + { + return macrostabilityBasicProperties; + } + case UserColumnFilters.PipingRingtoets: + { + return pipingRingtoetsProperties; + } case UserColumnFilters.DGeoStability: { return dGeoStabilityProperties;