Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r0c5fdf3803fc373c20aa5e12fd180247797e15e2 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 0c5fdf3803fc373c20aa5e12fd180247797e15e2) @@ -341,7 +341,7 @@ UpdateSelectableHydraulicBoundaryLocationsColumn(); } - private static IEnumerable> GetPrefillStochasticSoilModelsDataSource( + private static IEnumerable> GetStochasticSoilModelsDataSource( IEnumerable stochasticSoilModels) { yield return new DataGridViewComboBoxItemWrapper(null); @@ -352,21 +352,7 @@ } } - private static IEnumerable> GetStochasticSoilModelsDataSource( - IEnumerable stochasticSoilModels) - { - PipingStochasticSoilModel[] stochasticSoilModelsArray = stochasticSoilModels.ToArray(); - if (stochasticSoilModelsArray.Length != 1) - { - yield return new DataGridViewComboBoxItemWrapper(null); - } - foreach (PipingStochasticSoilModel stochasticSoilModel in stochasticSoilModelsArray) - { - yield return new DataGridViewComboBoxItemWrapper(stochasticSoilModel); - } - } - - private static IEnumerable> GetPrefillSoilProfilesDataSource( + private static IEnumerable> GetSoilProfilesDataSource( IEnumerable stochasticSoilProfiles) { yield return new DataGridViewComboBoxItemWrapper(null); @@ -377,20 +363,6 @@ } } - private static IEnumerable> GetSoilProfilesDataSource( - IEnumerable stochasticSoilProfiles) - { - PipingStochasticSoilProfile[] stochasticSoilProfilesArray = stochasticSoilProfiles.ToArray(); - if (stochasticSoilProfilesArray.Length != 1) - { - yield return new DataGridViewComboBoxItemWrapper(null); - } - foreach (PipingStochasticSoilProfile stochasticSoilProfile in stochasticSoilProfilesArray) - { - yield return new DataGridViewComboBoxItemWrapper(stochasticSoilProfile); - } - } - private static List> GetSelectableHydraulicBoundaryLocationsDataSource( IEnumerable selectableHydraulicBoundaryLocations = null) { @@ -535,12 +507,12 @@ using (new SuspendDataGridViewColumnResizes(stochasticSoilModelColumn)) { PipingStochasticSoilModelCollection stochasticSoilModels = pipingFailureMechanism.StochasticSoilModels; - SetItemsOnObjectCollection(stochasticSoilModelColumn.Items, GetPrefillStochasticSoilModelsDataSource(stochasticSoilModels).ToArray()); + SetItemsOnObjectCollection(stochasticSoilModelColumn.Items, GetStochasticSoilModelsDataSource(stochasticSoilModels).ToArray()); } using (new SuspendDataGridViewColumnResizes(stochasticSoilProfileColumn)) { PipingStochasticSoilProfile[] pipingSoilProfiles = GetPipingStochasticSoilProfilesFromStochasticSoilModels(); - SetItemsOnObjectCollection(stochasticSoilProfileColumn.Items, GetPrefillSoilProfilesDataSource(pipingSoilProfiles).ToArray()); + SetItemsOnObjectCollection(stochasticSoilProfileColumn.Items, GetSoilProfilesDataSource(pipingSoilProfiles).ToArray()); } using (new SuspendDataGridViewColumnResizes(selectableHydraulicBoundaryLocationColumn)) {