Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs =================================================================== diff -u -r41a973b2c5890223e7636f9a5e50cc2777e56a41 -r9817b8134222089e6812200b797ff63eb675d67b --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs (.../GrassCoverErosionInwardsCalculationRow.cs) (revision 41a973b2c5890223e7636f9a5e50cc2777e56a41) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsCalculationRow.cs (.../GrassCoverErosionInwardsCalculationRow.cs) (revision 9817b8134222089e6812200b797ff63eb675d67b) @@ -20,13 +20,13 @@ // All rights reserved. using System; +using Core.Common.Base.Data; using Core.Common.Controls.DataGrid; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Forms.ChangeHandlers; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.PropertyClasses; -using Riskeer.Common.IO.DikeProfiles; using Riskeer.GrassCoverErosionInwards.Data; namespace Riskeer.GrassCoverErosionInwards.Forms.Views @@ -96,7 +96,7 @@ } return new DataGridViewComboBoxItemWrapper( - new SelectableHydraulicBoundaryLocation(GrassCoverErosionInwardsCalculationScenario.InputParameters.HydraulicBoundaryLocation,null)); + new SelectableHydraulicBoundaryLocation(GrassCoverErosionInwardsCalculationScenario.InputParameters.HydraulicBoundaryLocation, null)); } set { @@ -108,20 +108,102 @@ } } - public DataGridViewComboBoxItemWrapper DikeProfile { get; set; } + public DataGridViewComboBoxItemWrapper DikeProfile + { + get + { + return new DataGridViewComboBoxItemWrapper(GrassCoverErosionInwardsCalculationScenario.InputParameters.DikeProfile); + } + set + { + DikeProfile valueToSet = value?.WrappedObject; + GrassCoverErosionInwardsCalculationScenario.InputParameters.DikeProfile = valueToSet; + } + } - public bool UseBreakWater { get; set; } + public bool UseBreakWater + { + get + { + return GrassCoverErosionInwardsCalculationScenario.InputParameters.UseBreakWater; + } + set + { + GrassCoverErosionInwardsCalculationScenario.InputParameters.UseBreakWater = value; + } + } - public DataGridViewComboBoxItemWrapper BreakWaterType { get; set; } + public DataGridViewComboBoxItemWrapper BreakWaterType + { + get + { + return new DataGridViewComboBoxItemWrapper(GrassCoverErosionInwardsCalculationScenario.InputParameters.BreakWater.Type); + } + set + { + BreakWaterType valueToSet = value.WrappedObject; + GrassCoverErosionInwardsCalculationScenario.InputParameters.BreakWater.Type = valueToSet; + } + } - public double BreakWaterHeight { get; set; } + public RoundedDouble BreakWaterHeight + { + get + { + return GrassCoverErosionInwardsCalculationScenario.InputParameters.BreakWater.Height; + } + set + { + GrassCoverErosionInwardsCalculationScenario.InputParameters.BreakWater.Height = value; + } + } - public bool UseForeShoreGeometry { get; set; } + public bool UseForeShoreGeometry + { + get + { + return GrassCoverErosionInwardsCalculationScenario.InputParameters.UseForeshore; + } + set + { + GrassCoverErosionInwardsCalculationScenario.InputParameters.UseForeshore = value; + } + } - public double DikeHeight { get; set; } + public RoundedDouble DikeHeight + { + get + { + return GrassCoverErosionInwardsCalculationScenario.InputParameters.DikeHeight; + } + set + { + GrassCoverErosionInwardsCalculationScenario.InputParameters.DikeHeight = value; + } + } - public double ExpectedCriticalOvertoppingRate { get; set; } + public RoundedDouble MeanCriticalFlowRate + { + get + { + return GrassCoverErosionInwardsCalculationScenario.InputParameters.CriticalFlowRate.Mean; + } + set + { + GrassCoverErosionInwardsCalculationScenario.InputParameters.CriticalFlowRate.Mean = value; + } + } - public double StandardDeviationCriticalOvertoppingRate { get; set; } + public RoundedDouble StandardDeviationCriticalFlowRate + { + get + { + return GrassCoverErosionInwardsCalculationScenario.InputParameters.CriticalFlowRate.StandardDeviation; + } + set + { + GrassCoverErosionInwardsCalculationScenario.InputParameters.CriticalFlowRate.StandardDeviation = value; + } + } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs =================================================================== diff -u -r9d45eb42d66159f6b0132b739d70c918bcf3f1f8 -r9817b8134222089e6812200b797ff63eb675d67b --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs (.../GrassCoverErosionInwardsCalculationsViewTest.cs) (revision 9d45eb42d66159f6b0132b739d70c918bcf3f1f8) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsCalculationsViewTest.cs (.../GrassCoverErosionInwardsCalculationsViewTest.cs) (revision 9817b8134222089e6812200b797ff63eb675d67b) @@ -284,7 +284,7 @@ mocks.VerifyAll(); } - + [Test] [TestCase(true)] [TestCase(false)] @@ -294,37 +294,37 @@ var mocks = new MockRepository(); var grassCoverErosionInwardsCalculationObserver = mocks.StrictMock(); var grassCoverErosionInwardsCalculationInputObserver = mocks.StrictMock(); - + grassCoverErosionInwardsCalculationObserver.Expect(o => o.UpdateObserver()); - + var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - + using (GrassCoverErosionInwardsCalculationsView grassCoverErosionInwardsCalculationsView = ShowFullyConfiguredGrassCoverErosionInwardsCalculationsView( assessmentSection)) { var data = (CalculationGroup) grassCoverErosionInwardsCalculationsView.Data; var grassCoverErosionInwardsCalculation = (GrassCoverErosionInwardsCalculationScenario) data.Children.First(); - + if (useCalculationWithOutput) { grassCoverErosionInwardsCalculation.Output = new GrassCoverErosionInwardsOutput(new TestOvertoppingOutput(2.4), new TestDikeHeightOutput(4.2), new TestOvertoppingRateOutput(1.0)); } - + grassCoverErosionInwardsCalculation.Attach(grassCoverErosionInwardsCalculationObserver); grassCoverErosionInwardsCalculation.InputParameters.Attach(grassCoverErosionInwardsCalculationInputObserver); - + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - + // Call dataGridView.Rows[0].Cells[nameColumnIndex].Value = "New name"; - + // Assert grassCoverErosionInwardsCalculation.Output = null; } - + mocks.VerifyAll(); }