Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/AssemblyMapDataFactory.cs
===================================================================
diff -u -r5a2860ae96b1d33b446ba936b21320c94185486c -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/AssemblyMapDataFactory.cs (.../AssemblyMapDataFactory.cs) (revision 5a2860ae96b1d33b446ba936b21320c94185486c)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/AssemblyMapDataFactory.cs (.../AssemblyMapDataFactory.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -43,7 +43,7 @@
/// The created .
public static MapDataCollection CreateAssemblyMapDataCollection()
{
- return new MapDataCollection(Resources.AssemblyMapDataFactory_AssemblyMapDataCollection);
+ return new MapDataCollection(Resources.AssemblyResult);
}
///
@@ -79,7 +79,7 @@
/// The created .
public static MapLineData CreateCombinedAssemblyMapData()
{
- return CreateAssemblyMapLineData(Resources.AssemblyMapDataFactory_CombinedAssemblyMapData, true);
+ return CreateAssemblyMapLineData(Resources.CombinedAssembly, true);
}
private static MapLineData CreateAssemblyMapLineData(string name, bool isVisible)
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs
===================================================================
diff -u -reaad7882010dcec4c8230026c614bbaee2a36a7a -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs (.../AssemblyMapDataFeaturesFactory.cs) (revision eaad7882010dcec4c8230026c614bbaee2a36a7a)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/AssemblyMapDataFeaturesFactory.cs (.../AssemblyMapDataFeaturesFactory.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -29,6 +29,7 @@
using Ringtoets.Common.Data.Exceptions;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Forms.Properties;
+using RingtoetsCommonPrimitivesResources = Ringtoets.Common.Primitives.Properties.Resources;
namespace Ringtoets.Common.Forms.Factories
{
@@ -86,7 +87,7 @@
new EnumDisplayWrapper(
DisplayFailureMechanismSectionAssemblyCategoryGroupConverter.Convert(assemblyResult.Group)).DisplayName;
- feature.MetaData[Resources.MetaData_Probability] = assemblyResult.Probability;
+ feature.MetaData[RingtoetsCommonPrimitivesResources.Probability] = assemblyResult.Probability;
yield return feature;
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r2aea9c6af9a3d89f0f834bba139a1576f00764a0 -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2aea9c6af9a3d89f0f834bba139a1576f00764a0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -137,24 +137,6 @@
}
///
- /// Looks up a localized string similar to Toetsoordeel.
- ///
- public static string AssemblyMapDataFactory_AssemblyMapDataCollection {
- get {
- return ResourceManager.GetString("AssemblyMapDataFactory_AssemblyMapDataCollection", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Gecombineerd toetsoordeel.
- ///
- public static string AssemblyMapDataFactory_CombinedAssemblyMapData {
- get {
- return ResourceManager.GetString("AssemblyMapDataFactory_CombinedAssemblyMapData", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Toetsoordeel gedetailleerde toets.
///
public static string AssemblyMapDataFactory_DetailedAssemblyMapData {
@@ -182,6 +164,15 @@
}
///
+ /// Looks up a localized string similar to Toetsoordeel.
+ ///
+ public static string AssemblyResult {
+ get {
+ return ResourceManager.GetString("AssemblyResult", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Waterstand met een overschrijdingsfrequentie gelijk aan de norm van het dijktraject..
///
public static string AssessmentLevel_Description {
@@ -1007,6 +998,15 @@
}
///
+ /// Looks up a localized string similar to Gecombineerd toetsoordeel.
+ ///
+ public static string CombinedAssembly {
+ get {
+ return ResourceManager.GetString("CombinedAssembly", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap CopyHS {
@@ -2608,15 +2608,6 @@
}
///
- /// Looks up a localized string similar to Faalkans.
- ///
- public static string MetaData_Probability {
- get {
- return ResourceManager.GetString("MetaData_Probability", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Er zijn geen kunstwerken beschikbaar om berekeningen voor te genereren..
///
public static string No_Structures_to_generate_Calculations_for {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r2aea9c6af9a3d89f0f834bba139a1576f00764a0 -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2aea9c6af9a3d89f0f834bba139a1576f00764a0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -1491,7 +1491,7 @@
berekende kans
[-]
-
+
Toetsoordeel
@@ -1503,10 +1503,7 @@
Toetsoordeel toets op maat
-
+
Gecombineerd toetsoordeel
-
- Faalkans
-
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/DetailedAssessmentProbabilityOnlyResultType.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/DetailedAssessmentProbabilityOnlyResultType.cs (.../DetailedAssessmentProbabilityOnlyResultType.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/DetailedAssessmentProbabilityOnlyResultType.cs (.../DetailedAssessmentProbabilityOnlyResultType.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -34,7 +34,7 @@
/// The calculated probability for this failure
/// mechanism section has to be entered.
///
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentResultType_Probability))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.Probability))]
Probability = 1,
///
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.Designer.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -109,15 +109,6 @@
}
///
- /// Looks up a localized string similar to Faalkans.
- ///
- public static string AssessmentResultType_Probability {
- get {
- return ResourceManager.GetString("AssessmentResultType_Probability", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to FV.
///
public static string AssessmentResultType_ProbabilityNegligible {
@@ -217,6 +208,15 @@
}
///
+ /// Looks up a localized string similar to Faalkans.
+ ///
+ public static string Probability {
+ get {
+ return ResourceManager.GetString("Probability", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to VB.
///
public static string SimpleAssessmentResultType_AssessFurther {
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.resx
===================================================================
diff -u -rd7149e4c2d72271eec59cbd126554557b28a6eb8 -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.resx (.../Resources.resx) (revision d7149e4c2d72271eec59cbd126554557b28a6eb8)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/Properties/Resources.resx (.../Resources.resx) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -120,7 +120,7 @@
NGO
-
+
Faalkans
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.cs (.../TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.cs (.../TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -49,7 +49,7 @@
/// The calculated probability for this failure
/// mechanism section has to be entered.
///
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentResultType_Probability))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.Probability))]
Probability = 3,
///
Index: Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityCalculationResultType.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityCalculationResultType.cs (.../TailorMadeAssessmentProbabilityCalculationResultType.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/src/Ringtoets.Common.Primitives/TailorMadeAssessmentProbabilityCalculationResultType.cs (.../TailorMadeAssessmentProbabilityCalculationResultType.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -48,7 +48,7 @@
/// The calculated probability for this failure
/// mechanism section has to be entered.
///
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentResultType_Probability))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.Probability))]
Probability = 3,
///
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rf9a16a153b6927605db8dd393120c6610dbbd0b3 -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f9a16a153b6927605db8dd393120c6610dbbd0b3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -119,24 +119,6 @@
}
///
- /// Looks up a localized string similar to Gecombineerd toetsoordeel.
- ///
- public static string AssemblyResultTotalView_AssemblyResultGroupBox_Text {
- get {
- return ResourceManager.GetString("AssemblyResultTotalView_AssemblyResultGroupBox_Text", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Toetsoordeel.
- ///
- public static string AssemblyResultTotalView_CategoryGroup_DisplayName {
- get {
- return ResourceManager.GetString("AssemblyResultTotalView_CategoryGroup_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Toetsoordeel groepen 3 en 4.
///
public static string AssemblyResultTotalView_FailureMechanismsWithoutProbabilityResultLabel_Text {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r3bd50abbb1272c4864c1813b0f338bf405dcb73c -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3bd50abbb1272c4864c1813b0f338bf405dcb73c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -312,12 +312,6 @@
Benaderde faalkans [1/jaar]
-
- Toetsoordeel
-
-
- Gecombineerd toetsoordeel
-
Veiligheidsoordeel
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs (.../AssemblyResultTotalView.Designer.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs (.../AssemblyResultTotalView.Designer.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -92,7 +92,7 @@
this.assemblyResultGroupBox.Size = new System.Drawing.Size(789, 110);
this.assemblyResultGroupBox.TabIndex = 1;
this.assemblyResultGroupBox.TabStop = false;
- this.assemblyResultGroupBox.Text = global::Ringtoets.Integration.Forms.Properties.Resources.AssemblyResultTotalView_AssemblyResultGroupBox_Text;
+ this.assemblyResultGroupBox.Text = global::Ringtoets.Common.Forms.Properties.Resources.CombinedAssembly;
//
// assemblyResultTableLayoutPanel
//
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -rf9a16a153b6927605db8dd393120c6610dbbd0b3 -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision f9a16a153b6927605db8dd393120c6610dbbd0b3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -147,7 +147,7 @@
true);
dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismAssemblyResultRowBase.CategoryGroup),
- Resources.AssemblyResultTotalView_CategoryGroup_DisplayName,
+ RingtoetsCommonFormsResources.AssemblyResult,
true);
dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismAssemblyResultRowBase.Probability),
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -82,24 +82,6 @@
}
///
- /// Looks up a localized string similar to Toetsoordeel.
- ///
- public static string AssemblyResult_DisplayName {
- get {
- return ResourceManager.GetString("AssemblyResult_DisplayName", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Toetsoordeel.
- ///
- public static string AssemblyResult_file_filter_Description {
- get {
- return ResourceManager.GetString("AssemblyResult_file_filter_Description", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to gml.
///
public static string AssemblyResult_file_filter_Extension {
@@ -138,15 +120,6 @@
}
///
- /// Looks up a localized string similar to Gecombineerd toetsoordeel.
- ///
- public static string AssemblyResultTotal_DisplayName {
- get {
- return ResourceManager.GetString("AssemblyResultTotal_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Voer alle berekeningen binnen dit traject uit..
///
public static string AssessmentSection_Calculate_All_ToolTip {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r11faaf2149d31eb83bcb32b8be0e989b477d3c83 -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 11faaf2149d31eb83bcb32b8be0e989b477d3c83)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -179,9 +179,6 @@
..\Resources\AssemblyResultTotal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Gecombineerd toetsoordeel
-
Er zijn geen trajecten gevonden die samengevoegd kunnen worden.
@@ -212,12 +209,6 @@
gml
-
- Toetsoordeel
-
-
- Toetsoordeel
-
Assemblage
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r3575dc7abc98e41eb34414aa10fd414765f54bd6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 3575dc7abc98e41eb34414aa10fd414765f54bd6)
@@ -607,7 +607,7 @@
yield return new ViewInfo
{
- GetViewName = (view, context) => Resources.AssemblyResultTotal_DisplayName,
+ GetViewName = (view, context) => RingtoetsCommonFormsResources.CombinedAssembly,
Image = Resources.AssemblyResultTotal,
CloseForData = CloseAssemblyResultTotalViewForData,
CreateInstance = context => new AssemblyResultTotalView(context.WrappedData)
@@ -720,11 +720,11 @@
yield return new ExportInfo
{
- Name = Resources.AssemblyResult_DisplayName,
+ Name = RingtoetsCommonFormsResources.AssemblyResult,
CreateFileExporter = (context, filePath) => new AssemblyExporter(context.WrappedData, filePath),
IsEnabled = context => context.WrappedData.ReferenceLine != null,
FileFilterGenerator = new FileFilterGenerator(Resources.AssemblyResult_file_filter_Extension,
- Resources.AssemblyResult_file_filter_Description)
+ RingtoetsCommonFormsResources.AssemblyResult)
};
}
@@ -1079,7 +1079,7 @@
yield return new TreeNodeInfo
{
- Text = context => Resources.AssemblyResultTotal_DisplayName,
+ Text = context => RingtoetsCommonFormsResources.CombinedAssembly,
Image = context => Resources.AssemblyResultTotal,
ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
.AddOpenItem()