Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rfb551ab3c861e1e8c2ffd868885ee68bf7041067 -r900196824f2f860b124571e3ebe8f3c0338b49d2
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fb551ab3c861e1e8c2ffd868885ee68bf7041067)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 900196824f2f860b124571e3ebe8f3c0338b49d2)
@@ -92,24 +92,6 @@
}
///
- /// Looks up a localized string similar to Ondergrens van de duidingsklasse..
- ///
- public static string AssemblyCategory_LowerBoundary_Description {
- get {
- return ResourceManager.GetString("AssemblyCategory_LowerBoundary_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Bovengrens van de duidingsklasse..
- ///
- public static string AssemblyCategory_UpperBoundary_Description {
- get {
- return ResourceManager.GetString("AssemblyCategory_UpperBoundary_Description", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Duidingsklasse per vak.
///
public static string AssemblyCategoryPerSection_DisplayName {
@@ -146,42 +128,6 @@
}
///
- /// Looks up a localized string similar to Ondergrens [1/jaar].
- ///
- public static string AssemblyGroup_LowerBoundary_DisplayName {
- get {
- return ResourceManager.GetString("AssemblyGroup_LowerBoundary_DisplayName", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Naam van de duidingsklasse..
- ///
- public static string AssemblyGroup_Name_Description {
- get {
- return ResourceManager.GetString("AssemblyGroup_Name_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Naam.
- ///
- public static string AssemblyGroup_Name_DisplayName {
- get {
- return ResourceManager.GetString("AssemblyGroup_Name_DisplayName", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Bovengrens [1/jaar].
- ///
- public static string AssemblyGroup_UpperBoundary_DisplayName {
- get {
- return ResourceManager.GetString("AssemblyGroup_UpperBoundary_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to De duidingsklassen per vak voor dit toetsspoor..
///
public static string AssemblyGroups_Description {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r0e110bda1d63a5e2647d69a4e21d20fe10418f5e -r900196824f2f860b124571e3ebe8f3c0338b49d2
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 0e110bda1d63a5e2647d69a4e21d20fe10418f5e)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 900196824f2f860b124571e3ebe8f3c0338b49d2)
@@ -1343,18 +1343,6 @@
Kleur
-
- Ondergrens [1/jaar]
-
-
- Ondergrens van de duidingsklasse.
-
-
- Bovengrens [1/jaar]
-
-
- Bovengrens van de duidingsklasse.
-
Berekende waterstand.
@@ -1633,10 +1621,4 @@
De duidingsklassen per vak voor dit toetsspoor.
-
- Naam
-
-
- Naam van de duidingsklasse.
-
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r62ca51b8ff808cf657e915c7307946cab9f973be -r900196824f2f860b124571e3ebe8f3c0338b49d2
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 62ca51b8ff808cf657e915c7307946cab9f973be)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 900196824f2f860b124571e3ebe8f3c0338b49d2)
@@ -1,25 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. 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
@@ -82,6 +61,60 @@
}
///
+ /// Looks up a localized string similar to Ondergrens van de duidingsklasse..
+ ///
+ public static string AssemblyGroup_LowerBoundary_Description {
+ get {
+ return ResourceManager.GetString("AssemblyGroup_LowerBoundary_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Ondergrens [1/jaar].
+ ///
+ public static string AssemblyGroup_LowerBoundary_DisplayName {
+ get {
+ return ResourceManager.GetString("AssemblyGroup_LowerBoundary_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Naam van de duidingsklasse..
+ ///
+ public static string AssemblyGroup_Name_Description {
+ get {
+ return ResourceManager.GetString("AssemblyGroup_Name_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Naam.
+ ///
+ public static string AssemblyGroup_Name_DisplayName {
+ get {
+ return ResourceManager.GetString("AssemblyGroup_Name_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bovengrens van de duidingsklasse..
+ ///
+ public static string AssemblyGroup_UpperBoundary_Description {
+ get {
+ return ResourceManager.GetString("AssemblyGroup_UpperBoundary_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bovengrens [1/jaar].
+ ///
+ public static string AssemblyGroup_UpperBoundary_DisplayName {
+ get {
+ return ResourceManager.GetString("AssemblyGroup_UpperBoundary_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Faalkans [1/jaar].
///
public static string AssemblyResult_Probability_DisplayName {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r62ca51b8ff808cf657e915c7307946cab9f973be -r900196824f2f860b124571e3ebe8f3c0338b49d2
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 62ca51b8ff808cf657e915c7307946cab9f973be)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 900196824f2f860b124571e3ebe8f3c0338b49d2)
@@ -365,4 +365,22 @@
Veiligheidsoordeel
+
+ Naam
+
+
+ Naam van de duidingsklasse.
+
+
+ Ondergrens [1/jaar]
+
+
+ Ondergrens van de duidingsklasse.
+
+
+ Bovengrens [1/jaar]
+
+
+ Bovengrens van de duidingsklasse.
+
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs
===================================================================
diff -u -r0b522a31f55a06325a2f4ec7bf4055b12d5a93fe -r900196824f2f860b124571e3ebe8f3c0338b49d2
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs (.../FailureMechanismSectionAssemblyGroupProperties.cs) (revision 0b522a31f55a06325a2f4ec7bf4055b12d5a93fe)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupProperties.cs (.../FailureMechanismSectionAssemblyGroupProperties.cs) (revision 900196824f2f860b124571e3ebe8f3c0338b49d2)
@@ -28,6 +28,7 @@
using Riskeer.AssemblyTool.Data;
using Riskeer.AssemblyTool.Forms;
using Riskeer.Common.Forms.TypeConverters;
+using Riskeer.Integration.Forms.Properties;
using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
namespace Riskeer.Integration.Forms.PropertyClasses
@@ -58,8 +59,8 @@
[PropertyOrder(groupPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyGroup_Name_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyGroup_Name_Description))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssemblyGroup_Name_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.AssemblyGroup_Name_Description))]
[TypeConverter(typeof(EnumTypeConverter))]
public DisplayFailureMechanismSectionAssemblyGroup Group
{
@@ -71,8 +72,8 @@
[PropertyOrder(lowerBoundaryPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyGroup_LowerBoundary_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyCategory_LowerBoundary_Description))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssemblyGroup_LowerBoundary_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.AssemblyGroup_LowerBoundary_Description))]
[TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
public double LowerBoundary
{
@@ -84,8 +85,8 @@
[PropertyOrder(upperBoundaryPropertyIndex)]
[ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyGroup_UpperBoundary_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyCategory_UpperBoundary_Description))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssemblyGroup_UpperBoundary_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.AssemblyGroup_UpperBoundary_Description))]
[TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
public double UpperBoundary
{
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsTable.cs
===================================================================
diff -u -r1d28de98daddf0f744f11cc1c1cdb5f1a6a2b966 -r900196824f2f860b124571e3ebe8f3c0338b49d2
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsTable.cs (.../AssemblyGroupsTable.cs) (revision 1d28de98daddf0f744f11cc1c1cdb5f1a6a2b966)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsTable.cs (.../AssemblyGroupsTable.cs) (revision 900196824f2f860b124571e3ebe8f3c0338b49d2)
@@ -25,6 +25,7 @@
using System.Linq;
using Core.Common.Controls.DataGrid;
using Riskeer.AssemblyTool.Data;
+using Riskeer.Integration.Forms.Properties;
using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
namespace Riskeer.Integration.Forms.Views
@@ -63,11 +64,11 @@
RiskeerCommonFormsResources.AssemblyGroup_Color_DisplayName);
AddTextBoxColumn(nameof(AssemblyGroupRow.LowerBoundary),
- RiskeerCommonFormsResources.AssemblyGroup_LowerBoundary_DisplayName,
+ Resources.AssemblyGroup_LowerBoundary_DisplayName,
true);
AddTextBoxColumn(nameof(AssemblyGroupRow.UpperBoundary),
- RiskeerCommonFormsResources.AssemblyGroup_UpperBoundary_DisplayName,
+ Resources.AssemblyGroup_UpperBoundary_DisplayName,
true);
}
}