Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.Designer.cs =================================================================== diff -u -r56b5bb198ab93bb4ac1b52081fd408bff24a054c -rcdd8d664df93d961388f8e0fc49a5434a03b2ecd --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.Designer.cs (.../PipingScenariosView.Designer.cs) (revision 56b5bb198ab93bb4ac1b52081fd408bff24a054c) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.Designer.cs (.../PipingScenariosView.Designer.cs) (revision cdd8d664df93d961388f8e0fc49a5434a03b2ecd) @@ -85,10 +85,11 @@ // // selectConfigurationTypeComboBox // + this.selectConfigurationTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.selectConfigurationTypeComboBox.FormattingEnabled = true; this.selectConfigurationTypeComboBox.Location = new System.Drawing.Point(75, 7); this.selectConfigurationTypeComboBox.Name = "selectConfigurationTypeComboBox"; - this.selectConfigurationTypeComboBox.Size = new System.Drawing.Size(121, 35); + this.selectConfigurationTypeComboBox.Size = new System.Drawing.Size(140, 35); this.selectConfigurationTypeComboBox.TabIndex = 3; this.selectConfigurationTypeComboBox.Margin = new System.Windows.Forms.Padding(7); // Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs =================================================================== diff -u -r43d78254f2d211c7315131227a9bc4a9e20fafa3 -rcdd8d664df93d961388f8e0fc49a5434a03b2ecd --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision 43d78254f2d211c7315131227a9bc4a9e20fafa3) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision cdd8d664df93d961388f8e0fc49a5434a03b2ecd) @@ -26,6 +26,7 @@ using Core.Common.Base; using Core.Common.Base.Geometry; using Core.Common.Controls.Views; +using Core.Common.Util; using Core.Common.Util.Extensions; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; @@ -88,6 +89,8 @@ InitializeComponent(); + InitializeCombobox(); + InitializeListBox(); InitializeDataGridView(); @@ -116,6 +119,21 @@ base.Dispose(disposing); } + private void InitializeCombobox() + { + EnumDisplayWrapper[] enumDisplayWrappers = Enum.GetValues(typeof(PipingScenarioConfigurationType)) + .OfType() + .Select(ev => new EnumDisplayWrapper(ev)) + .ToArray(); + + selectConfigurationTypeComboBox.BeginUpdate(); + selectConfigurationTypeComboBox.DataSource = enumDisplayWrappers; + selectConfigurationTypeComboBox.ValueMember = nameof(EnumDisplayWrapper.Value); + selectConfigurationTypeComboBox.DisplayMember = nameof(EnumDisplayWrapper.DisplayName); + selectConfigurationTypeComboBox.SelectedValue = failureMechanism.ScenarioConfigurationType; + selectConfigurationTypeComboBox.EndUpdate(); + } + private void InitializeObservers() { failureMechanismObserver = new Observer(UpdateSectionsListBox) Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs =================================================================== diff -u -r43d78254f2d211c7315131227a9bc4a9e20fafa3 -rcdd8d664df93d961388f8e0fc49a5434a03b2ecd --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 43d78254f2d211c7315131227a9bc4a9e20fafa3) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision cdd8d664df93d961388f8e0fc49a5434a03b2ecd) @@ -27,6 +27,7 @@ using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.Controls.Views; +using Core.Common.Util; using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; @@ -177,6 +178,30 @@ } [Test] + public void Constructor_ComboBoxCorrectlyInitialized() + { + // Setup + var failureMechanism = new PipingFailureMechanism(); + + // Call + ShowPipingScenariosView(failureMechanism); + + // Assert + var comboBox = (ComboBox) new ComboBoxTester("selectConfigurationTypeComboBox").TheObject; + Assert.AreEqual(nameof(EnumDisplayWrapper.DisplayName), comboBox.DisplayMember); + Assert.AreEqual(nameof(EnumDisplayWrapper.Value), comboBox.ValueMember); + Assert.IsInstanceOf>(comboBox.SelectedItem); + + var configurationTypes = (EnumDisplayWrapper[]) comboBox.DataSource; + Assert.AreEqual(3, configurationTypes.Length); + Assert.AreEqual(PipingScenarioConfigurationType.SemiProbabilistic, configurationTypes[0].Value); + Assert.AreEqual(PipingScenarioConfigurationType.Probabilistic, configurationTypes[1].Value); + Assert.AreEqual(PipingScenarioConfigurationType.PerFailureMechanismSection, configurationTypes[2].Value); + Assert.AreEqual(failureMechanism.ScenarioConfigurationType, + ((EnumDisplayWrapper) comboBox.SelectedItem).Value); + } + + [Test] public void Constructor_DataGridViewCorrectlyInitialized() { // Call