Index: Core/Components/src/Core.Components.OxyPlot/Converter/Chart/ChartMultipleAreaDataConverter.cs =================================================================== diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Core/Components/src/Core.Components.OxyPlot/Converter/Chart/ChartMultipleAreaDataConverter.cs (.../ChartMultipleAreaDataConverter.cs) (revision bf790921e622ee49149a92e6b52668fb30d6e3a6) +++ Core/Components/src/Core.Components.OxyPlot/Converter/Chart/ChartMultipleAreaDataConverter.cs (.../ChartMultipleAreaDataConverter.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.Linq; using Core.Common.Base.Geometry; using Core.Components.Chart.Data; @@ -37,7 +38,7 @@ { series.Areas.Clear(); - foreach (Point2D[] area in data.Areas) + foreach (IEnumerable area in data.Areas) { series.Areas.Add(area.Select(p => new DataPoint(p.X, p.Y)).ToArray()); } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs =================================================================== diff -u -ra2226e0827c68aa2434d4f390cde53de1d410fbf -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision a2226e0827c68aa2434d4f390cde53de1d410fbf) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -33,7 +33,7 @@ namespace Ringtoets.MacroStabilityInwards.Forms.Factories { /// - /// Factory for creating for data used as input in the macro stability inwards failure mechanism. + /// Factory for creating for data used in the macro stability inwards failure mechanism. /// internal static class MacroStabilityInwardsChartDataFactory { @@ -58,41 +58,6 @@ } /// - /// Create a for the slice output parameters. - /// - public static ChartDataCollection CreateSliceParametersChartDataCollection() - { - return new ChartDataCollection(Resources.SliceParameters_DisplayName); - } - - /// - /// Create a for a slice parameter. - /// - /// The display name of the parameter. - /// The default visibility of the chart data. - /// The created . - /// Thrown when - /// is null. - public static ChartMultipleAreaData CreateSliceParameterChartData(string name, bool isVisible) - { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - return new ChartMultipleAreaData(name, new ChartAreaStyle - { - StrokeThickness = 1, - StrokeColor = Color.Black, - FillColor = Color.FromArgb(150, Color.Red), - IsEditable = true - }) - { - IsVisible = isVisible - }; - } - - /// /// Create a for a waternet zone. /// /// The name of the zone. @@ -304,22 +269,6 @@ } /// - /// Create a for the slices in a slip plane. - /// - /// The created . - public static ChartMultipleAreaData CreateSlicesChartData() - { - return new ChartMultipleAreaData(Resources.Slices_DisplayName, - new ChartAreaStyle - { - FillColor = Color.Empty, - StrokeColor = Color.DarkGreen, - StrokeThickness = 2, - IsEditable = true - }); - } - - /// /// Creates with default styling for the tangent lines. /// /// The created . Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs =================================================================== diff -u -ra2226e0827c68aa2434d4f390cde53de1d410fbf -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs (.../MacroStabilityInwardsChartDataPointsFactory.cs) (revision a2226e0827c68aa2434d4f390cde53de1d410fbf) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs (.../MacroStabilityInwardsChartDataPointsFactory.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -235,7 +235,7 @@ public static IEnumerable> CreateOuterRingArea(MacroStabilityInwardsSoilLayer2D soilLayer) { return soilLayer != null - ? new List> + ? new IEnumerable[] { soilLayer.OuterRing.Points.ToArray() } @@ -250,7 +250,7 @@ /// is null. public static IEnumerable CreatePhreaticLinePoints(MacroStabilityInwardsPhreaticLine phreaticLine) { - return phreaticLine?.Geometry.ToArray() ?? new Point2D[0]; + return phreaticLine?.Geometry ?? new Point2D[0]; } /// @@ -282,7 +282,7 @@ IEnumerable waternetLineGeometry = new RoundedPoint2DCollection(2, waternetLine.Geometry).ToArray(); return IsSurfaceLineAboveWaternetZone(surfaceLineLocalGeometry, waternetLineGeometry, phreaticLineGeometry) - ? CreateZoneAreas(waternetLineGeometry, phreaticLineGeometry).ToArray() + ? CreateZoneAreas(waternetLineGeometry, phreaticLineGeometry) : GetWaternetZoneWithSurfaceLineIntersection(surfaceLineLocalGeometry, waternetLineGeometry, phreaticLineGeometry).ToArray(); } @@ -336,7 +336,7 @@ grid.NumberOfHorizontalPoints)); } - return points.ToArray(); + return points; } /// @@ -355,7 +355,7 @@ List points = slidingCurve.Slices.Select(slice => slice.BottomLeftPoint).OrderBy(x => x.X).ToList(); points.Add(slidingCurve.Slices.Last().BottomRightPoint); - return points.ToArray(); + return points; } /// @@ -647,7 +647,7 @@ area.Add(topLine.First()); } } - return area.ToArray(); + return area; } private static bool AreaIsNotFlatLine(IEnumerable topLine, IEnumerable bottomLine) Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataFactory.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataFactory.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataFactory.cs (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -0,0 +1,227 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Drawing; +using Core.Components.Chart.Data; +using Core.Components.Chart.Styles; +using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Forms.Properties; + +namespace Ringtoets.MacroStabilityInwards.Forms.Factories +{ + /// + /// Factory for creating for slice data used in the macro stability inwards failure mechanism. + /// + internal static class MacroStabilityInwardsSliceChartDataFactory + { + /// + /// Create a for the slices in a slip plane. + /// + /// The created . + public static ChartMultipleAreaData CreateSlicesChartData() + { + return new ChartMultipleAreaData(Resources.Slices_DisplayName, + new ChartAreaStyle + { + FillColor = Color.Empty, + StrokeColor = Color.DarkGreen, + StrokeThickness = 2, + IsEditable = true + }); + } + + /// + /// Create a for the slice output parameters. + /// + public static ChartDataCollection CreateSliceParametersChartDataCollection() + { + return new ChartDataCollection(Resources.SliceParameters_DisplayName); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateCohesionChartData() + { + return CreateSliceParameterChartData(Resources.Cohesion_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateEffectiveStressChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_EffectiveStress_DisplayName, true); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateEffectiveStressDailyChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_EffectiveStressDaily_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateTotalPorePressureChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_TotalPorePressure_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateWeightChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_Weight_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreatePiezometricPorePressureChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_PiezometricPorePressure_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreatePorePressureChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_PorePressure_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateVerticalPorePressureChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_VerticalPorePressure_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateHorizontalPorePressureChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_HorizontalPorePressure_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateOverConsolidationRatioChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_OverConsolidationRatio_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreatePopChartData() + { + return CreateSliceParameterChartData(Resources.Pop_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateNormalStressChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_NormalStress_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateShearStressChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_ShearStress_DisplayName, false); + } + + /// + /// Create a for the representation + /// of values in a + /// sliding curve. + /// + /// The created . + public static ChartMultipleAreaData CreateLoadStressChartData() + { + return CreateSliceParameterChartData(Resources.MacroStabilityInwardsSlice_LoadStress_DisplayName, false); + } + + private static ChartMultipleAreaData CreateSliceParameterChartData(string name, bool isVisible) + { + return new ChartMultipleAreaData(name, new ChartAreaStyle + { + StrokeThickness = 1, + StrokeColor = Color.Black, + FillColor = Color.FromArgb(150, Color.Red), + IsEditable = true + }) + { + IsVisible = isVisible + }; + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs =================================================================== diff -u -ra2226e0827c68aa2434d4f390cde53de1d410fbf -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs (.../MacroStabilityInwardsSliceChartDataPointsFactory.cs) (revision a2226e0827c68aa2434d4f390cde53de1d410fbf) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs (.../MacroStabilityInwardsSliceChartDataPointsFactory.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -31,8 +31,7 @@ { /// /// Factory for creating collections of points in 2D space for a collection of - /// to use in . - /// (created via ). + /// to use in (created via ). /// internal static class MacroStabilityInwardsSliceChartDataPointsFactory { @@ -56,7 +55,7 @@ slice.TopRightPoint, slice.BottomRightPoint, slice.BottomLeftPoint - }); + }).ToArray(); } /// @@ -66,7 +65,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateCohesionAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -80,7 +79,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateEffectiveStressAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -94,7 +93,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateEffectiveStressDailyAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -108,7 +107,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateTotalPorePressureAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -122,7 +121,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateWeightAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -136,7 +135,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreatePiezometricPorePressureAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -150,7 +149,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreatePorePressureAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -164,7 +163,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateVerticalPorePressureAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -178,7 +177,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateHorizontalPorePressureAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -192,7 +191,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateOverConsolidationRatioAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -206,7 +205,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreatePopAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -220,7 +219,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateNormalStressAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -234,7 +233,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateShearStressAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -248,7 +247,7 @@ /// The to /// get the slices from. /// A collection of collections of points in 2D space containing areas representing the - /// slice output values, or an empty collection when is null. + /// slice output values, or an empty collection when is null. /// public static IEnumerable> CreateLoadStressAreas(MacroStabilityInwardsSlidingCurve slidingCurve) { @@ -267,7 +266,7 @@ var areas = new List(); foreach (MacroStabilityInwardsSlice slice in slices) { - RoundedDouble value = getParameterFunc.Invoke(slice); + RoundedDouble value = getParameterFunc(slice); double offset = value.Value * scaleFactor; double deltaX = slice.BottomLeftPoint.X - slice.BottomRightPoint.X; double deltaY = slice.BottomLeftPoint.Y - slice.BottomRightPoint.Y; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj (.../Ringtoets.MacroStabilityInwards.Forms.csproj) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj (.../Ringtoets.MacroStabilityInwards.Forms.csproj) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -17,6 +17,7 @@ + Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs (.../MacroStabilityInwardsOutputChartControl.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -30,7 +30,6 @@ using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Factories; -using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -125,37 +124,23 @@ slipPlaneChartData = MacroStabilityInwardsChartDataFactory.CreateSlipPlaneChartData(); leftCircleRadiusChartData = MacroStabilityInwardsChartDataFactory.CreateActiveCircleRadiusChartData(); rightCircleRadiusChartData = MacroStabilityInwardsChartDataFactory.CreatePassiveCircleRadiusChartData(); - slicesChartData = MacroStabilityInwardsChartDataFactory.CreateSlicesChartData(); + slicesChartData = MacroStabilityInwardsSliceChartDataFactory.CreateSlicesChartData(); - sliceParametersChartDataCollection = MacroStabilityInwardsChartDataFactory.CreateSliceParametersChartDataCollection(); - sliceCohesionChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.Cohesion_DisplayName, false); - sliceEffectiveStressChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_EffectiveStress_DisplayName, true); - sliceEffectiveStressDailyChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_EffectiveStressDaily_DisplayName, false); - sliceTotalPorePressureChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_TotalPorePressure_DisplayName, false); - sliceWeightChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_Weight_DisplayName, false); - slicePiezometricPorePressureChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_PiezometricPorePressure_DisplayName, false); - slicePorePressureChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_PorePressure_DisplayName, false); - sliceVerticalPorePressureChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_VerticalPorePressure_DisplayName, false); - sliceHorizontalPorePressureChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_HorizontalPorePressure_DisplayName, false); - sliceOverConsolidationRatioChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_OverConsolidationRatio_DisplayName, false); - slicePopChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.Pop_DisplayName, false); - sliceNormalStressChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_NormalStress_DisplayName, false); - sliceShearStressChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_ShearStress_DisplayName, false); - sliceLoadStressChartData = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData( - Resources.MacroStabilityInwardsSlice_LoadStress_DisplayName, false); + sliceParametersChartDataCollection = MacroStabilityInwardsSliceChartDataFactory.CreateSliceParametersChartDataCollection(); + sliceCohesionChartData = MacroStabilityInwardsSliceChartDataFactory.CreateCohesionChartData(); + sliceEffectiveStressChartData = MacroStabilityInwardsSliceChartDataFactory.CreateEffectiveStressChartData(); + sliceEffectiveStressDailyChartData = MacroStabilityInwardsSliceChartDataFactory.CreateEffectiveStressDailyChartData(); + sliceTotalPorePressureChartData = MacroStabilityInwardsSliceChartDataFactory.CreateTotalPorePressureChartData(); + sliceWeightChartData = MacroStabilityInwardsSliceChartDataFactory.CreateWeightChartData(); + slicePiezometricPorePressureChartData = MacroStabilityInwardsSliceChartDataFactory.CreatePiezometricPorePressureChartData(); + slicePorePressureChartData = MacroStabilityInwardsSliceChartDataFactory.CreatePorePressureChartData(); + sliceVerticalPorePressureChartData = MacroStabilityInwardsSliceChartDataFactory.CreateVerticalPorePressureChartData(); + sliceHorizontalPorePressureChartData = MacroStabilityInwardsSliceChartDataFactory.CreateHorizontalPorePressureChartData(); + sliceOverConsolidationRatioChartData = MacroStabilityInwardsSliceChartDataFactory.CreateOverConsolidationRatioChartData(); + slicePopChartData = MacroStabilityInwardsSliceChartDataFactory.CreatePopChartData(); + sliceNormalStressChartData = MacroStabilityInwardsSliceChartDataFactory.CreateNormalStressChartData(); + sliceShearStressChartData = MacroStabilityInwardsSliceChartDataFactory.CreateShearStressChartData(); + sliceLoadStressChartData = MacroStabilityInwardsSliceChartDataFactory.CreateLoadStressChartData(); chartDataCollection.Add(soilProfileChartData); chartDataCollection.Add(surfaceLineChartData); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs =================================================================== diff -u -r117a54dfd9b5972086a1f3386923edda2e7a334b -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 117a54dfd9b5972086a1f3386923edda2e7a334b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -58,46 +58,6 @@ } [Test] - public void CreateSliceParametersChartDataCollection_ReturnsEmptyChartDataCollection() - { - // Call - ChartDataCollection data = MacroStabilityInwardsChartDataFactory.CreateSliceParametersChartDataCollection(); - - // Assert - CollectionAssert.IsEmpty(data.Collection); - Assert.AreEqual("Uitvoer per lamel", data.Name); - } - - [Test] - public void CreateSliceParameterChartData_NameNull_ThrowsArgumentNullException() - { - // Call - TestDelegate call = () => MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData(null, new Random(39).NextBoolean()); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("name", exception.ParamName); - } - - [Test] - [TestCase(true)] - [TestCase(false)] - public void CreateSliceParameterChartData_WithNameAndVisibility_ReturnsEmptyChartAreaDataWithExpectedStylingAndVisibility(bool isVisible) - { - // Setup - const string name = "Cohesie"; - - // Call - ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateSliceParameterChartData(name, isVisible); - - // Assert - CollectionAssert.IsEmpty(data.Areas); - Assert.AreEqual(name, data.Name); - Assert.AreEqual(isVisible, data.IsVisible); - AssertEqualStyle(data.Style, Color.FromArgb(150, Color.Red), Color.Black, 1, true); - } - - [Test] public void CreateWaternetZoneChartData_NameNull_ThrowsArgumentNullException() { // Call @@ -336,18 +296,6 @@ } [Test] - public void CreateSlicesChartData_ReturnsChartMultipleAreaData() - { - // Call - ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateSlicesChartData(); - - // Assert - CollectionAssert.IsEmpty(data.Areas); - Assert.AreEqual("Lamellen", data.Name); - AssertEqualStyle(data.Style, Color.Empty, Color.DarkGreen, 2, true); - } - - [Test] public void CreateTangentLinesChartData_ReturnsChartMultipleLineData() { // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs =================================================================== diff -u -ra2226e0827c68aa2434d4f390cde53de1d410fbf -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsChartDataPointsFactoryTest.cs) (revision a2226e0827c68aa2434d4f390cde53de1d410fbf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsChartDataPointsFactoryTest.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -84,7 +84,7 @@ } [Test] - public void CreateSurfaceLevelOutsidePoint_GivenSurfaceLineWithSurfaceLevelOutside_ReturnsSurfaceLevelOutsideCollection() + public void CreateSurfaceLevelOutsidePoint_GivenSurfaceLineWithSurfaceLevelOutside_ReturnsSurfaceLevelOutsidePointsCollection() { // Setup var surfaceLevelOutside = new Point3D(1.2, 2.3, 4.0); @@ -110,7 +110,7 @@ } [Test] - public void CreateDikeToeAtRiverPoint_SurfaceLevelOutsideNull_ReturnsEmptyPointsCollection() + public void CreateDikeToeAtRiverPoint_DikeToeAtRiverNull_ReturnsEmptyPointsCollection() { // Setup MacroStabilityInwardsSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataFactoryTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataFactoryTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataFactoryTest.cs (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -0,0 +1,248 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Drawing; +using Core.Common.TestUtil; +using Core.Components.Chart.Data; +using Core.Components.Chart.Styles; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.Forms.Factories; + +namespace Ringtoets.MacroStabilityInwards.Forms.Test.Factories +{ + [TestFixture] + public class MacroStabilityInwardsSliceChartDataFactoryTest + { + [Test] + public void CreateSlicesChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateSlicesChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Lamellen", data.Name); + AssertEqualStyle(data.Style, Color.Empty, Color.DarkGreen, 2, true); + } + + [Test] + public void CreateSliceParametersChartDataCollection_ReturnsEmptyChartDataCollection() + { + // Call + ChartDataCollection data = MacroStabilityInwardsSliceChartDataFactory.CreateSliceParametersChartDataCollection(); + + // Assert + CollectionAssert.IsEmpty(data.Collection); + Assert.AreEqual("Uitvoer per lamel", data.Name); + } + + [Test] + public void CreateCohesionChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateCohesionChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Cohesie", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateEffectiveStressChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateEffectiveStressChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Effectieve spanning", data.Name); + Assert.IsTrue(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateEffectiveStressDailyChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateEffectiveStressDailyChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Effectieve spanning (dagelijks)", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateTotalPorePressureChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateTotalPorePressureChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Totale waterspanning", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateWeightChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateWeightChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Gewicht", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreatePiezometricPorePressureChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreatePiezometricPorePressureChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Piezometrische waterspanning", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreatePorePressureChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreatePorePressureChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Waterspanning op maaiveld", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateVerticalPorePressureChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateVerticalPorePressureChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Verticale waterspanning op maaiveld", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateHorizontalPorePressureChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateHorizontalPorePressureChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Horizontale waterspanning op maaiveld", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateOverConsolidationRatioChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateOverConsolidationRatioChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("OCR", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreatePopChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreatePopChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("POP", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateNormalStressChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateNormalStressChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Normaalspanning", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateShearStressChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateShearStressChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Schuifspanning", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + [Test] + public void CreateLoadStressChartData_ReturnsChartMultipleAreaData() + { + // Call + ChartMultipleAreaData data = MacroStabilityInwardsSliceChartDataFactory.CreateLoadStressChartData(); + + // Assert + CollectionAssert.IsEmpty(data.Areas); + Assert.AreEqual("Spanning belasting", data.Name); + Assert.IsFalse(data.IsVisible); + AssertEqualStyle(data.Style, Color.FromArgb(150, 255, 0, 0), Color.Black, 1, true); + } + + private static void AssertEqualStyle(ChartAreaStyle areaStyle, Color fillColor, Color strokeColor, int width, bool isEditable) + { + Assert.AreEqual(fillColor, areaStyle.FillColor); + Assert.AreEqual(strokeColor, areaStyle.StrokeColor); + Assert.AreEqual(width, areaStyle.StrokeThickness); + Assert.AreEqual(isEditable, areaStyle.IsEditable); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs =================================================================== diff -u -ra2226e0827c68aa2434d4f390cde53de1d410fbf -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs) (revision a2226e0827c68aa2434d4f390cde53de1d410fbf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs (.../MacroStabilityInwardsSliceChartDataPointsFactoryTest.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -33,7 +33,7 @@ public class MacroStabilityInwardsSliceChartDataPointsFactoryTest { [Test] - public void CreateSliceAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateSliceAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateSliceAreas(null); @@ -43,10 +43,10 @@ } [Test] - public void CreateSliceAreas_WithSlices_ReturnsAreas() + public void CreateSliceAreas_WithSilidingCurve_ReturnsAreas() { // Setup - var slices = new MacroStabilityInwardsSlidingCurve( + var slidingCurve = new MacroStabilityInwardsSlidingCurve( MacroStabilityInwardsSlidingCircleTestFactory.Create(), MacroStabilityInwardsSlidingCircleTestFactory.Create(), new[] @@ -66,7 +66,7 @@ 0.0); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateSliceAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateSliceAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -89,7 +89,7 @@ } [Test] - public void CreateCohesionAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateCohesionAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateCohesionAreas(null); @@ -107,10 +107,10 @@ Cohesion = 30.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateCohesionAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateCohesionAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -140,7 +140,7 @@ } [Test] - public void CreateEffectiveStressAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateEffectiveStressAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressAreas(null); @@ -158,10 +158,10 @@ EffectiveStress = 40.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -191,7 +191,7 @@ } [Test] - public void CreateEffectiveStressDailyAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateEffectiveStressDailyAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas(null); @@ -209,10 +209,10 @@ EffectiveStressDaily = 50.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateEffectiveStressDailyAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -242,7 +242,7 @@ } [Test] - public void CreateTotalPorePressureAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateTotalPorePressureAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateTotalPorePressureAreas(null); @@ -260,10 +260,10 @@ TotalPorePressure = 60.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateTotalPorePressureAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateTotalPorePressureAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -293,7 +293,7 @@ } [Test] - public void CreateWeightAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateWeightAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateWeightAreas(null); @@ -311,10 +311,10 @@ Weight = 70.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateWeightAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateWeightAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -344,7 +344,7 @@ } [Test] - public void CreatePiezometricPorePressureAreas_SlicesNull_ReturnsEmptyCollection() + public void CreatePiezometricPorePressureAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePiezometricPorePressureAreas(null); @@ -362,10 +362,10 @@ PiezometricPorePressure = 80.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePiezometricPorePressureAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePiezometricPorePressureAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -395,7 +395,7 @@ } [Test] - public void CreatePorePressureAreas_SlicesNull_ReturnsEmptyCollection() + public void CreatePorePressureAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePorePressureAreas(null); @@ -413,10 +413,10 @@ PorePressure = 90.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePorePressureAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePorePressureAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -446,7 +446,7 @@ } [Test] - public void CreateVerticalPorePressureAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateVerticalPorePressureAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateVerticalPorePressureAreas(null); @@ -464,10 +464,10 @@ VerticalPorePressure = 100.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateVerticalPorePressureAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateVerticalPorePressureAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -497,7 +497,7 @@ } [Test] - public void CreateHorizontalPorePressureAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateHorizontalPorePressureAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateHorizontalPorePressureAreas(null); @@ -515,10 +515,10 @@ HorizontalPorePressure = 110.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateHorizontalPorePressureAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateHorizontalPorePressureAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -548,7 +548,7 @@ } [Test] - public void CreateOverConsolidationRatioAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateOverConsolidationRatioAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateOverConsolidationRatioAreas(null); @@ -566,10 +566,10 @@ OverConsolidationRatio = 40.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateOverConsolidationRatioAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateOverConsolidationRatioAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -599,7 +599,7 @@ } [Test] - public void CreatePopAreas_SlicesNull_ReturnsEmptyCollection() + public void CreatePopAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePopAreas(null); @@ -617,10 +617,10 @@ Pop = 120.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePopAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreatePopAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -650,7 +650,7 @@ } [Test] - public void CreateNormalStressAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateNormalStressAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateNormalStressAreas(null); @@ -668,10 +668,10 @@ NormalStress = 130.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateNormalStressAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateNormalStressAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -701,7 +701,7 @@ } [Test] - public void CreateShearStressAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateShearStressAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateShearStressAreas(null); @@ -719,10 +719,10 @@ ShearStress = 150.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateShearStressAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateShearStressAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] @@ -752,7 +752,7 @@ } [Test] - public void CreateLoadStressAreas_SlicesNull_ReturnsEmptyCollection() + public void CreateLoadStressAreas_SlidingCurveNull_ReturnsEmptyCollection() { // Call IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateLoadStressAreas(null); @@ -770,10 +770,10 @@ LoadStress = 160.0 }; - MacroStabilityInwardsSlidingCurve slices = CreateSlidingCurve(constructionProperties); + MacroStabilityInwardsSlidingCurve slidingCurve = CreateSlidingCurve(constructionProperties); // Call - IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateLoadStressAreas(slices); + IEnumerable> areas = MacroStabilityInwardsSliceChartDataPointsFactory.CreateLoadStressAreas(slidingCurve); // Assert CollectionAssert.AreEqual(new[] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj =================================================================== diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj (.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj) (revision fcad48d7beb394e1ac15cfe4289a7381e05aa883) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj (.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -24,6 +24,7 @@ + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs =================================================================== diff -u -ra2226e0827c68aa2434d4f390cde53de1d410fbf -rc9703bc7410fa04c7e81a19553b62eb704b1ff6c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision a2226e0827c68aa2434d4f390cde53de1d410fbf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs (.../MacroStabilityInwardsOutputViewChartDataAssert.cs) (revision c9703bc7410fa04c7e81a19553b62eb704b1ff6c) @@ -402,7 +402,7 @@ var areas = new List(); foreach (MacroStabilityInwardsSlice slice in slices) { - RoundedDouble value = getParameterFunc.Invoke(slice); + RoundedDouble value = getParameterFunc(slice); double offset = value.Value * scaleFactor; double length = Math.Sqrt(Math.Pow(slice.BottomLeftPoint.X - slice.BottomRightPoint.X, 2) + Math.Pow(slice.BottomLeftPoint.Y - slice.BottomRightPoint.Y, 2));