Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs =================================================================== diff -u -ra61a8c6b3b7dcf4126ad67dd8ca79ba514839a08 -r41a973b2c5890223e7636f9a5e50cc2777e56a41 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs (.../GrassCoverErosionInwardsCalculationRow.cs) (revision a61a8c6b3b7dcf4126ad67dd8ca79ba514839a08) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs (.../GrassCoverErosionInwardsCalculationRow.cs) (revision 41a973b2c5890223e7636f9a5e50cc2777e56a41) @@ -110,11 +110,11 @@ public DataGridViewComboBoxItemWrapper DikeProfile { get; set; } - public bool UseDam { get; set; } + public bool UseBreakWater { get; set; } - public DataGridViewComboBoxItemWrapper DamType { get; set; } + public DataGridViewComboBoxItemWrapper BreakWaterType { get; set; } - public double Damheight { get; set; } + public double BreakWaterHeight { get; set; } public bool UseForeShoreGeometry { get; set; } Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs =================================================================== diff -u -r9d45eb42d66159f6b0132b739d70c918bcf3f1f8 -r41a973b2c5890223e7636f9a5e50cc2777e56a41 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs (.../GrassCoverErosionInwardsCalculationsView.cs) (revision 9d45eb42d66159f6b0132b739d70c918bcf3f1f8) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs (.../GrassCoverErosionInwardsCalculationsView.cs) (revision 41a973b2c5890223e7636f9a5e50cc2777e56a41) @@ -49,6 +49,7 @@ public partial class GrassCoverErosionInwardsCalculationsView : UserControl, ISelectionProvider, IView { private const int selectableHydraulicBoundaryLocationColumnIndex = 1; + private const int selectableDikeProfileColumnIndex = 2; private readonly Observer grassCoverErosionInwardsFailureMechanismObserver; private readonly Observer hydraulicBoundaryLocationsObserver; private readonly RecursiveObserver grassCoverErosionInwardsInputObserver; @@ -188,17 +189,17 @@ nameof(DataGridViewComboBoxItemWrapper.This), nameof(DataGridViewComboBoxItemWrapper.DisplayName)); - dataGridViewControl.AddCheckBoxColumn(nameof(GrassCoverErosionInwardsCalculationRow.UseDam), Resources.GrassCoverErosionInwardsCalculation_Use_Dam); + dataGridViewControl.AddCheckBoxColumn(nameof(GrassCoverErosionInwardsCalculationRow.UseBreakWater), Resources.GrassCoverErosionInwardsCalculation_Use_Dam); dataGridViewControl.AddComboBoxColumn>( - nameof(GrassCoverErosionInwardsCalculationRow.DamType), + nameof(GrassCoverErosionInwardsCalculationRow.BreakWaterType), Resources.GrassCoverErosionInwardsCalculation_Damtype, null, nameof(DataGridViewComboBoxItemWrapper.This), nameof(DataGridViewComboBoxItemWrapper.DisplayName)); dataGridViewControl.AddTextBoxColumn( - nameof(GrassCoverErosionInwardsCalculationRow.Damheight), + nameof(GrassCoverErosionInwardsCalculationRow.BreakWaterHeight), Resources.GrassCoverErosionInwardsCalculation_Damheight); dataGridViewControl.AddCheckBoxColumn(nameof(GrassCoverErosionInwardsCalculationRow.UseForeShoreGeometry), Resources.GrassCoverErosionInwardsCalculation_Use_ForeShoreGeometry); @@ -335,13 +336,23 @@ private void PrefillComboBoxListItemsAtColumnLevel() { - var selectableHydraulicBoundaryLocationColumn = (DataGridViewComboBoxColumn) dataGridViewControl.GetColumnFromIndex(selectableHydraulicBoundaryLocationColumnIndex); + var selectableHydraulicBoundaryLocationColumn = (DataGridViewComboBoxColumn)dataGridViewControl.GetColumnFromIndex(selectableHydraulicBoundaryLocationColumnIndex); + // Need to prefill for all possible data in order to guarantee 'combo box' columns + // do not generate errors when their cell value is not present in the list of available + // items. using (new SuspendDataGridViewColumnResizes(selectableHydraulicBoundaryLocationColumn)) { SetItemsOnObjectCollection(selectableHydraulicBoundaryLocationColumn.Items, GetSelectableHydraulicBoundaryLocationsDataSource(GetSelectableHydraulicBoundaryLocationsFromFailureMechanism()).ToArray()); } + + // var selectableDikeProfileColumn = (DataGridViewComboBoxColumn)dataGridViewControl.GetColumnFromIndex(selectableDikeProfileColumnIndex); + // + // using (new SuspendDataGridViewColumnResizes(selectableDikeProfileColumn)) + // { + // SetItemsOnObjectCollection(selectableDikeProfileColumn.Items, ) + // } } private IEnumerable GetSelectableHydraulicBoundaryLocationsFromFailureMechanism()