Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs =================================================================== diff -u -r13f17219d61663607e32c0ee25011a5271b393f3 -r46b96a8bc87091274e3537e8bb5ca21aa0a6d04b --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs (.../ClosingStructuresCalculationsView.cs) (revision 13f17219d61663607e32c0ee25011a5271b393f3) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationsView.cs (.../ClosingStructuresCalculationsView.cs) (revision 46b96a8bc87091274e3537e8bb5ca21aa0a6d04b) @@ -163,14 +163,14 @@ RiskeerCommonFormsResources.Use_BreakWater_DisplayName); dataGridViewControl.AddComboBoxColumn(nameof(ClosingStructuresCalculationRow.BreakWaterType), - RiskeerCommonFormsResources.BreakWaterType_DisplayName1, + RiskeerCommonFormsResources.CalculationsView_BreakWaterType_DisplayName, GetBreakWaterTypes(), nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); dataGridViewControl.AddTextBoxColumn( nameof(ClosingStructuresCalculationRow.BreakWaterHeight), - RiskeerCommonFormsResources.BreakWaterHeight_DisplayName1); + RiskeerCommonFormsResources.CalculationsView_BreakWaterHeight_DisplayName); dataGridViewControl.AddCheckBoxColumn(nameof(ClosingStructuresCalculationRow.UseForeShoreGeometry), RiskeerCommonFormsResources.Use_ForeShore_DisplayName); @@ -183,15 +183,21 @@ dataGridViewControl.AddTextBoxColumn( nameof(ClosingStructuresCalculationRow.MeanInsideWaterLevel), - string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, " ", RiskeerCommonFormsResources.Structure_InsideWaterLevel_DisplayName)); + string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, + " ", + RiskeerCommonFormsResources.Structure_InsideWaterLevel_DisplayName)); dataGridViewControl.AddTextBoxColumn( nameof(ClosingStructuresCalculationRow.CriticalOvertoppingDischarge), - string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, " ", RiskeerCommonFormsResources.Structure_CriticalOvertoppingDischarge_DisplayName)); + string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, + " ", + RiskeerCommonFormsResources.Structure_CriticalOvertoppingDischarge_DisplayName)); dataGridViewControl.AddTextBoxColumn( nameof(ClosingStructuresCalculationRow.AllowedLevelIncreaseStorage), - string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, " ", RiskeerCommonFormsResources.Structure_AllowedLevelIncreaseStorage_DisplayName)); + string.Concat(RiskeerCommonFormsResources.NormalDistribution_Mean_DisplayName, + " ", + RiskeerCommonFormsResources.Structure_AllowedLevelIncreaseStorage_DisplayName)); } private void InitializeListBox() Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rc2adf56f36608b5582537b53a94bb8bf5e0fc003 -r46b96a8bc87091274e3537e8bb5ca21aa0a6d04b --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c2adf56f36608b5582537b53a94bb8bf5e0fc003) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 46b96a8bc87091274e3537e8bb5ca21aa0a6d04b) @@ -215,15 +215,6 @@ } /// - /// Looks up a localized string similar to Damhoogte [m+NAP]. - /// - public static string BreakWaterHeight_DisplayName1 { - get { - return ResourceManager.GetString("BreakWaterHeight_DisplayName1", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Eigenschappen van de dam.. /// public static string BreakWaterProperties_Description { @@ -260,15 +251,6 @@ } /// - /// Looks up a localized string similar to Damtype. - /// - public static string BreakWaterType_DisplayName1 { - get { - return ResourceManager.GetString("BreakWaterType_DisplayName1", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Berekenen. /// public static string CalculatableView_ButtonGroupBox_Text { @@ -677,6 +659,24 @@ } /// + /// Looks up a localized string similar to Damhoogte [m+NAP]. + /// + public static string CalculationsView_BreakWaterHeight_DisplayName { + get { + return ResourceManager.GetString("CalculationsView_BreakWaterHeight_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Damtype. + /// + public static string CalculationsView_BreakWaterType_DisplayName { + get { + return ResourceManager.GetString("CalculationsView_BreakWaterType_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Karakteristieke punten. /// public static string Categories_Characteristic_points { @@ -4171,9 +4171,9 @@ /// /// Looks up a localized string similar to Gebruik voorlandgeometrie. /// - public static string Use_ForeShore_DisplayName { + public static string Use_Foreshore_DisplayName { get { - return ResourceManager.GetString("Use_ForeShore_DisplayName", resourceCulture); + return ResourceManager.GetString("Use_Foreshore_DisplayName", resourceCulture); } } Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rc2adf56f36608b5582537b53a94bb8bf5e0fc003 -r46b96a8bc87091274e3537e8bb5ca21aa0a6d04b --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision c2adf56f36608b5582537b53a94bb8bf5e0fc003) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 46b96a8bc87091274e3537e8bb5ca21aa0a6d04b) @@ -1569,16 +1569,16 @@ Naam - + Damhoogte [m+NAP] - + Damtype Gebruik dam - + Gebruik voorlandgeometrie \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs =================================================================== diff -u -r1f9e425e9d128b1356093d14fa2839b492dc12a4 -r46b96a8bc87091274e3537e8bb5ca21aa0a6d04b --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs (.../GrassCoverErosionInwardsCalculationRow.cs) (revision 1f9e425e9d128b1356093d14fa2839b492dc12a4) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs (.../GrassCoverErosionInwardsCalculationRow.cs) (revision 46b96a8bc87091274e3537e8bb5ca21aa0a6d04b) @@ -181,7 +181,7 @@ /// /// Gets or sets whether foreshore profile of the should be used. /// - public bool UseForeShoreGeometry + public bool UseForeshoreGeometry { get => CalculationScenario.InputParameters.UseForeshore; set Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs =================================================================== diff -u -re98a0f7266a2f152b8411c0b2c876ab2fe0464d1 -r46b96a8bc87091274e3537e8bb5ca21aa0a6d04b --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs (.../GrassCoverErosionInwardsCalculationsView.cs) (revision e98a0f7266a2f152b8411c0b2c876ab2fe0464d1) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationsView.cs (.../GrassCoverErosionInwardsCalculationsView.cs) (revision 46b96a8bc87091274e3537e8bb5ca21aa0a6d04b) @@ -166,17 +166,17 @@ RiskeerCommonFormsResources.Use_BreakWater_DisplayName); dataGridViewControl.AddComboBoxColumn(nameof(GrassCoverErosionInwardsCalculationRow.BreakWaterType), - RiskeerCommonFormsResources.BreakWaterType_DisplayName1, + RiskeerCommonFormsResources.CalculationsView_BreakWaterType_DisplayName, GetBreakWaterTypes(), nameof(EnumDisplayWrapper.Value), nameof(EnumDisplayWrapper.DisplayName)); dataGridViewControl.AddTextBoxColumn( nameof(GrassCoverErosionInwardsCalculationRow.BreakWaterHeight), - RiskeerCommonFormsResources.BreakWaterHeight_DisplayName1); + RiskeerCommonFormsResources.CalculationsView_BreakWaterHeight_DisplayName); - dataGridViewControl.AddCheckBoxColumn(nameof(GrassCoverErosionInwardsCalculationRow.UseForeShoreGeometry), - RiskeerCommonFormsResources.Use_ForeShore_DisplayName); + dataGridViewControl.AddCheckBoxColumn(nameof(GrassCoverErosionInwardsCalculationRow.UseForeshoreGeometry), + RiskeerCommonFormsResources.Use_Foreshore_DisplayName); dataGridViewControl.AddTextBoxColumn( nameof(GrassCoverErosionInwardsCalculationRow.DikeHeight), Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationRowTest.cs =================================================================== diff -u -re98a0f7266a2f152b8411c0b2c876ab2fe0464d1 -r46b96a8bc87091274e3537e8bb5ca21aa0a6d04b --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationRowTest.cs (.../GrassCoverErosionInwardsCalculationRowTest.cs) (revision e98a0f7266a2f152b8411c0b2c876ab2fe0464d1) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationRowTest.cs (.../GrassCoverErosionInwardsCalculationRowTest.cs) (revision 46b96a8bc87091274e3537e8bb5ca21aa0a6d04b) @@ -339,7 +339,7 @@ var calculation = new GrassCoverErosionInwardsCalculationScenario(); // Call & Assert - SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.UseForeShoreGeometry = newValue, calculation); + SetPropertyAndVerifyNotificationsAndOutputForCalculation(row => row.UseForeshoreGeometry = newValue, calculation); } [Test] @@ -352,8 +352,8 @@ AssertPropertyNotChanged( row => { - oldValue = row.UseForeShoreGeometry; - row.UseForeShoreGeometry = row.UseForeShoreGeometry; + oldValue = row.UseForeshoreGeometry; + row.UseForeshoreGeometry = row.UseForeshoreGeometry; }, calculation => { @@ -381,7 +381,7 @@ // Call var row = new GrassCoverErosionInwardsCalculationRow(calculation, new ObservablePropertyChangeHandler(calculation, new GrassCoverErosionInwardsInput())) { - UseForeShoreGeometry = true + UseForeshoreGeometry = true }; // Asserts