Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs
===================================================================
diff -u -r3ac5065bf73f4816c743eed9668504af7485b4bc -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -633,7 +633,7 @@
///
/// Gets the zoning boundaries determination type.
///
- public MacroStabilityInwardsZoningBoundariesDeterminationType AutomaticForbiddenZones
+ public MacroStabilityInwardsZoningBoundariesDeterminationType ZoningBoundariesDeterminationType
{
get
{
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -100,24 +100,6 @@
}
///
- /// Looks up a localized string similar to Zoneringsgrenzen automatisch bepalen of handmatig invoeren?.
- ///
- public static string AutomaticForbiddenZones_Description {
- get {
- return ResourceManager.GetString("AutomaticForbiddenZones_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Methode.
- ///
- public static string AutomaticForbiddenZones_DisplayName {
- get {
- return ResourceManager.GetString("AutomaticForbiddenZones_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Grid.
///
public static string Categories_Grid {
@@ -1389,6 +1371,24 @@
}
///
+ /// Looks up a localized string similar to Zoneringsgrenzen automatisch bepalen of handmatig invoeren?.
+ ///
+ public static string ZoningBoundariesDeterminationType_Description {
+ get {
+ return ResourceManager.GetString("ZoningBoundariesDeterminationType_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Methode.
+ ///
+ public static string ZoningBoundariesDeterminationType_DisplayName {
+ get {
+ return ResourceManager.GetString("ZoningBoundariesDeterminationType_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Verticale coördinaat van de bovenkant van het rekengrid..
///
public static string ZTop_Description {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r9743fa24b1c44e916c046064a361f4901f993f92 -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9743fa24b1c44e916c046064a361f4901f993f92)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -514,10 +514,10 @@
Zonering glijvlak
-
+
Zoneringsgrenzen automatisch bepalen of handmatig invoeren?
-
+
Methode
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsProperties.cs
===================================================================
diff -u -r3ac5065bf73f4816c743eed9668504af7485b4bc -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsProperties.cs (.../MacroStabilityInwardsSlipPlaneSettingsProperties.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsProperties.cs (.../MacroStabilityInwardsSlipPlaneSettingsProperties.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -39,7 +39,7 @@
public class MacroStabilityInwardsSlipPlaneSettingsProperties : ObjectProperties
{
private const int createZonesPropertyIndex = 1;
- private const int automaticForbiddenZonesPropertyIndex = 2;
+ private const int zoningBoundariesDeterminationTypePropertyIndex = 2;
private readonly IObservablePropertyChangeHandler propertyChangeHandler;
@@ -80,16 +80,16 @@
}
}
- [PropertyOrder(automaticForbiddenZonesPropertyIndex)]
+ [PropertyOrder(zoningBoundariesDeterminationTypePropertyIndex)]
[ResourcesCategory(typeof(Resources), nameof(Resources.SlipPlaneSettings_DisplayName))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.AutomaticForbiddenZones_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.AutomaticForbiddenZones_Description))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ZoningBoundariesDeterminationType_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.ZoningBoundariesDeterminationType_Description))]
[TypeConverter(typeof(EnumTypeConverter))]
- public MacroStabilityInwardsZoningBoundariesDeterminationType AutomaticForbiddenZones
+ public MacroStabilityInwardsZoningBoundariesDeterminationType ZoningBoundariesDeterminationType
{
get
{
- return data.AutomaticForbiddenZones;
+ return data.ZoningBoundariesDeterminationType;
}
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorInput.cs
===================================================================
diff -u -r3dc254557ee133d8bee05fb8e6e5b9094d7ffc93 -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorInput.cs (.../MacroStabilityInwardsCalculatorInput.cs) (revision 3dc254557ee133d8bee05fb8e6e5b9094d7ffc93)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorInput.cs (.../MacroStabilityInwardsCalculatorInput.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -303,7 +303,7 @@
public bool CreateZones { internal get; set; }
///
- /// Gets or sets the automatic forbidden zones.
+ /// Gets or sets whether forbidden zones are automatically determined or not.
///
public bool AutomaticForbiddenZones { internal get; set; }
@@ -511,7 +511,7 @@
public bool CreateZones { get; }
///
- /// Gets the automatic forbidden zones.
+ /// Gets whether forbidden zones are automatically determined or not.
///
public bool AutomaticForbiddenZones { get; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IUpliftVanCalculator.cs
===================================================================
diff -u -ra568b0b61288dae503ebc8d86aec4ab3ce786add -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IUpliftVanCalculator.cs (.../IUpliftVanCalculator.cs) (revision a568b0b61288dae503ebc8d86aec4ab3ce786add)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/SubCalculator/IUpliftVanCalculator.cs (.../IUpliftVanCalculator.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -75,7 +75,7 @@
bool CreateZones { set; }
///
- /// Sets the automatic forbidden zones property.
+ /// Sets whether forbidden zones are automatically determined or not.
///
bool AutomaticForbiddenZones { set; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -r3ac5065bf73f4816c743eed9668504af7485b4bc -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -213,7 +213,7 @@
TangentLineZTop = inputParameters.TangentLineZTop,
TangentLineZBottom = inputParameters.TangentLineZBottom,
CreateZones = inputParameters.CreateZones,
- AutomaticForbiddenZones = inputParameters.AutomaticForbiddenZones == MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic,
+ AutomaticForbiddenZones = inputParameters.ZoningBoundariesDeterminationType == MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic,
SlipPlaneMinimumDepth = inputParameters.SlipPlaneMinimumDepth,
SlipPlaneMinimumLength = inputParameters.SlipPlaneMinimumLength
});
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs
===================================================================
diff -u -r3ac5065bf73f4816c743eed9668504af7485b4bc -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -139,7 +139,7 @@
Assert.IsNotNull(inputParameters.RightGrid);
Assert.IsTrue(inputParameters.CreateZones);
- Assert.AreEqual(MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, inputParameters.AutomaticForbiddenZones);
+ Assert.AreEqual(MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, inputParameters.ZoningBoundariesDeterminationType);
}
[Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs
===================================================================
diff -u -r4e00271fd762917c0ce059fe0697e607ed0065fb -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs (.../MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs) (revision 4e00271fd762917c0ce059fe0697e607ed0065fb)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs (.../MacroStabilityInwardsSlipPlaneSettingsPropertiesTest.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -39,7 +39,7 @@
public class MacroStabilityInwardsSlipPlaneSettingsPropertiesTest
{
private const int expectedCreateZonesPropertyIndex = 0;
- private const int expectedAutomaticForbiddenZonesPropertyIndex = 1;
+ private const int expectedZoningBoundariesDeterminationTypePropertyIndex = 1;
[Test]
public void Constructor_ExpectedValues()
@@ -116,10 +116,10 @@
"Bepaling",
"Gebruik zoneringsgrenzen bij het bepalen van het intredepunt van het glijvlak?");
- PropertyDescriptor automaticForbiddenZonesProperty = dynamicProperties[expectedAutomaticForbiddenZonesPropertyIndex];
- TestHelper.AssertTypeConverter(nameof(properties.AutomaticForbiddenZones));
+ PropertyDescriptor zoningBoundariesDeterminationTypeProperty = dynamicProperties[expectedZoningBoundariesDeterminationTypePropertyIndex];
+ TestHelper.AssertTypeConverter(nameof(properties.ZoningBoundariesDeterminationType));
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(
- automaticForbiddenZonesProperty,
+ zoningBoundariesDeterminationTypeProperty,
category,
"Methode",
"Zoneringsgrenzen automatisch bepalen of handmatig invoeren?",
@@ -143,7 +143,7 @@
// Assert
Assert.AreEqual(input.CreateZones, properties.CreateZones);
- Assert.AreEqual(input.AutomaticForbiddenZones, properties.AutomaticForbiddenZones);
+ Assert.AreEqual(input.ZoningBoundariesDeterminationType, properties.ZoningBoundariesDeterminationType);
mocks.VerifyAll();
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r3ac5065bf73f4816c743eed9668504af7485b4bc -r774ce2424ba4ccab70c6dad6198472977e2a8ace
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 3ac5065bf73f4816c743eed9668504af7485b4bc)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
@@ -379,7 +379,7 @@
Assert.AreEqual(originalInput.TangentLineZTop, actualInput.TangentLineZTop);
Assert.AreEqual(originalInput.TangentLineZBottom, actualInput.TangentLineZBottom);
Assert.AreEqual(originalInput.CreateZones, actualInput.CreateZones);
- Assert.AreEqual(originalInput.AutomaticForbiddenZones == MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, actualInput.AutomaticForbiddenZones);
+ Assert.AreEqual(originalInput.ZoningBoundariesDeterminationType == MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, actualInput.AutomaticForbiddenZones);
Assert.AreEqual(originalInput.SlipPlaneMinimumDepth, actualInput.SlipPlaneMinimumDepth);
Assert.AreEqual(originalInput.SlipPlaneMinimumLength, actualInput.SlipPlaneMinimumLength);
}