Fisheye: Tag f9cb0b4f173deb3519922fb8f073d8815c516950 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsDikeSoilScenario.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r214c28d886591428bbdaa6e06a57efe2fe06dc07 -rf9cb0b4f173deb3519922fb8f073d8815c516950 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 214c28d886591428bbdaa6e06a57efe2fe06dc07) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -91,24 +91,6 @@ } /// - /// Looks up a localized string similar to Klei dijk op klei (geval 1A). - /// - public static string ClayDikeOnClay_DisplayName { - get { - return ResourceManager.GetString("ClayDikeOnClay_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Klei dijk op zand (geval 1B). - /// - public static string ClayDikeOnSand_DisplayName { - get { - return ResourceManager.GetString("ClayDikeOnSand_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Op laagscheiding. /// public static string LayerSeparated_DisplayName { @@ -154,24 +136,6 @@ } /// - /// Looks up a localized string similar to Zand dijk op klei (geval 2A). - /// - public static string SandDikeOnClay_DisplayName { - get { - return ResourceManager.GetString("SandDikeOnClay_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Zand dijk op zand (geval 2B). - /// - public static string SandDikeOnSand_DisplayName { - get { - return ResourceManager.GetString("SandDikeOnSand_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Gespecificeerd. /// public static string Specified_DisplayName { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx =================================================================== diff -u -r214c28d886591428bbdaa6e06a57efe2fe06dc07 -rf9cb0b4f173deb3519922fb8f073d8815c516950 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 214c28d886591428bbdaa6e06a57efe2fe06dc07) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -132,18 +132,6 @@ Dijken en dammen - Macrostabiliteit binnenwaarts - - Klei dijk op klei (geval 1A) - - - Klei dijk op zand (geval 1B) - - - Zand dijk op klei (geval 2A) - - - Zand dijk op zand (geval 2B) - Automatisch Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj =================================================================== diff -u -r708bcebfe9e5db209c818a12d630cb418231f863 -rf9cb0b4f173deb3519922fb8f073d8815c516950 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision 708bcebfe9e5db209c818a12d630cb418231f863) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -41,7 +41,6 @@ - Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsDikeSoilScenario.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsDikeSoilScenario.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsDikeSoilScenario.cs (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -0,0 +1,44 @@ +// 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.Primitives.Properties; + +namespace Ringtoets.MacroStabilityInwards.Primitives +{ + /// + /// The dike soil scenario types. + /// + public enum MacroStabilityInwardsDikeSoilScenario + { + [ResourcesDisplayName(typeof(Resources), nameof(Resources.ClayDikeOnClay_DisplayName))] + ClayDikeOnClay = 1, + + [ResourcesDisplayName(typeof(Resources), nameof(Resources.SandDikeOnClay_DisplayName))] + SandDikeOnClay = 2, + + [ResourcesDisplayName(typeof(Resources), nameof(Resources.ClayDikeOnSand_DisplayName))] + ClayDikeOnSand = 3, + + [ResourcesDisplayName(typeof(Resources), nameof(Resources.SandDikeOnSand_DisplayName))] + SandDikeOnSand = 4 + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs =================================================================== diff -u -r620846e4cf00b13e9310c931d29bac47799a81d8 -rf9cb0b4f173deb3519922fb8f073d8815c516950 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 620846e4cf00b13e9310c931d29bac47799a81d8) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -82,6 +82,24 @@ } /// + /// Looks up a localized string similar to Klei dijk op klei (geval 1A). + /// + public static string ClayDikeOnClay_DisplayName { + get { + return ResourceManager.GetString("ClayDikeOnClay_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Klei dijk op zand (geval 1B). + /// + public static string ClayDikeOnSand_DisplayName { + get { + return ResourceManager.GetString("ClayDikeOnSand_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Geen lagen gevonden voor de ondergrondschematisatie.. /// public static string Error_Cannot_Construct_MacroStabilityInwardsSoilProfile_Without_Layers { @@ -98,5 +116,23 @@ return ResourceManager.GetString("MacroStabilityInwardsSoilProfile_Layers_Layer_top_below_profile_bottom", resourceCulture); } } + + /// + /// Looks up a localized string similar to Zand dijk op klei (geval 2A). + /// + public static string SandDikeOnClay_DisplayName { + get { + return ResourceManager.GetString("SandDikeOnClay_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Zand dijk op zand (geval 2B). + /// + public static string SandDikeOnSand_DisplayName { + get { + return ResourceManager.GetString("SandDikeOnSand_DisplayName", resourceCulture); + } + } } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx =================================================================== diff -u -r620846e4cf00b13e9310c931d29bac47799a81d8 -rf9cb0b4f173deb3519922fb8f073d8815c516950 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx (.../Resources.resx) (revision 620846e4cf00b13e9310c931d29bac47799a81d8) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx (.../Resources.resx) (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -117,10 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Klei dijk op klei (geval 1A) + + + Klei dijk op zand (geval 1B) + Geen lagen gevonden voor de ondergrondschematisatie. Eén of meerdere lagen hebben een top onder de bodem van de ondergrondschematisatie. + + Zand dijk op klei (geval 2A) + + + Zand dijk op zand (geval 2B) + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj =================================================================== diff -u -r241892f4db7cdaceeb42524d7b30e362adedae54 -rf9cb0b4f173deb3519922fb8f073d8815c516950 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -43,6 +43,7 @@ Properties\GlobalAssembly.cs + @@ -73,6 +74,10 @@ Core.Common.Geometry False + + {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} + Core.Common.Utils + {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data Fisheye: Tag f9cb0b4f173deb3519922fb8f073d8815c516950 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj =================================================================== diff -u -r708bcebfe9e5db209c818a12d630cb418231f863 -rf9cb0b4f173deb3519922fb8f073d8815c516950 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.Test.csproj) (revision 708bcebfe9e5db209c818a12d630cb418231f863) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.Test.csproj) (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -60,7 +60,6 @@ - Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -0,0 +1,75 @@ +// 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.Primitives.Test +{ + [TestFixture] + public class MacroStabilityInwardsDikeSoilScenarioTest : EnumTestFixture + { + protected override IDictionary ExpectedDisplayNameForEnumValues + { + get + { + return new Dictionary + { + { + MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, "Klei dijk op klei (geval 1A)" + }, + { + MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, "Zand dijk op klei (geval 2A)" + }, + { + MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, "Klei dijk op zand (geval 1B)" + }, + { + MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, "Zand dijk op zand (geval 2B)" + } + }; + } + } + + protected override IDictionary ExpectedValueForEnumValues + { + get + { + return new Dictionary + { + { + MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, 1 + }, + { + MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, 2 + }, + { + MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, 3 + }, + { + MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, 4 + } + }; + } + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj =================================================================== diff -u -r241892f4db7cdaceeb42524d7b30e362adedae54 -rf9cb0b4f173deb3519922fb8f073d8815c516950 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj) (revision f9cb0b4f173deb3519922fb8f073d8815c516950) @@ -53,6 +53,7 @@ Properties\GlobalAssembly.cs +