Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -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,16 @@ } /// + /// Looks up a localized string similar to binnenwaterstand + ///[m+NAP]. + /// + public static string ClosingStructuresCalculationsView_InsideWaterLevel_DisplayName { + get { + return ResourceManager.GetString("ClosingStructuresCalculationsView_InsideWaterLevel_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De parameter 'C' die gebruikt wordt om het lengte-effect te berekenen.. /// public static string ClosingStructuresFailureMechanismProperties_C_Description { Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.resx =================================================================== diff -u -re7bb4d4d0106af63a8aa2fc119cfcd2aa129a6a2 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision e7bb4d4d0106af63a8aa2fc119cfcd2aa129a6a2) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -162,4 +162,8 @@ Schematisering sluitproces + + binnenwaterstand +[m+NAP] + \ No newline at end of file Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs =================================================================== diff -u -r978429f5d6185486c73675732401a1ac4b773114 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs (.../ClosingStructuresCalculationsView.cs) (revision 978429f5d6185486c73675732401a1ac4b773114) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs (.../ClosingStructuresCalculationsView.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -29,6 +29,7 @@ using Core.Common.Util; using Riskeer.ClosingStructures.Data; using Riskeer.ClosingStructures.Forms.PresentationObjects; +using Riskeer.ClosingStructures.Forms.Properties; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; @@ -163,15 +164,15 @@ DataGridViewControl.AddTextBoxColumn( nameof(ClosingStructuresCalculationRow.MeanInsideWaterLevel), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.Structure_InsideWaterLevel_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.ClosingStructuresCalculationsView_InsideWaterLevel_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(ClosingStructuresCalculationRow.CriticalOvertoppingDischarge), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.Structure_CriticalOvertoppingDischarge_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.StructuresCalculationsView_CriticalOvertoppingDischarge_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(ClosingStructuresCalculationRow.AllowedLevelIncreaseStorage), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.Structure_AllowedLevelIncreaseStorage_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.StructuresCalculationsView_AllowedLevelIncreaseStorage_DisplayName}"); } protected override void InitializeObservers() Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs =================================================================== diff -u -rf494e2cfc9ac329dc4f00d37e8125b7a3174941e -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs (.../ClosingStructuresCalculationsViewTest.cs) (revision f494e2cfc9ac329dc4f00d37e8125b7a3174941e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/Views/ClosingStructuresCalculationsViewTest.cs (.../ClosingStructuresCalculationsViewTest.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -105,9 +105,9 @@ Assert.AreEqual("Damhoogte [m+NAP]", dataGridView.Columns[breakWaterHeightColumnIndex].HeaderText); Assert.AreEqual("Gebruik voorlandgeometrie", dataGridView.Columns[useForeShoreGeometryColumnIndex].HeaderText); Assert.AreEqual("Instroommodel", dataGridView.Columns[inflowModelTypeColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nBinnenwaterstand [m+NAP]", dataGridView.Columns[meanInsideWaterLevelColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nKritiek instromend debiet [m³/s/m]", dataGridView.Columns[criticalOvertoppingDischargeColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nToegestane peilverhoging komberging [m]", dataGridView.Columns[allowedLevelIncreaseStorageColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nbinnenwaterstand\r\n[m+NAP]", dataGridView.Columns[meanInsideWaterLevelColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nkritiek instromend debiet\r\n[m³/s/m]", dataGridView.Columns[criticalOvertoppingDischargeColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\ntoegestane peilverhoging komberging\r\n[m]", dataGridView.Columns[allowedLevelIncreaseStorageColumnIndex].HeaderText); foreach (DataGridViewComboBoxColumn column in dataGridView.Columns.OfType().ToArray()) { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r988c54b8c1d76a0d9fca5d80a3814c5f39222c60 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 988c54b8c1d76a0d9fca5d80a3814c5f39222c60) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -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. // @@ -1108,24 +1108,6 @@ } /// - /// Looks up a localized string similar to Lineaire belastingschematisering constructieve sterkte [kN/m]. - /// - public static string ConstructiveStrength_Linear_LoadModel_DisplayName { - get { - return ResourceManager.GetString("ConstructiveStrength_Linear_LoadModel_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kwadratische belastingschematisering constructieve sterkte [kN/m]. - /// - public static string ConstructiveStrength_Quadratic_LoadModel_DisplayName { - get { - return ResourceManager.GetString("ConstructiveStrength_Quadratic_LoadModel_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap CopyHS { @@ -3385,24 +3367,6 @@ } /// - /// Looks up a localized string similar to Lineaire belastingschematisering stabiliteit [kN/m²]. - /// - public static string Stability_Linear_LoadModel_DisplayName { - get { - return ResourceManager.GetString("Stability_Linear_LoadModel_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Kwadratische belastingschematisering stabiliteit [kN/m²]. - /// - public static string Stability_Quadratic_LoadModel_DisplayName { - get { - return ResourceManager.GetString("Stability_Quadratic_LoadModel_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Geometrie uit de database.. /// public static string StochasticSoilModel_Geometry_Description { @@ -3961,6 +3925,26 @@ } /// + /// Looks up a localized string similar to toegestane peilverhoging komberging + ///[m]. + /// + public static string StructuresCalculationsView_AllowedLevelIncreaseStorage_DisplayName { + get { + return ResourceManager.GetString("StructuresCalculationsView_AllowedLevelIncreaseStorage_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to kritiek instromend debiet + ///[m³/s/m]. + /// + public static string StructuresCalculationsView_CriticalOvertoppingDischarge_DisplayName { + get { + return ResourceManager.GetString("StructuresCalculationsView_CriticalOvertoppingDischarge_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Kunstwerken. /// public static string StructuresCollection_DisplayName { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r19cb5416755b464820d056fa7e4576e1c2ada4d6 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 19cb5416755b464820d056fa7e4576e1c2ada4d6) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -1584,19 +1584,15 @@ Belastingschematisering - - Lineaire belastingschematisering constructieve sterkte [kN/m] - - - Kwadratische belastingschematisering constructieve sterkte [kN/m] - - - Lineaire belastingschematisering stabiliteit [kN/m²] - - - Kwadratische belastingschematisering stabiliteit [kN/m²] - Analysehoogte [m+NAP] + + kritiek instromend debiet +[m³/s/m] + + + toegestane peilverhoging komberging +[m] + \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r9821911d27e7995e4cfdc9b644bf1a21e6f49c1c -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9821911d27e7995e4cfdc9b644bf1a21e6f49c1c) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -281,6 +281,16 @@ } /// + /// Looks up a localized string similar to kritiek overslagdebiet + ///[m³/s/m]. + /// + public static string GrassCoverErosionInwardsCalculationsView_CriticalFlowRate_DisplayName { + get { + return ResourceManager.GetString("GrassCoverErosionInwardsCalculationsView_CriticalFlowRate_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Selecteer dijkprofielen. /// public static string GrassCoverErosionInwardsDikeProfileSelectionDialog_Select_DikeProfiles { @@ -434,15 +444,6 @@ } /// - /// Looks up a localized string similar to Verwachtingswaarde kritiek overslagdebiet [m3/m/s]. - /// - public static string Mean_Critical_FlowRate_DisplayName { - get { - return ResourceManager.GetString("Mean_Critical_FlowRate_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Oriëntatie van de dijknormaal ten opzichte van het noorden.. /// public static string Orientation_DikeProfile_Description { @@ -515,15 +516,6 @@ } /// - /// Looks up a localized string similar to Standaardafwijking kritiek overslagdebiet [m3/m/s]. - /// - public static string StandardDeviation_Critical_FlowRate_DisplayName { - get { - return ResourceManager.GetString("StandardDeviation_Critical_FlowRate_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to De coördinaten van de locatie van de dijk in het Rijksdriehoeksstelsel.. /// public static string WorldReferencePoint_DikeProfile_Description { Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r9821911d27e7995e4cfdc9b644bf1a21e6f49c1c -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9821911d27e7995e4cfdc9b644bf1a21e6f49c1c) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -261,13 +261,11 @@ Illustratiepunten inlezen Spaces are added to make this value unique to prevent jumping from the selected property after editing. - - Verwachtingswaarde kritiek overslagdebiet [m3/m/s] - - - Standaardafwijking kritiek overslagdebiet [m3/m/s] - Als u het dijkprofiel van een berekening wijzigt kan de berekening in een ander vak komen te liggen. + + kritiek overslagdebiet +[m³/s/m] + \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs =================================================================== diff -u -r978429f5d6185486c73675732401a1ac4b773114 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs (.../GrassCoverErosionInwardsCalculationsView.cs) (revision 978429f5d6185486c73675732401a1ac4b773114) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs (.../GrassCoverErosionInwardsCalculationsView.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -160,11 +160,11 @@ DataGridViewControl.AddTextBoxColumn( nameof(GrassCoverErosionInwardsCalculationRow.MeanCriticalFlowRate), - Resources.Mean_Critical_FlowRate_DisplayName); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.GrassCoverErosionInwardsCalculationsView_CriticalFlowRate_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(GrassCoverErosionInwardsCalculationRow.StandardDeviationCriticalFlowRate), - Resources.StandardDeviation_Critical_FlowRate_DisplayName); + $"{RiskeerCommonFormsResources.NormalDistribution_StandardDeviation_DisplayName}\r\n{Resources.GrassCoverErosionInwardsCalculationsView_CriticalFlowRate_DisplayName}"); } protected override void InitializeObservers() Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs =================================================================== diff -u -ra38769af478b09f6f646fd3dc72f95f68c55622d -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs (.../GrassCoverErosionInwardsCalculationsViewTest.cs) (revision a38769af478b09f6f646fd3dc72f95f68c55622d) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs (.../GrassCoverErosionInwardsCalculationsViewTest.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -105,8 +105,8 @@ Assert.AreEqual("Damhoogte [m+NAP]", dataGridView.Columns[breakWaterHeightColumnIndex].HeaderText); Assert.AreEqual("Gebruik voorlandgeometrie", dataGridView.Columns[useForeShoreGeometryColumnIndex].HeaderText); Assert.AreEqual("Dijkhoogte [m+NAP]", dataGridView.Columns[dikeHeightColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde kritiek overslagdebiet [m3/m/s]", dataGridView.Columns[meanCriticalFlowRateColumnIndex].HeaderText); - Assert.AreEqual("Standaardafwijking kritiek overslagdebiet [m3/m/s]", dataGridView.Columns[standardDeviationCriticalFlowRateColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nkritiek overslagdebiet\r\n[m³/s/m]", dataGridView.Columns[meanCriticalFlowRateColumnIndex].HeaderText); + Assert.AreEqual("Standaardafwijking\r\nkritiek overslagdebiet\r\n[m³/s/m]", dataGridView.Columns[standardDeviationCriticalFlowRateColumnIndex].HeaderText); Assert.AreEqual(10, dataGridView.ColumnCount); Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Properties/Resources.Designer.cs (revision 0) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Properties/Resources.Designer.cs (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -0,0 +1,94 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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. + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Riskeer.HeightStructures.Forms.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // 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", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Riskeer.HeightStructures.Forms.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to kerende hoogte + ///[m+NAP]. + /// + internal static string HeightStructuresCalculationsView_LevelCrestStructure_DisplayName { + get { + return ResourceManager.GetString("HeightStructuresCalculationsView_LevelCrestStructure_DisplayName", resourceCulture); + } + } + } +} Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Properties/Resources.resx =================================================================== diff -u --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Properties/Resources.resx (revision 0) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Properties/Resources.resx (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + kerende hoogte +[m+NAP] + + \ No newline at end of file Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Riskeer.HeightStructures.Forms.csproj =================================================================== diff -u -rd0f0b648278dbf68268d5514d3b2544805b1b305 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Riskeer.HeightStructures.Forms.csproj (.../Riskeer.HeightStructures.Forms.csproj) (revision d0f0b648278dbf68268d5514d3b2544805b1b305) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Riskeer.HeightStructures.Forms.csproj (.../Riskeer.HeightStructures.Forms.csproj) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -50,6 +50,17 @@ + + True + True + Resources.resx + + + + ResXFileCodeGenerator + Resources.Designer.cs + + \ No newline at end of file Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationsView.cs =================================================================== diff -u -r978429f5d6185486c73675732401a1ac4b773114 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationsView.cs (.../HeightStructuresCalculationsView.cs) (revision 978429f5d6185486c73675732401a1ac4b773114) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationsView.cs (.../HeightStructuresCalculationsView.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -37,6 +37,7 @@ using Riskeer.Common.Forms.Views; using Riskeer.HeightStructures.Data; using Riskeer.HeightStructures.Forms.PresentationObjects; +using Riskeer.HeightStructures.Forms.Properties; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.HeightStructures.Forms.Views @@ -155,15 +156,15 @@ DataGridViewControl.AddTextBoxColumn( nameof(HeightStructuresCalculationRow.LevelCrestStructure), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.Structure_LevelCrestStructure_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.HeightStructuresCalculationsView_LevelCrestStructure_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(HeightStructuresCalculationRow.CriticalOvertoppingDischarge), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.Structure_CriticalOvertoppingDischarge_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.StructuresCalculationsView_CriticalOvertoppingDischarge_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(HeightStructuresCalculationRow.AllowedLevelIncreaseStorage), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.Structure_AllowedLevelIncreaseStorage_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.StructuresCalculationsView_AllowedLevelIncreaseStorage_DisplayName}"); } protected override void InitializeObservers() Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationsViewTest.cs =================================================================== diff -u -rcf222152acdcc3cd54bf54d9473ffddaa8238c84 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationsViewTest.cs (.../HeightStructuresCalculationsViewTest.cs) (revision cf222152acdcc3cd54bf54d9473ffddaa8238c84) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationsViewTest.cs (.../HeightStructuresCalculationsViewTest.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -101,9 +101,9 @@ Assert.AreEqual("Damtype", dataGridView.Columns[breakWaterTypeColumnIndex].HeaderText); Assert.AreEqual("Damhoogte [m+NAP]", dataGridView.Columns[breakWaterHeightColumnIndex].HeaderText); Assert.AreEqual("Gebruik voorlandgeometrie", dataGridView.Columns[useForeShoreGeometryColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nKerende hoogte [m+NAP]", dataGridView.Columns[meanLevelCrestStructureColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nKritiek instromend debiet [m³/s/m]", dataGridView.Columns[criticalOvertoppingDischargeColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nToegestane peilverhoging komberging [m]", dataGridView.Columns[allowedLevelIncreaseStorageColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nkerende hoogte\r\n[m+NAP]", dataGridView.Columns[meanLevelCrestStructureColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nkritiek instromend debiet\r\n[m³/s/m]", dataGridView.Columns[criticalOvertoppingDischargeColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\ntoegestane peilverhoging komberging\r\n[m]", dataGridView.Columns[allowedLevelIncreaseStorageColumnIndex].HeaderText); foreach (DataGridViewComboBoxColumn column in dataGridView.Columns.OfType().ToArray()) { Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r4aef2c5eb4d043dec531bb80410086a19794c25e -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4aef2c5eb4d043dec531bb80410086a19794c25e) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -1187,15 +1187,6 @@ } /// - /// Looks up a localized string similar to Verwachtingswaarde. - /// - public static string Probabilistics_Mean_Symbol { - get { - return ResourceManager.GetString("Probabilistics_Mean_Symbol", resourceCulture); - } - } - - /// /// Looks up a localized string similar to De hoeveelheid waarmee de kansverdeling naar rechts (richting van positieve X-as) verschoven is.. /// public static string Probabilistics_Shift_Description { Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r4aef2c5eb4d043dec531bb80410086a19794c25e -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4aef2c5eb4d043dec531bb80410086a19794c25e) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -259,9 +259,6 @@ Ondergrondschematisatie - - Verwachtingswaarde - Verschuiving Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingCalculationsView.cs =================================================================== diff -u -r2ce9847b42ca47fc9008c8c18f9158a4b83e0fb3 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 2ce9847b42ca47fc9008c8c18f9158a4b83e0fb3) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -165,11 +165,11 @@ DataGridViewControl.AddTextBoxColumn( nameof(PipingCalculationRow.DampingFactorExitMean), - $"{Resources.Probabilistics_Mean_Symbol}\r\n{Resources.PipingCalculationsView_DampingFactorExit_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.PipingCalculationsView_DampingFactorExit_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(PipingCalculationRow.PhreaticLevelExitMean), - $"{Resources.Probabilistics_Mean_Symbol}\r\n{Resources.PipingCalculationsView_PhreaticLevelExit_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.PipingCalculationsView_PhreaticLevelExit_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(PipingCalculationRow.EntryPointL), Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r988c54b8c1d76a0d9fca5d80a3814c5f39222c60 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 988c54b8c1d76a0d9fca5d80a3814c5f39222c60) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -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. // @@ -118,6 +118,48 @@ } /// + /// Looks up a localized string similar to lineaire belastingschematisering constructieve sterkte + ///[kN/m]. + /// + public static string StabilityPointStructuresCalculationsView_ConstructiveStrength_Linear_LoadModel_DisplayName { + get { + return ResourceManager.GetString("StabilityPointStructuresCalculationsView_ConstructiveStrength_Linear_LoadModel_Di" + + "splayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to kwadratische belastingschematisering constructieve sterkte + ///[kN/m]. + /// + public static string StabilityPointStructuresCalculationsView_ConstructiveStrength_Quadratic_LoadModel_DisplayName { + get { + return ResourceManager.GetString("StabilityPointStructuresCalculationsView_ConstructiveStrength_Quadratic_LoadModel" + + "_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to lineaire belastingschematisering stabiliteit + ///[kN/m²]. + /// + public static string StabilityPointStructuresCalculationsView_Linear_LoadModel_DisplayName { + get { + return ResourceManager.GetString("StabilityPointStructuresCalculationsView_Linear_LoadModel_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to kwadratische belastingschematisering stabiliteit + ///[kN/m²]. + /// + public static string StabilityPointStructuresCalculationsView_Quadratic_LoadModel_DisplayName { + get { + return ResourceManager.GetString("StabilityPointStructuresCalculationsView_Quadratic_LoadModel_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Modelfactor voor aanvaarbelasting.. /// public static string StabilityPointStructuresInputFailureMechanismContext_ModelFactorCollisionLoad_Description { Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.resx =================================================================== diff -u -rbab6e2f55474e23481bf4f119b1cd356c13c4be1 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision bab6e2f55474e23481bf4f119b1cd356c13c4be1) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -237,4 +237,20 @@ Volumiek gewicht van water [kN/m³] + + lineaire belastingschematisering constructieve sterkte +[kN/m] + + + kwadratische belastingschematisering constructieve sterkte +[kN/m] + + + lineaire belastingschematisering stabiliteit +[kN/m²] + + + kwadratische belastingschematisering stabiliteit +[kN/m²] + \ No newline at end of file Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresCalculationsView.cs =================================================================== diff -u -r978429f5d6185486c73675732401a1ac4b773114 -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresCalculationsView.cs (.../StabilityPointStructuresCalculationsView.cs) (revision 978429f5d6185486c73675732401a1ac4b773114) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresCalculationsView.cs (.../StabilityPointStructuresCalculationsView.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -37,6 +37,7 @@ using Riskeer.Common.Forms.Views; using Riskeer.StabilityPointStructures.Data; using Riskeer.StabilityPointStructures.Forms.PresentationObjects; +using Riskeer.StabilityPointStructures.Forms.Properties; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; namespace Riskeer.StabilityPointStructures.Forms.Views @@ -162,19 +163,19 @@ DataGridViewControl.AddTextBoxColumn( nameof(StabilityPointStructuresCalculationRow.ConstructiveStrengthLinearLoadModel), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.ConstructiveStrength_Linear_LoadModel_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.StabilityPointStructuresCalculationsView_ConstructiveStrength_Linear_LoadModel_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(StabilityPointStructuresCalculationRow.ConstructiveStrengthQuadraticLoadModel), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.ConstructiveStrength_Quadratic_LoadModel_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.StabilityPointStructuresCalculationsView_ConstructiveStrength_Quadratic_LoadModel_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(StabilityPointStructuresCalculationRow.StabilityLinearLoadModel), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.Stability_Linear_LoadModel_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.StabilityPointStructuresCalculationsView_Linear_LoadModel_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(StabilityPointStructuresCalculationRow.StabilityQuadraticLoadModel), - $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{RiskeerCommonFormsResources.Stability_Quadratic_LoadModel_DisplayName}"); + $"{RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName}\r\n{Resources.StabilityPointStructuresCalculationsView_Quadratic_LoadModel_DisplayName}"); DataGridViewControl.AddTextBoxColumn( nameof(StabilityPointStructuresCalculationRow.EvaluationLevel), Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationsViewTest.cs =================================================================== diff -u -r548a51786e8eff31e8a8b7dcfbc9ddf9599ec39f -r4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationsViewTest.cs (.../StabilityPointStructuresCalculationsViewTest.cs) (revision 548a51786e8eff31e8a8b7dcfbc9ddf9599ec39f) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresCalculationsViewTest.cs (.../StabilityPointStructuresCalculationsViewTest.cs) (revision 4e8d9d5f3b19a4bcd8c6d217e3d2b180d3171915) @@ -107,10 +107,10 @@ Assert.AreEqual("Damhoogte [m+NAP]", dataGridView.Columns[breakWaterHeightColumnIndex].HeaderText); Assert.AreEqual("Gebruik voorlandgeometrie", dataGridView.Columns[useForeShoreGeometryColumnIndex].HeaderText); Assert.AreEqual("Belastingschematisering", dataGridView.Columns[loadSchematizationTypeColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nLineaire belastingschematisering constructieve sterkte [kN/m]", dataGridView.Columns[constructiveStrengthLinearLoadModelColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nKwadratische belastingschematisering constructieve sterkte [kN/m]", dataGridView.Columns[constructiveStrengthQuadraticLoadModelColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nLineaire belastingschematisering stabiliteit [kN/m²]", dataGridView.Columns[stabilityLinearLoadModelColumnIndex].HeaderText); - Assert.AreEqual("Verwachtingswaarde\r\nKwadratische belastingschematisering stabiliteit [kN/m²]", dataGridView.Columns[stabilityQuadraticLoadModelColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nlineaire belastingschematisering constructieve sterkte\r\n[kN/m]", dataGridView.Columns[constructiveStrengthLinearLoadModelColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nkwadratische belastingschematisering constructieve sterkte\r\n[kN/m]", dataGridView.Columns[constructiveStrengthQuadraticLoadModelColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nlineaire belastingschematisering stabiliteit\r\n[kN/m²]", dataGridView.Columns[stabilityLinearLoadModelColumnIndex].HeaderText); + Assert.AreEqual("Verwachtingswaarde\r\nkwadratische belastingschematisering stabiliteit\r\n[kN/m²]", dataGridView.Columns[stabilityQuadraticLoadModelColumnIndex].HeaderText); Assert.AreEqual("Analysehoogte [m+NAP]", dataGridView.Columns[evaluationLevelModelColumnIndex].HeaderText); foreach (DataGridViewComboBoxColumn column in dataGridView.Columns.OfType().ToArray())