Index: Core/Components/src/Core.Components.Chart/Data/ChartMultipleAreaData.cs =================================================================== diff -u -r649b688bb0d390ae15d74c39d34df8d293059b8f -r2329ea0277a00926411f560052f5b09ca837e24a --- Core/Components/src/Core.Components.Chart/Data/ChartMultipleAreaData.cs (.../ChartMultipleAreaData.cs) (revision 649b688bb0d390ae15d74c39d34df8d293059b8f) +++ Core/Components/src/Core.Components.Chart/Data/ChartMultipleAreaData.cs (.../ChartMultipleAreaData.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -33,7 +33,7 @@ /// public class ChartMultipleAreaData : ChartData { - private IEnumerable areas; + private IEnumerable> areas; /// /// Creates a new instance of with default styling. @@ -75,7 +75,7 @@ /// /// Thrown when is null. /// Thrown when contains any null value. - public IEnumerable Areas + public IEnumerable> Areas { get { Index: Core/Components/src/Core.Components.Chart/Data/ChartMultipleLineData.cs =================================================================== diff -u -r649b688bb0d390ae15d74c39d34df8d293059b8f -r2329ea0277a00926411f560052f5b09ca837e24a --- Core/Components/src/Core.Components.Chart/Data/ChartMultipleLineData.cs (.../ChartMultipleLineData.cs) (revision 649b688bb0d390ae15d74c39d34df8d293059b8f) +++ Core/Components/src/Core.Components.Chart/Data/ChartMultipleLineData.cs (.../ChartMultipleLineData.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -33,7 +33,7 @@ /// public class ChartMultipleLineData : ChartData { - private IEnumerable lines; + private IEnumerable> lines; /// /// Creates a new instance of with default styling. @@ -77,7 +77,7 @@ /// is null. /// Thrown when contains /// any null value. - public IEnumerable Lines + public IEnumerable> Lines { get { Index: Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs =================================================================== diff -u -r2c5e077a0f546af6d6379eb93111fd8366fc2224 -r2329ea0277a00926411f560052f5b09ca837e24a --- Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs (.../PointBasedChartData.cs) (revision 2c5e077a0f546af6d6379eb93111fd8366fc2224) +++ Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs (.../PointBasedChartData.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using System.Linq; using Core.Common.Base.Geometry; @@ -30,7 +31,7 @@ /// public abstract class PointBasedChartData : ChartData { - private Point2D[] points; + private IEnumerable points; /// /// Creates a new instance of . @@ -55,7 +56,7 @@ /// Gets or sets an array of points in 2D space. /// /// Thrown when is null. - public Point2D[] Points + public IEnumerable Points { get { Index: Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartAreaDataSeries.cs =================================================================== diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2329ea0277a00926411f560052f5b09ca837e24a --- Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartAreaDataSeries.cs (.../ChartAreaDataSeries.cs) (revision bf790921e622ee49149a92e6b52668fb30d6e3a6) +++ Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartAreaDataSeries.cs (.../ChartAreaDataSeries.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using Core.Common.Base.Geometry; using Core.Components.Chart.Data; using Core.Components.OxyPlot.Converter.Chart; @@ -35,7 +36,7 @@ private readonly ChartAreaData chartAreaData; private readonly ChartAreaDataConverter converter = new ChartAreaDataConverter(); - private Point2D[] drawnPoints; + private IEnumerable drawnPoints; /// /// Creates a new instance of . Index: Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartLineDataSeries.cs =================================================================== diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2329ea0277a00926411f560052f5b09ca837e24a --- Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartLineDataSeries.cs (.../ChartLineDataSeries.cs) (revision bf790921e622ee49149a92e6b52668fb30d6e3a6) +++ Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartLineDataSeries.cs (.../ChartLineDataSeries.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using Core.Common.Base.Geometry; using Core.Components.Chart.Data; using Core.Components.OxyPlot.Converter.Chart; @@ -35,7 +36,7 @@ private readonly ChartLineData chartLineData; private readonly ChartLineDataConverter converter = new ChartLineDataConverter(); - private Point2D[] drawnPoints; + private IEnumerable drawnPoints; /// /// Creates a new instance of . Index: Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleAreaDataSeries.cs =================================================================== diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2329ea0277a00926411f560052f5b09ca837e24a --- Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleAreaDataSeries.cs (.../ChartMultipleAreaDataSeries.cs) (revision bf790921e622ee49149a92e6b52668fb30d6e3a6) +++ Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleAreaDataSeries.cs (.../ChartMultipleAreaDataSeries.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -36,7 +36,7 @@ private readonly ChartMultipleAreaData chartMultipleAreaData; private readonly ChartMultipleAreaDataConverter converter = new ChartMultipleAreaDataConverter(); - private IEnumerable drawnAreas; + private IEnumerable> drawnAreas; /// /// Creates a new instance of . Index: Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs =================================================================== diff -u -r2c5e077a0f546af6d6379eb93111fd8366fc2224 -r2329ea0277a00926411f560052f5b09ca837e24a --- Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs (.../ChartMultipleLineDataSeries.cs) (revision 2c5e077a0f546af6d6379eb93111fd8366fc2224) +++ Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs (.../ChartMultipleLineDataSeries.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -36,7 +36,7 @@ private readonly ChartMultipleLineData chartMultipleLineData; private readonly ChartMultipleLineDataConverter converter = new ChartMultipleLineDataConverter(); - private IEnumerable drawnLines; + private IEnumerable> drawnLines; /// /// Creates a new instance of . Index: Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartPointDataSeries.cs =================================================================== diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2329ea0277a00926411f560052f5b09ca837e24a --- Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartPointDataSeries.cs (.../ChartPointDataSeries.cs) (revision bf790921e622ee49149a92e6b52668fb30d6e3a6) +++ Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartPointDataSeries.cs (.../ChartPointDataSeries.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using Core.Common.Base.Geometry; using Core.Components.Chart.Data; using Core.Components.OxyPlot.Converter.Chart; @@ -35,7 +36,7 @@ private readonly ChartPointData chartPointData; private readonly ChartPointDataConverter converter = new ChartPointDataConverter(); - private Point2D[] drawnPoints; + private IEnumerable drawnPoints; /// /// Creates a new instance of . Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs =================================================================== diff -u -rd337718251f4330d447d555eb1c70df226dd9823 -r2329ea0277a00926411f560052f5b09ca837e24a --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision d337718251f4330d447d555eb1c70df226dd9823) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -530,7 +530,7 @@ var dikeProfileChartData = (ChartLineData) chartData; RoughnessPoint[] dikeGeometry = dikeProfile.DikeGeometry; - Assert.AreEqual(dikeGeometry.Length, dikeProfileChartData.Points.Length); + Assert.AreEqual(dikeGeometry.Length, dikeProfileChartData.Points.Count()); CollectionAssert.AreEqual(dikeGeometry.Select(dg => dg.Point), dikeProfileChartData.Points); string expectedName = $"{dikeProfile.Name} - Dijkprofiel"; @@ -543,7 +543,7 @@ var foreshoreChartData = (ChartLineData) chartData; RoundedPoint2DCollection foreshoreGeometry = dikeProfile.ForeshoreGeometry; - Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Length); + Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Count()); CollectionAssert.AreEqual(foreshoreGeometry, foreshoreChartData.Points); string expectedName = $"{dikeProfile.Name} - Voorlandprofiel"; @@ -561,7 +561,7 @@ new Point2D(dikeProfile.DikeGeometry.Last().Point.X, dikeProfile.DikeHeight) }; - Assert.AreEqual(dikeHeightGeometry.Length, dikeHeightChartData.Points.Length); + Assert.AreEqual(dikeHeightGeometry.Length, dikeHeightChartData.Points.Count()); CollectionAssert.AreEqual(dikeHeightGeometry, dikeHeightChartData.Points); Assert.AreEqual("Dijkhoogte", chartData.Name); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs =================================================================== diff -u -r52bf1eb466e06cc2da8d336229ebb8caaa877ba8 -r2329ea0277a00926411f560052f5b09ca837e24a --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs (.../MacroStabilityInwardsSliceChartDataPointsFactory.cs) (revision 52bf1eb466e06cc2da8d336229ebb8caaa877ba8) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs (.../MacroStabilityInwardsSliceChartDataPointsFactory.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -24,7 +24,7 @@ using System.Linq; using Core.Common.Base.Data; using Core.Common.Base.Geometry; -using Core.Common.Util.Extensions; +using Core.Common.Utils.Extensions; using Core.Components.Chart.Data; using Ringtoets.MacroStabilityInwards.Data; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs =================================================================== diff -u -ra371ae048cf582e8a9cad8436a21c2b9b18dc793 -r2329ea0277a00926411f560052f5b09ca837e24a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs (.../MacroStabilityInwardsViewChartDataAssert.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs (.../MacroStabilityInwardsViewChartDataAssert.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -47,7 +47,7 @@ Assert.IsInstanceOf(actual); var surfaceLineChartData = (ChartLineData) actual; - Assert.AreEqual(original.Points.Length, surfaceLineChartData.Points.Length); + Assert.AreEqual(original.Points.Length, surfaceLineChartData.Points.Count()); Assert.AreEqual(original.Name, actual.Name); CollectionAssert.AreEqual(original.LocalGeometry, surfaceLineChartData.Points); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs =================================================================== diff -u -rf1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9 -r2329ea0277a00926411f560052f5b09ca837e24a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision f1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -780,7 +780,7 @@ Assert.IsInstanceOf(chartData); var surfaceLineChartData = (ChartLineData) chartData; - Assert.AreEqual(surfaceLine.Points.Length, surfaceLineChartData.Points.Length); + Assert.AreEqual(surfaceLine.Points.Length, surfaceLineChartData.Points.Count()); CollectionAssert.AreEqual(surfaceLine.LocalGeometry, surfaceLineChartData.Points); Assert.AreEqual(surfaceLine.Name, chartData.Name); } @@ -790,7 +790,7 @@ Assert.IsInstanceOf(chartData); var entryPointChartData = (ChartPointData) chartData; - Assert.AreEqual(1, entryPointChartData.Points.Length); + Assert.AreEqual(1, entryPointChartData.Points.Count()); var entryPoint = new Point2D(pipingInput.EntryPointL, surfaceLine.GetZAtL(pipingInput.EntryPointL)); CollectionAssert.AreEqual(new[] { @@ -804,7 +804,7 @@ Assert.IsInstanceOf(chartData); var exitPointChartData = (ChartPointData) chartData; - Assert.AreEqual(1, exitPointChartData.Points.Length); + Assert.AreEqual(1, exitPointChartData.Points.Count()); var exitPoint = new Point2D(pipingInput.ExitPointL, surfaceLine.GetZAtL(pipingInput.ExitPointL)); CollectionAssert.AreEqual(new[] { @@ -821,47 +821,47 @@ var lastPoint = new Point2D(last.X, last.Y); var ditchDikeSideData = (ChartPointData) characteristicPoints[ditchDikeSideIndex]; - Assert.AreEqual(1, ditchDikeSideData.Points.Length); + Assert.AreEqual(1, ditchDikeSideData.Points.Count()); CollectionAssert.AreEqual(new[] { surfaceLine.DitchDikeSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, ditchDikeSideData.Points); Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name); var bottomDitchDikeSideData = (ChartPointData) characteristicPoints[bottomDitchDikeSideIndex]; - Assert.AreEqual(1, bottomDitchDikeSideData.Points.Length); + Assert.AreEqual(1, bottomDitchDikeSideData.Points.Count()); CollectionAssert.AreEqual(new[] { surfaceLine.BottomDitchDikeSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, bottomDitchDikeSideData.Points); Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name); var ditchPolderSideData = (ChartPointData) characteristicPoints[ditchPolderSideIndex]; - Assert.AreEqual(1, ditchPolderSideData.Points.Length); + Assert.AreEqual(1, ditchPolderSideData.Points.Count()); CollectionAssert.AreEqual(new[] { surfaceLine.DitchPolderSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, ditchPolderSideData.Points); Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name); var bottomDitchPolderSideData = (ChartPointData) characteristicPoints[bottomDitchPolderSideIndex]; - Assert.AreEqual(1, bottomDitchPolderSideData.Points.Length); + Assert.AreEqual(1, bottomDitchPolderSideData.Points.Count()); CollectionAssert.AreEqual(new[] { surfaceLine.BottomDitchPolderSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, bottomDitchPolderSideData.Points); Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name); var dikeToeAtPolderData = (ChartPointData) characteristicPoints[dikeToeAtPolderIndex]; - Assert.AreEqual(1, dikeToeAtPolderData.Points.Length); + Assert.AreEqual(1, dikeToeAtPolderData.Points.Count()); CollectionAssert.AreEqual(new[] { surfaceLine.DikeToeAtPolder.ProjectIntoLocalCoordinates(firstPoint, lastPoint) }, dikeToeAtPolderData.Points); Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name); var dikeToeAtRiverData = (ChartPointData) characteristicPoints[dikeToeAtRiverIndex]; - Assert.AreEqual(1, dikeToeAtRiverData.Points.Length); + Assert.AreEqual(1, dikeToeAtRiverData.Points.Count()); CollectionAssert.AreEqual(new[] { surfaceLine.DikeToeAtRiver.ProjectIntoLocalCoordinates(firstPoint, lastPoint) Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -r2329ea0277a00926411f560052f5b09ca837e24a --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 2329ea0277a00926411f560052f5b09ca837e24a) @@ -610,7 +610,7 @@ var foreshoreChartData = (ChartLineData) chartData; RoundedPoint2DCollection foreshoreGeometry = foreshoreProfile.Geometry; - Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Length); + Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Count()); CollectionAssert.AreEqual(foreshoreGeometry, foreshoreChartData.Points); string expectedName = $"{foreshoreProfile.Name} - Voorlandprofiel";