Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2019. All rights reserved. +// Copyright (C) Stichting Deltares 2019. All rights reserved. // // This file is part of Riskeer. // @@ -40,7 +40,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -91,6 +91,24 @@ } /// + /// Looks up a localized string similar to Dagelijkse omstandigheden. + /// + public static string Daily_DisplayName { + get { + return ResourceManager.GetString("Daily_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Extreme omstandigheden. + /// + public static string Extreme_DisplayName { + get { + return ResourceManager.GetString("Extreme_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Op laagscheiding. /// public static string LayerSeparated_DisplayName { Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Properties/Resources.resx =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) @@ -174,4 +174,10 @@ Tangentlijn Z-onder moet kleiner zijn dan of gelijk zijn aan tangentlijn Z-boven, of NaN. + + Dagelijkse omstandigheden + + + Extreme omstandigheden + \ No newline at end of file Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) @@ -40,7 +40,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -163,15 +163,6 @@ } /// - /// Looks up a localized string similar to Dagelijkse omstandigheden. - /// - public static string Daily_DisplayName { - get { - return ResourceManager.GetString("Daily_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Dijktype van de geschematiseerde dijk.. /// public static string DikeSoilScenario_Description { @@ -226,15 +217,6 @@ } /// - /// Looks up a localized string similar to Extreme omstandigheden. - /// - public static string Extreme_DisplayName { - get { - return ResourceManager.GetString("Extreme_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Wrijvingshoek. /// public static string FrictionAngle_DisplayName { Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) @@ -564,12 +564,6 @@ Stabiliteitsfactor [-] - - Dagelijkse omstandigheden - - - Extreme omstandigheden - Geometrie Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressLinesProperties.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressLinesProperties.cs (.../MacroStabilityInwardsWaterStressLinesProperties.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressLinesProperties.cs (.../MacroStabilityInwardsWaterStressLinesProperties.cs) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) @@ -27,6 +27,7 @@ using Core.Common.Util.Attributes; using Riskeer.MacroStabilityInwards.Data; using Riskeer.MacroStabilityInwards.Forms.Properties; +using MacroStabilityInwardsDataResources = Riskeer.MacroStabilityInwards.Data.Properties.Resources; namespace Riskeer.MacroStabilityInwards.Forms.PropertyClasses { @@ -59,7 +60,7 @@ [PropertyOrder(waternetExtremePropertyIndex)] [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.Extreme_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(MacroStabilityInwardsDataResources.Extreme_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.WaterStressLines_Extreme_Description))] [TypeConverter(typeof(ExpandableObjectConverter))] public MacroStabilityInwardsWaternetProperties WaternetExtreme @@ -72,7 +73,7 @@ [PropertyOrder(waternetDailyPropertyIndex)] [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.Daily_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(MacroStabilityInwardsDataResources.Daily_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.WaterStressLines_Daily_Description))] [TypeConverter(typeof(ExpandableObjectConverter))] public MacroStabilityInwardsWaternetProperties WaternetDaily Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressesProperties.cs =================================================================== diff -u -rf42e68ad241081a9bb8bf158d05c932e0cf18e35 -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressesProperties.cs (.../MacroStabilityInwardsWaterStressesProperties.cs) (revision f42e68ad241081a9bb8bf158d05c932e0cf18e35) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaterStressesProperties.cs (.../MacroStabilityInwardsWaterStressesProperties.cs) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) @@ -30,6 +30,7 @@ using Riskeer.MacroStabilityInwards.Data; using Riskeer.MacroStabilityInwards.Forms.Properties; using Riskeer.MacroStabilityInwards.Primitives; +using MacroStabilityInwardsDataResources = Riskeer.MacroStabilityInwards.Data.Properties.Resources; namespace Riskeer.MacroStabilityInwards.Forms.PropertyClasses { @@ -265,7 +266,7 @@ [PropertyOrder(locationExtremePropertyIndex)] [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.Extreme_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(MacroStabilityInwardsDataResources.Extreme_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.LocationExtreme_Description))] [TypeConverter(typeof(ExpandableObjectConverter))] public MacroStabilityInwardsLocationInputExtremeProperties LocationExtreme @@ -278,7 +279,7 @@ [PropertyOrder(locationDailyPropertyIndex)] [ResourcesCategory(typeof(Resources), nameof(Resources.Waterstresses_DisplayName))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.Daily_DisplayName))] + [ResourcesDisplayName(typeof(Resources), nameof(MacroStabilityInwardsDataResources.Daily_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.LocationDaily_Description))] [TypeConverter(typeof(ExpandableObjectConverter))] public MacroStabilityInwardsLocationInputDailyProperties LocationDaily Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs =================================================================== diff -u -rab73638550f443ee7841f9d5619cd3bf3fa99bcb -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs (.../PersistableStageFactory.cs) (revision ab73638550f443ee7841f9d5619cd3bf3fa99bcb) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableStageFactory.cs (.../PersistableStageFactory.cs) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using Components.Persistence.Stability.Data; +using MacroStabilityInwardsDataResources = Riskeer.MacroStabilityInwards.Data.Properties.Resources; namespace Riskeer.MacroStabilityInwards.IO.Factories { @@ -52,17 +53,18 @@ return new[] { - Create(MacroStabilityInwardsExportStageType.Daily, idFactory, registry), - Create(MacroStabilityInwardsExportStageType.Extreme, idFactory, registry) + Create(MacroStabilityInwardsExportStageType.Daily, MacroStabilityInwardsDataResources.Daily_DisplayName, idFactory, registry), + Create(MacroStabilityInwardsExportStageType.Extreme, MacroStabilityInwardsDataResources.Extreme_DisplayName, idFactory, registry) }; } - private static PersistableStage Create(MacroStabilityInwardsExportStageType stageType, IdFactory idFactory, - MacroStabilityInwardsExportRegistry registry) + private static PersistableStage Create(MacroStabilityInwardsExportStageType stageType, string label, + IdFactory idFactory, MacroStabilityInwardsExportRegistry registry) { return new PersistableStage { Id = idFactory.Create(), + Label = label, CalculationSettingsId = registry.Settings[stageType], GeometryId = registry.Geometries[stageType], SoilLayersId = registry.SoilLayers[stageType], Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs =================================================================== diff -u -r0a705d53bb78780c46906b841cbfe938dabc09af -r7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs (.../PersistableDataModelTestHelper.cs) (revision 0a705d53bb78780c46906b841cbfe938dabc09af) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.IO.TestUtil/PersistableDataModelTestHelper.cs (.../PersistableDataModelTestHelper.cs) (revision 7fd9d2bf74176ea1d05e7bb7619a09a5ec7caec0) @@ -456,6 +456,9 @@ { Assert.AreEqual(2, stages.Count()); + Assert.AreEqual("Dagelijkse omstandigheden", stages.First().Label); + Assert.AreEqual("Extreme omstandigheden", stages.Last().Label); + for (var i = 0; i < stages.Count(); i++) { PersistableStage stage = stages.ElementAt(i);