Skip to content

Commit

Permalink
Created new release tag
Browse files Browse the repository at this point in the history
Related to Issue [WTI-1521]


git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/tags/17_2_1@13333 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 83d0094b3b54a411391019d6d1aa9841e79c1ec6
Former-commit-id: 4baccea73d5584581feacae53a8c582975129fd7
  • Loading branch information
kleijn committed Dec 12, 2017
2 parents 7fee602 + b154037 commit 063051d
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace Core.Components.Chart.Data
/// </summary>
public class ChartMultipleAreaData : ChartData
{
private IEnumerable<Point2D[]> areas;
private IEnumerable<IEnumerable<Point2D>> areas;

/// <summary>
/// Creates a new instance of <see cref="ChartMultipleAreaData"/> with default styling.
Expand Down Expand Up @@ -75,7 +75,7 @@ public override bool HasData
/// </summary>
/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is <c>null</c>.</exception>
/// <exception cref="ArgumentException">Thrown when <paramref name="value"/> contains any <c>null</c> value.</exception>
public IEnumerable<Point2D[]> Areas
public IEnumerable<IEnumerable<Point2D>> Areas
{
get
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace Core.Components.Chart.Data
/// </summary>
public class ChartMultipleLineData : ChartData
{
private IEnumerable<Point2D[]> lines;
private IEnumerable<IEnumerable<Point2D>> lines;

/// <summary>
/// Creates a new instance of <see cref="ChartMultipleLineData"/> with default styling.
Expand Down Expand Up @@ -77,7 +77,7 @@ public override bool HasData
/// is <c>null</c>.</exception>
/// <exception cref="ArgumentException">Thrown when <paramref name="value"/> contains
/// any <c>null</c> value.</exception>
public IEnumerable<Point2D[]> Lines
public IEnumerable<IEnumerable<Point2D>> Lines
{
get
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
// All rights reserved.

using System;
using System.Collections.Generic;
using System.Linq;
using Core.Common.Base.Geometry;

Expand All @@ -30,7 +31,7 @@ namespace Core.Components.Chart.Data
/// </summary>
public abstract class PointBasedChartData : ChartData
{
private Point2D[] points;
private IEnumerable<Point2D> points;

/// <summary>
/// Creates a new instance of <see cref="PointBasedChartData"/>.
Expand All @@ -55,7 +56,7 @@ public override bool HasData
/// Gets or sets an array of points in 2D space.
/// </summary>
/// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is <c>null</c>.</exception>
public Point2D[] Points
public IEnumerable<Point2D> Points
{
get
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -35,7 +36,7 @@ public class ChartAreaDataSeries : AreaSeries, IChartDataSeries
private readonly ChartAreaData chartAreaData;
private readonly ChartAreaDataConverter converter = new ChartAreaDataConverter();

private Point2D[] drawnPoints;
private IEnumerable<Point2D> drawnPoints;

/// <summary>
/// Creates a new instance of <see cref="ChartAreaDataSeries"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -35,7 +36,7 @@ public class ChartLineDataSeries : LineSeries, IChartDataSeries
private readonly ChartLineData chartLineData;
private readonly ChartLineDataConverter converter = new ChartLineDataConverter();

private Point2D[] drawnPoints;
private IEnumerable<Point2D> drawnPoints;

/// <summary>
/// Creates a new instance of <see cref="ChartLineDataSeries"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class ChartMultipleAreaDataSeries : MultipleAreaSeries, IChartDataSeries
private readonly ChartMultipleAreaData chartMultipleAreaData;
private readonly ChartMultipleAreaDataConverter converter = new ChartMultipleAreaDataConverter();

private IEnumerable<Point2D[]> drawnAreas;
private IEnumerable<IEnumerable<Point2D>> drawnAreas;

/// <summary>
/// Creates a new instance of <see cref="ChartMultipleAreaDataSeries"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class ChartMultipleLineDataSeries : MultipleLineSeries, IChartDataSeries
private readonly ChartMultipleLineData chartMultipleLineData;
private readonly ChartMultipleLineDataConverter converter = new ChartMultipleLineDataConverter();

private IEnumerable<Point2D[]> drawnLines;
private IEnumerable<IEnumerable<Point2D>> drawnLines;

/// <summary>
/// Creates a new instance of <see cref="ChartMultipleLineDataSeries"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -35,7 +36,7 @@ public class ChartPointDataSeries : LineSeries, IChartDataSeries
private readonly ChartPointData chartPointData;
private readonly ChartPointDataConverter converter = new ChartPointDataConverter();

private Point2D[] drawnPoints;
private IEnumerable<Point2D> drawnPoints;

/// <summary>
/// Creates a new instance of <see cref="ChartPointDataSeries"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ private static void AssertDikeProfileChartData(DikeProfile dikeProfile, ChartDat
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";
Expand All @@ -543,7 +543,7 @@ private static void AssertForeshoreChartData(DikeProfile dikeProfile, ChartData
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";
Expand All @@ -561,7 +561,7 @@ private static void AssertDikeHeightChartData(DikeProfile dikeProfile, ChartData
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static void AssertSurfaceLineChartData(MacroStabilityInwardsSurfaceLine o
Assert.IsInstanceOf<ChartLineData>(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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ private static void AssertSurfaceLineChartData(PipingSurfaceLine surfaceLine, Ch
Assert.IsInstanceOf<ChartLineData>(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);
}
Expand All @@ -790,7 +790,7 @@ private static void AssertEntryPointLPointchartData(PipingInput pipingInput, Pip
Assert.IsInstanceOf<ChartPointData>(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[]
{
Expand All @@ -804,7 +804,7 @@ private static void AssertExitPointLPointchartData(PipingInput pipingInput, Pipi
Assert.IsInstanceOf<ChartPointData>(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[]
{
Expand All @@ -821,47 +821,47 @@ private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IL
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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ private static void AssertForeshoreChartData(ForeshoreProfile foreshoreProfile,
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";
Expand Down

0 comments on commit 063051d

Please sign in to comment.