Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.Designer.cs =================================================================== diff -u -rb2b238492bb0d500e3a5e376dadee75f506b2273 -ree85cacf38672c8e7562b2b8ff41bdead4ca644e --- Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.Designer.cs (.../ReferenceLineMetaSelectionDialog.Designer.cs) (revision b2b238492bb0d500e3a5e376dadee75f506b2273) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.Designer.cs (.../ReferenceLineMetaSelectionDialog.Designer.cs) (revision ee85cacf38672c8e7562b2b8ff41bdead4ca644e) @@ -57,8 +57,8 @@ this.SelectAssessmentSectionLabel = new System.Windows.Forms.Label(); this.ReferenceLineMetaDataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.SignalingValueRadioButton = new System.Windows.Forms.RadioButton(); - this.LowLimitValueRadioButton = new System.Windows.Forms.RadioButton(); + this.SignalFloodingProbabilityRadioButton = new System.Windows.Forms.RadioButton(); + this.MaximumAllowableFloodingProbabilityRadioButton = new System.Windows.Forms.RadioButton(); this.flowLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -111,24 +111,24 @@ // groupBox1 // resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.Controls.Add(this.SignalingValueRadioButton); - this.groupBox1.Controls.Add(this.LowLimitValueRadioButton); + this.groupBox1.Controls.Add(this.SignalFloodingProbabilityRadioButton); + this.groupBox1.Controls.Add(this.MaximumAllowableFloodingProbabilityRadioButton); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // - // SignalingValueRadioButton + // SignalFloodingProbabilityRadioButton // - resources.ApplyResources(this.SignalingValueRadioButton, "SignalingValueRadioButton"); - this.SignalingValueRadioButton.Checked = true; - this.SignalingValueRadioButton.Name = "SignalingValueRadioButton"; - this.SignalingValueRadioButton.TabStop = true; - this.SignalingValueRadioButton.UseVisualStyleBackColor = true; + resources.ApplyResources(this.SignalFloodingProbabilityRadioButton, "SignalFloodingProbabilityRadioButton"); + this.SignalFloodingProbabilityRadioButton.Checked = true; + this.SignalFloodingProbabilityRadioButton.Name = "SignalFloodingProbabilityRadioButton"; + this.SignalFloodingProbabilityRadioButton.TabStop = true; + this.SignalFloodingProbabilityRadioButton.UseVisualStyleBackColor = true; // - // LowLimitValueRadioButton + // MaximumAllowableFloodingProbabilityRadioButton // - resources.ApplyResources(this.LowLimitValueRadioButton, "LowLimitValueRadioButton"); - this.LowLimitValueRadioButton.Name = "LowLimitValueRadioButton"; - this.LowLimitValueRadioButton.UseVisualStyleBackColor = true; + resources.ApplyResources(this.MaximumAllowableFloodingProbabilityRadioButton, "MaximumAllowableFloodingProbabilityRadioButton"); + this.MaximumAllowableFloodingProbabilityRadioButton.Name = "MaximumAllowableFloodingProbabilityRadioButton"; + this.MaximumAllowableFloodingProbabilityRadioButton.UseVisualStyleBackColor = true; // // ReferenceLineMetaSelectionDialog // @@ -152,8 +152,8 @@ private System.Windows.Forms.Button Cancel; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private Core.Common.Controls.DataGrid.DataGridViewControl ReferenceLineMetaDataGridViewControl; - private System.Windows.Forms.RadioButton LowLimitValueRadioButton; - private System.Windows.Forms.RadioButton SignalingValueRadioButton; + private System.Windows.Forms.RadioButton MaximumAllowableFloodingProbabilityRadioButton; + private System.Windows.Forms.RadioButton SignalFloodingProbabilityRadioButton; private System.Windows.Forms.Label SelectAssessmentSectionLabel; private System.Windows.Forms.GroupBox groupBox1; } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs =================================================================== diff -u -r50bc3f8b71380a3f4fc7d1c062d1031aac6e6757 -ree85cacf38672c8e7562b2b8ff41bdead4ca644e --- Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs (.../ReferenceLineMetaSelectionDialog.cs) (revision 50bc3f8b71380a3f4fc7d1c062d1031aac6e6757) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs (.../ReferenceLineMetaSelectionDialog.cs) (revision ee85cacf38672c8e7562b2b8ff41bdead4ca644e) @@ -107,7 +107,7 @@ { SelectedReferenceLineMeta = referenceLineMetaSelectionRow.ReferenceLineMeta; - SelectedNormativeNorm = SignalingValueRadioButton.Checked + SelectedNormativeNorm = SignalFloodingProbabilityRadioButton.Checked ? NormType.SignalFloodingProbability : NormType.MaximumAllowableFloodingProbability; Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.resx =================================================================== diff -u -rb2b238492bb0d500e3a5e376dadee75f506b2273 -ree85cacf38672c8e7562b2b8ff41bdead4ca644e --- Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.resx (.../ReferenceLineMetaSelectionDialog.resx) (revision b2b238492bb0d500e3a5e376dadee75f506b2273) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.resx (.../ReferenceLineMetaSelectionDialog.resx) (revision ee85cacf38672c8e7562b2b8ff41bdead4ca644e) @@ -270,64 +270,64 @@ Top, Bottom, Left, Right - + True - + 9, 29 - + 4, 5, 4, 5 - + 173, 24 - + 2 - - Signaleringswaarde + + Signaleringsparameter - - SignalingValueRadioButton + + SignalFloodingProbabilityRadioButton - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + groupBox1 - + 0 - + True - + 9, 65 - + 4, 5, 4, 5 - + 118, 24 - + 3 - - Ondergrens + + Omgevingswaarde - - LowLimitValueRadioButton + + MaximumAllowableFloodingProbabilityRadioButton - + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + groupBox1 - + 1 Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/ReferenceLineMetaSelectionDialogTest.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -ree85cacf38672c8e7562b2b8ff41bdead4ca644e --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/ReferenceLineMetaSelectionDialogTest.cs (.../ReferenceLineMetaSelectionDialogTest.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Dialogs/ReferenceLineMetaSelectionDialogTest.cs (.../ReferenceLineMetaSelectionDialogTest.cs) (revision ee85cacf38672c8e7562b2b8ff41bdead4ca644e) @@ -38,8 +38,8 @@ public class ReferenceLineMetaSelectionDialogTest : NUnitFormTest { private const int assessmentSectionIdColumn = 0; - private const int signalingValueColumn = 1; - private const int lowerLimitValueColumn = 2; + private const int signalFloodingProbabilityColumn = 1; + private const int maximumAllowableFloodingProbabilityColumn = 2; [Test] public void Constructor_WithoutParent_ThrowsArgumentNullException() @@ -194,14 +194,14 @@ Assert.IsNotNull(currentIdValue); Assert.AreEqual(assessmentSectionId, currentIdValue.ToString()); - object currentSignalingValue = dataGridView[signalingValueColumn, 0].FormattedValue; + object currentSignalingValue = dataGridView[signalFloodingProbabilityColumn, 0].FormattedValue; Assert.IsNotNull(currentSignalingValue); string expectedSignalingValue = signalingValue.HasValue && signalingValue.Value > 0 ? ProbabilityFormattingHelper.FormatFromReturnPeriod(signalingValue.Value) : string.Empty; Assert.AreEqual(expectedSignalingValue, currentSignalingValue.ToString()); - object currentLowerLimitValue = dataGridView[lowerLimitValueColumn, 0].FormattedValue; + object currentLowerLimitValue = dataGridView[maximumAllowableFloodingProbabilityColumn, 0].FormattedValue; Assert.IsNotNull(currentLowerLimitValue); string expectedLowerLimitValue = lowerLimitValue > 0 ? ProbabilityFormattingHelper.FormatFromReturnPeriod(lowerLimitValue)