Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs =================================================================== diff -u -r549 -r552 --- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs (.../DSoilModelContextTest.cs) (revision 549) +++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs (.../DSoilModelContextTest.cs) (revision 552) @@ -172,23 +172,23 @@ UseDefaultShearStrengthModel = false, // or it will mess up this test ! }; - Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion))); - Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle))); - Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop))); Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP))); - Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc))); - Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent))); soil.ShearStrengthModel = ShearStrengthModel.CuCalculated; - Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion))); - Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle))); - Assert.IsNull(context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop))); soil.UsePop = true; Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP))); - Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc))); - Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent))); soil.UsePop = false; - Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.POP))); + Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP))); Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc))); Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent))); } Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs =================================================================== diff -u -r549 -r552 --- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 549) +++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 552) @@ -339,6 +339,8 @@ return false; } } + + return true; // all other parameters should be editable } var grid = source as GridViewControl;