Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -105,7 +105,7 @@ penetrationLength = new RoundedDouble(2, double.NaN); GridDeterminationType = MacroStabilityInwardsGridDeterminationType.Automatic; - TangentLineDetermination = MacroStabilityInwardsTangentLineDetermination.LayerSeparated; + TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated; tangentLineZTop = new RoundedDouble(2, double.NaN); tangentLineZBottom = new RoundedDouble(2, double.NaN); @@ -285,7 +285,7 @@ /// /// Gets or sets the tangent line determination type. /// - public MacroStabilityInwardsTangentLineDetermination TangentLineDetermination { get; set; } + public MacroStabilityInwardsTangentLineDeterminationType TangentLineDeterminationType { get; set; } /// /// Gets or sets the tangent line z top. Fisheye: Tag 9743fa24b1c44e916c046064a361f4901f993f92 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsTangentLineDetermination.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsTangentLineDeterminationType.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsTangentLineDeterminationType.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsTangentLineDeterminationType.cs (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -0,0 +1,38 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Utils.Attributes; +using Ringtoets.MacroStabilityInwards.Data.Properties; + +namespace Ringtoets.MacroStabilityInwards.Data +{ + /// + /// The tangent line determination types. + /// + public enum MacroStabilityInwardsTangentLineDeterminationType + { + [ResourcesDisplayName(typeof(Resources), nameof(Resources.Specified_DisplayName))] + Specified = 1, + + [ResourcesDisplayName(typeof(Resources), nameof(Resources.LayerSeparated_DisplayName))] + LayerSeparated = 2 + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -54,7 +54,7 @@ - + Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -1175,18 +1175,18 @@ /// /// Looks up a localized string similar to Bepaling raaklijnen op basis van grondlaagscheidingen of handmatig?. /// - public static string TangentLineDetermination_Description { + public static string TangentLineDeterminationType_Description { get { - return ResourceManager.GetString("TangentLineDetermination_Description", resourceCulture); + return ResourceManager.GetString("TangentLineDeterminationType_Description", resourceCulture); } } /// /// Looks up a localized string similar to Bepaling tangentlijnen. /// - public static string TangentLineDetermination_DisplayName { + public static string TangentLineDeterminationType_DisplayName { get { - return ResourceManager.GetString("TangentLineDetermination_DisplayName", resourceCulture); + return ResourceManager.GetString("TangentLineDeterminationType_DisplayName", resourceCulture); } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -448,10 +448,10 @@ Rechter grid - + Bepaling raaklijnen op basis van grondlaagscheidingen of handmatig? - + Bepaling tangentlijnen Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsGridSettingsProperties.cs =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsGridSettingsProperties.cs (.../MacroStabilityInwardsGridSettingsProperties.cs) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsGridSettingsProperties.cs (.../MacroStabilityInwardsGridSettingsProperties.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -41,7 +41,7 @@ { private const int moveGridPropertyIndex = 1; private const int gridDeterminationTypePropertyIndex = 2; - private const int tangentLineDeterminationPropertyIndex = 3; + private const int tangentLineDeterminationTypePropertyIndex = 3; private const int tangentLineZTopPropertyIndex = 4; private const int tangentLineZBottomPropertyIndex = 5; private const int leftGridPropertyIndex = 6; @@ -102,21 +102,21 @@ } } - [PropertyOrder(tangentLineDeterminationPropertyIndex)] + [PropertyOrder(tangentLineDeterminationTypePropertyIndex)] [DynamicReadOnly] [ResourcesCategory(typeof(Resources), nameof(Resources.GridSettings_DisplayName))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.TangentLineDetermination_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.TangentLineDetermination_Description))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.TangentLineDeterminationType_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.TangentLineDeterminationType_Description))] [TypeConverter(typeof(EnumTypeConverter))] - public MacroStabilityInwardsTangentLineDetermination TangentLineDetermination + public MacroStabilityInwardsTangentLineDeterminationType TangentLineDeterminationType { get { - return data.TangentLineDetermination; + return data.TangentLineDeterminationType; } set { - PropertyChangeHelper.ChangePropertyAndNotify(() => data.TangentLineDetermination = value, propertyChangeHandler); + PropertyChangeHelper.ChangePropertyAndNotify(() => data.TangentLineDeterminationType = value, propertyChangeHandler); } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -209,7 +209,7 @@ GridAutomaticDetermined = inputParameters.GridDeterminationType == MacroStabilityInwardsGridDeterminationType.Automatic, LeftGrid = inputParameters.LeftGrid, RightGrid = inputParameters.RightGrid, - TangentLineAutomaticAtBoundaries = inputParameters.TangentLineDetermination == MacroStabilityInwardsTangentLineDetermination.LayerSeparated, + TangentLineAutomaticAtBoundaries = inputParameters.TangentLineDeterminationType == MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated, TangentLineZTop = inputParameters.TangentLineZTop, TangentLineZBottom = inputParameters.TangentLineZBottom, CreateZones = inputParameters.CreateZones, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -127,7 +127,7 @@ Assert.AreEqual(2, inputParameters.PenetrationLength.NumberOfDecimalPlaces); Assert.AreEqual(MacroStabilityInwardsGridDeterminationType.Automatic, inputParameters.GridDeterminationType); - Assert.AreEqual(MacroStabilityInwardsTangentLineDetermination.LayerSeparated, inputParameters.TangentLineDetermination); + Assert.AreEqual(MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated, inputParameters.TangentLineDeterminationType); Assert.IsNaN(inputParameters.TangentLineZTop); Assert.AreEqual(2, inputParameters.TangentLineZTop.NumberOfDecimalPlaces); Fisheye: Tag 9743fa24b1c44e916c046064a361f4901f993f92 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -0,0 +1,63 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; +using Core.Common.TestUtil; +using NUnit.Framework; + +namespace Ringtoets.MacroStabilityInwards.Data.Test +{ + [TestFixture] + public class MacroStabilityInwardsTangentLineDeterminationTypeTest : EnumTestFixture + { + protected override IDictionary ExpectedDisplayNameForEnumValues + { + get + { + return new Dictionary + { + { + MacroStabilityInwardsTangentLineDeterminationType.Specified, "Gespecificeerd" + }, + { + MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated, "Op laagscheiding" + } + }; + } + } + + protected override IDictionary ExpectedValueForEnumValues + { + get + { + return new Dictionary + { + { + MacroStabilityInwardsTangentLineDeterminationType.Specified, 1 + }, + { + MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated, 2 + } + }; + } + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.Test.csproj) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.Test.csproj) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -66,7 +66,7 @@ - + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs (.../MacroStabilityInwardsGridSettingsPropertiesTest.cs) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridSettingsPropertiesTest.cs (.../MacroStabilityInwardsGridSettingsPropertiesTest.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -42,7 +42,7 @@ { private const int expectedMoveGridPropertyIndex = 0; private const int expectedGridDeterminationTypePropertyIndex = 1; - private const int expectedTangentLineDeterminationPropertyIndex = 2; + private const int expectedTangentLineDeterminationTypePropertyIndex = 2; private const int expectedTangentLineZTopPropertyIndex = 3; private const int expectedTangentLineZBottomPropertyIndex = 4; private const int expectedLeftGridPropertyIndex = 5; @@ -138,10 +138,10 @@ "Bepaling grid", "Rekengrid automatisch bepalen of handmatig invoeren?"); - PropertyDescriptor tangentLineDeterminationProperty = dynamicProperties[expectedTangentLineDeterminationPropertyIndex]; - TestHelper.AssertTypeConverter(nameof(properties.TangentLineDetermination)); + PropertyDescriptor tangentLineDeterminationTypeProperty = dynamicProperties[expectedTangentLineDeterminationTypePropertyIndex]; + TestHelper.AssertTypeConverter(nameof(properties.TangentLineDeterminationType)); PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - tangentLineDeterminationProperty, + tangentLineDeterminationTypeProperty, calculationGridsCategory, "Bepaling tangentlijnen", "Bepaling raaklijnen op basis van grondlaagscheidingen of handmatig?", @@ -206,7 +206,7 @@ // Assert Assert.AreEqual(input.MoveGrid, properties.MoveGrid); Assert.AreEqual(input.GridDeterminationType, properties.GridDeterminationType); - Assert.AreEqual(input.TangentLineDetermination, properties.TangentLineDetermination); + Assert.AreEqual(input.TangentLineDeterminationType, properties.TangentLineDeterminationType); Assert.AreEqual(input.TangentLineZTop, properties.TangentLineZTop); Assert.AreEqual(input.TangentLineZBottom, properties.TangentLineZBottom); @@ -231,21 +231,21 @@ var random = new Random(); bool moveGrid = random.NextBoolean(); var gridDeterminationType = random.NextEnumValue(); - var tangentLineDetermination = random.NextEnumValue(); + var tangentLineDeterminationType = random.NextEnumValue(); double tangentLineZTop = random.Next(); double tangentLineZBottom = random.Next(); // When properties.MoveGrid = moveGrid; properties.GridDeterminationType = gridDeterminationType; - properties.TangentLineDetermination = tangentLineDetermination; + properties.TangentLineDeterminationType = tangentLineDeterminationType; properties.TangentLineZTop = (RoundedDouble) tangentLineZTop; properties.TangentLineZBottom = (RoundedDouble) tangentLineZBottom; // Then Assert.AreEqual(moveGrid, input.MoveGrid); Assert.AreEqual(gridDeterminationType, input.GridDeterminationType); - Assert.AreEqual(tangentLineDetermination, input.TangentLineDetermination); + Assert.AreEqual(tangentLineDeterminationType, input.TangentLineDeterminationType); Assert.AreEqual(tangentLineZTop, input.TangentLineZTop, input.TangentLineZTop.GetAccuracy()); Assert.AreEqual(tangentLineZBottom, input.TangentLineZBottom, input.TangentLineZBottom.GetAccuracy()); } @@ -271,13 +271,13 @@ } [Test] - public void TangentLineDetermination_SetValidValue_SetsValueAndUpdatesObservers() + public void TangentLineDeterminationType_SetValidValue_SetsValueAndUpdatesObservers() { // Setup var calculation = new MacroStabilityInwardsCalculationScenario(); // Call & Assert - SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.TangentLineDetermination = MacroStabilityInwardsTangentLineDetermination.Specified, calculation); + SetPropertyAndVerifyNotifcationsForCalculation(properties => properties.TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.Specified, calculation); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r5007be256ef2923a6aecbc2639b1e80f38f45539 -r9743fa24b1c44e916c046064a361f4901f993f92 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 5007be256ef2923a6aecbc2639b1e80f38f45539) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 9743fa24b1c44e916c046064a361f4901f993f92) @@ -375,7 +375,7 @@ Assert.AreEqual(originalInput.GridDeterminationType == MacroStabilityInwardsGridDeterminationType.Automatic, actualInput.GridAutomaticDetermined); Assert.AreEqual(originalInput.LeftGrid, actualInput.LeftGrid); Assert.AreEqual(originalInput.RightGrid, actualInput.RightGrid); - Assert.AreEqual(originalInput.TangentLineDetermination == MacroStabilityInwardsTangentLineDetermination.LayerSeparated, actualInput.TangentLineAutomaticAtBoundaries); + Assert.AreEqual(originalInput.TangentLineDeterminationType == MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated, actualInput.TangentLineAutomaticAtBoundaries); Assert.AreEqual(originalInput.TangentLineZTop, actualInput.TangentLineZTop); Assert.AreEqual(originalInput.TangentLineZBottom, actualInput.TangentLineZBottom); Assert.AreEqual(originalInput.CreateZones, actualInput.CreateZones);