Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r4075241549b94454a6ad23fc355c69be49aecc17 -r4f0c0262c0c12dd61927f490e308a748ea82bdf6
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4075241549b94454a6ad23fc355c69be49aecc17)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4f0c0262c0c12dd61927f490e308a748ea82bdf6)
@@ -3099,6 +3099,26 @@
}
///
+ /// Looks up a localized string similar to Faalkans per doorsnede
+ ///[1/jaar].
+ ///
+ public static string ScenarioView_ProfileFailureProbability_DisplayName {
+ get {
+ return ResourceManager.GetString("ScenarioView_ProfileFailureProbability_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Faalkans per vak
+ ///[1/jaar].
+ ///
+ public static string ScenarioView_SectionFailureProbability_DisplayName {
+ get {
+ return ResourceManager.GetString("ScenarioView_SectionFailureProbability_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Vak.
///
public static string Section_DisplayName {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r4075241549b94454a6ad23fc355c69be49aecc17 -r4f0c0262c0c12dd61927f490e308a748ea82bdf6
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4075241549b94454a6ad23fc355c69be49aecc17)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4f0c0262c0c12dd61927f490e308a748ea82bdf6)
@@ -1580,4 +1580,12 @@
Hs - {0}
+
+ Faalkans per doorsnede
+[1/jaar]
+
+
+ Faalkans per vak
+[1/jaar]
+
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r66ff96c169f47af36dadb9ce2c6894f4a5181719 -r4f0c0262c0c12dd61927f490e308a748ea82bdf6
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 66ff96c169f47af36dadb9ce2c6894f4a5181719)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4f0c0262c0c12dd61927f490e308a748ea82bdf6)
@@ -592,26 +592,6 @@
}
///
- /// Looks up a localized string similar to Faalkans per doorsnede
- ///[1/jaar].
- ///
- public static string MacroStabilityInwardsScenarioView_FailureProbability_DisplayName {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsScenarioView_FailureProbability_DisplayName", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Faalkans per vak
- ///[1/jaar].
- ///
- public static string MacroStabilityInwardsScenarioView_SectionFailureProbability_DisplayName {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsScenarioView_SectionFailureProbability_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Booglengte.
///
public static string MacroStabilityInwardsSlice_ArcLength_DisplayName {
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r66ff96c169f47af36dadb9ce2c6894f4a5181719 -r4f0c0262c0c12dd61927f490e308a748ea82bdf6
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 66ff96c169f47af36dadb9ce2c6894f4a5181719)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4f0c0262c0c12dd61927f490e308a748ea82bdf6)
@@ -722,12 +722,4 @@
Totale
waterspanning
-
- Faalkans per doorsnede
-[1/jaar]
-
-
- Faalkans per vak
-[1/jaar]
-
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs
===================================================================
diff -u -r66ff96c169f47af36dadb9ce2c6894f4a5181719 -r4f0c0262c0c12dd61927f490e308a748ea82bdf6
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs (.../MacroStabilityInwardsScenariosView.cs) (revision 66ff96c169f47af36dadb9ce2c6894f4a5181719)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs (.../MacroStabilityInwardsScenariosView.cs) (revision 4f0c0262c0c12dd61927f490e308a748ea82bdf6)
@@ -27,7 +27,6 @@
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Forms.Views;
using Riskeer.MacroStabilityInwards.Data;
-using Riskeer.MacroStabilityInwards.Forms.Properties;
using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
namespace Riskeer.MacroStabilityInwards.Forms.Views
@@ -80,11 +79,11 @@
);
DataGridViewControl.AddTextBoxColumn(
nameof(MacroStabilityInwardsScenarioRow.FailureProbability),
- Resources.MacroStabilityInwardsScenarioView_FailureProbability_DisplayName
+ RiskeerCommonFormsResources.ScenarioView_ProfileFailureProbability_DisplayName
);
DataGridViewControl.AddTextBoxColumn(
nameof(MacroStabilityInwardsScenarioRow.SectionFailureProbability),
- Resources.MacroStabilityInwardsScenarioView_SectionFailureProbability_DisplayName
+ RiskeerCommonFormsResources.ScenarioView_SectionFailureProbability_DisplayName
);
}
}
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs
===================================================================
diff -u -rc862ae0ead85c4e7ae56977e9a3f4ea49e68d7ee -r4f0c0262c0c12dd61927f490e308a748ea82bdf6
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision c862ae0ead85c4e7ae56977e9a3f4ea49e68d7ee)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision 4f0c0262c0c12dd61927f490e308a748ea82bdf6)
@@ -106,8 +106,12 @@
);
DataGridViewControl.AddTextBoxColumn(
nameof(PipingScenarioRow.FailureProbability),
- RiskeerCommonFormsResources.ScenarioView_FailureProbability_DisplayName
+ RiskeerCommonFormsResources.ScenarioView_ProfileFailureProbability_DisplayName
);
+ DataGridViewControl.AddTextBoxColumn(
+ nameof(PipingScenarioRow.SectionFailureProbability),
+ RiskeerCommonFormsResources.ScenarioView_SectionFailureProbability_DisplayName
+ );
}
}
}
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -r3d9fc9172988994c6aa7663ffe70be709d258f2b -r4f0c0262c0c12dd61927f490e308a748ea82bdf6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 3d9fc9172988994c6aa7663ffe70be709d258f2b)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 4f0c0262c0c12dd61927f490e308a748ea82bdf6)
@@ -51,6 +51,7 @@
private const int failureProbabilityHeaveColumnIndex = 4;
private const int failureProbabilitySellmeijerColumnIndex = 5;
private const int failureProbabilityPipingColumnIndex = 6;
+ private const int sectionFailureProbabilityPipingColumnIndex = 7;
private Form testForm;
[SetUp]
@@ -105,14 +106,15 @@
// Assert
var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
- Assert.AreEqual(7, dataGridView.ColumnCount);
+ Assert.AreEqual(8, dataGridView.ColumnCount);
Assert.AreEqual("In oordeel", dataGridView.Columns[isRelevantColumnIndex].HeaderText);
Assert.AreEqual("Bijdrage aan\r\nscenario\r\n[%]", dataGridView.Columns[contributionColumnIndex].HeaderText);
Assert.AreEqual("Naam", dataGridView.Columns[nameColumnIndex].HeaderText);
Assert.AreEqual("Kans op\r\nopbarsten\r\n[1/jaar]", dataGridView.Columns[failureProbabilityUpliftColumnIndex].HeaderText);
Assert.AreEqual("Kans op\r\nheave\r\n[1/jaar]", dataGridView.Columns[failureProbabilityHeaveColumnIndex].HeaderText);
Assert.AreEqual("Kans op\r\nterugschrijdende erosie\r\n[1/jaar]", dataGridView.Columns[failureProbabilitySellmeijerColumnIndex].HeaderText);
- Assert.AreEqual("Faalkans\r\n[1/jaar]", dataGridView.Columns[failureProbabilityPipingColumnIndex].HeaderText);
+ Assert.AreEqual("Faalkans per doorsnede\r\n[1/jaar]", dataGridView.Columns[failureProbabilityPipingColumnIndex].HeaderText);
+ Assert.AreEqual("Faalkans per vak\r\n[1/jaar]", dataGridView.Columns[sectionFailureProbabilityPipingColumnIndex].HeaderText);
}
[Test]
@@ -128,24 +130,26 @@
Assert.AreEqual(2, rows.Count);
DataGridViewCellCollection cells = rows[0].Cells;
- Assert.AreEqual(7, cells.Count);
+ Assert.AreEqual(8, cells.Count);
Assert.IsTrue(Convert.ToBoolean(cells[isRelevantColumnIndex].FormattedValue));
Assert.AreEqual(new RoundedDouble(2, 100).ToString(), cells[contributionColumnIndex].FormattedValue);
Assert.AreEqual("Calculation 1", cells[nameColumnIndex].FormattedValue);
Assert.AreEqual("-".ToString(CultureInfo.CurrentCulture), cells[failureProbabilityUpliftColumnIndex].FormattedValue);
Assert.AreEqual("-".ToString(CultureInfo.CurrentCulture), cells[failureProbabilityHeaveColumnIndex].FormattedValue);
Assert.AreEqual("-".ToString(CultureInfo.CurrentCulture), cells[failureProbabilitySellmeijerColumnIndex].FormattedValue);
Assert.AreEqual("-", cells[failureProbabilityPipingColumnIndex].FormattedValue);
+ Assert.AreEqual("-", cells[sectionFailureProbabilityPipingColumnIndex].FormattedValue);
cells = rows[1].Cells;
- Assert.AreEqual(7, cells.Count);
+ Assert.AreEqual(8, cells.Count);
Assert.IsTrue(Convert.ToBoolean(cells[isRelevantColumnIndex].FormattedValue));
Assert.AreEqual(new RoundedDouble(2, 100).ToString(), cells[contributionColumnIndex].FormattedValue);
Assert.AreEqual("Calculation 2", cells[nameColumnIndex].FormattedValue);
Assert.AreEqual(ProbabilityFormattingHelper.Format(2.425418e-4), cells[failureProbabilityUpliftColumnIndex].FormattedValue);
Assert.AreEqual(ProbabilityFormattingHelper.Format(0.038461838), cells[failureProbabilityHeaveColumnIndex].FormattedValue);
Assert.AreEqual(ProbabilityFormattingHelper.Format(0.027777778), cells[failureProbabilitySellmeijerColumnIndex].FormattedValue);
Assert.AreEqual(ProbabilityFormattingHelper.Format(2.425418e-4), cells[failureProbabilityPipingColumnIndex].FormattedValue);
+ Assert.AreEqual(ProbabilityFormattingHelper.Format(2.44140625e-4), cells[sectionFailureProbabilityPipingColumnIndex].FormattedValue);
}
private void ShowFullyConfiguredPipingScenariosView()