Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rf8770babfd0b96e25255636801666c75f339cc90 -r9556f92e5f1409c9ab92174edc76d11ecb3c077e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f8770babfd0b96e25255636801666c75f339cc90)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9556f92e5f1409c9ab92174edc76d11ecb3c077e)
@@ -509,6 +509,24 @@
}
///
+ /// Looks up a localized string similar to Modelfactor die wordt gebruikt bij de berekening van de benaderde faalkans op basis van de berekende stabiliteitsfactor..
+ ///
+ public static string MacroStabilityInwardsFailureMechanismContextProperties_ModelFactor_Description {
+ get {
+ return ResourceManager.GetString("MacroStabilityInwardsFailureMechanismContextProperties_ModelFactor_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Modelfactor [-].
+ ///
+ public static string MacroStabilityInwardsFailureMechanismContextProperties_ModelFactor_DisplayName {
+ get {
+ return ResourceManager.GetString("MacroStabilityInwardsFailureMechanismContextProperties_ModelFactor_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De locatie met hydraulische randvoorwaarden waarvan het berekende toetspeil wordt gebruikt..
///
public static string MacroStabilityInwardsInput_HydraulicBoundaryLocation_Description {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -rf8770babfd0b96e25255636801666c75f339cc90 -r9556f92e5f1409c9ab92174edc76d11ecb3c077e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision f8770babfd0b96e25255636801666c75f339cc90)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9556f92e5f1409c9ab92174edc76d11ecb3c077e)
@@ -760,4 +760,10 @@
[-]
+
+ Modelfactor die wordt gebruikt bij de berekening van de benaderde faalkans op basis van de berekende stabiliteitsfactor.
+
+
+ Modelfactor [-]
+
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismContextProperties.cs
===================================================================
diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r9556f92e5f1409c9ab92174edc76d11ecb3c077e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismContextProperties.cs (.../MacroStabilityInwardsFailureMechanismContextProperties.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismContextProperties.cs (.../MacroStabilityInwardsFailureMechanismContextProperties.cs) (revision 9556f92e5f1409c9ab92174edc76d11ecb3c077e)
@@ -62,6 +62,23 @@
propertyChangeHandler = handler;
}
+ #region Model settings
+
+ [DynamicVisible]
+ [PropertyOrder(4)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsFailureMechanismContextProperties_ModelFactor_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsFailureMechanismContextProperties_ModelFactor_Description))]
+ public double ModelFactor
+ {
+ get
+ {
+ return data.WrappedData.GeneralInput.ModelFactor;
+ }
+ }
+
+ #endregion
+
[DynamicVisibleValidationMethod]
public bool DynamicVisibleValidationMethod(string propertyName)
{
@@ -95,7 +112,8 @@
private bool ShouldHidePropertyWhenFailureMechanismIrrelevant(string propertyName)
{
return nameof(A).Equals(propertyName)
- || nameof(B).Equals(propertyName);
+ || nameof(B).Equals(propertyName)
+ || nameof(ModelFactor).Equals(propertyName);
}
#region General
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r9556f92e5f1409c9ab92174edc76d11ecb3c077e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismContextPropertiesTest.cs (.../MacroStabilityInwardsFailureMechanismContextPropertiesTest.cs) (revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismContextPropertiesTest.cs (.../MacroStabilityInwardsFailureMechanismContextPropertiesTest.cs) (revision 9556f92e5f1409c9ab92174edc76d11ecb3c077e)
@@ -103,6 +103,7 @@
Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.A, properties.A);
Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.B, properties.B);
+ Assert.AreEqual(failureMechanism.GeneralInput.ModelFactor, properties.ModelFactor);
mockRepository.VerifyAll();
}
@@ -129,10 +130,11 @@
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(5, dynamicProperties.Count);
+ Assert.AreEqual(6, dynamicProperties.Count);
const string generalCategory = "Algemeen";
const string semiProbabilisticCategory = "Semi-probabilistische parameters";
+ const string modelSettingsCategory = "Modelinstellingen";
PropertyDescriptor nameProperty = dynamicProperties[0];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
@@ -155,13 +157,20 @@
"Geeft aan of dit toetsspoor relevant is of niet.",
true);
- PropertyDescriptor aProperty = dynamicProperties[3];
+ PropertyDescriptor modelFactorProperty = dynamicProperties[3];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(modelFactorProperty,
+ modelSettingsCategory,
+ "Modelfactor [-]",
+ "Modelfactor die wordt gebruikt bij de berekening van de benaderde faalkans op basis van de berekende stabiliteitsfactor.",
+ true);
+
+ PropertyDescriptor aProperty = dynamicProperties[4];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(aProperty,
semiProbabilisticCategory,
"a [-]",
"De parameter 'a' die gebruikt wordt voor het lengte-effect in berekening van de maximaal toelaatbare faalkans.");
- PropertyDescriptor bProperty = dynamicProperties[4];
+ PropertyDescriptor bProperty = dynamicProperties[5];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(bProperty,
semiProbabilisticCategory,
"b [m]",
@@ -327,6 +336,7 @@
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.A)));
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.B)));
+ Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactor)));
Assert.IsTrue(properties.DynamicVisibleValidationMethod(null));