Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs
===================================================================
diff -u -r8a78c6597ce3fdb511d0f426245006f30ecd2b27 -r8ca6a4ce40d75a96784c6ce8839e06e0b11052da
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs	(.../OpenChartViewCommand.cs)	(revision 8a78c6597ce3fdb511d0f426245006f30ecd2b27)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs	(.../OpenChartViewCommand.cs)	(revision 8ca6a4ce40d75a96784c6ce8839e06e0b11052da)
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
+using Core.Common.Base.Geometry;
 using Core.Common.Controls.Commands;
 using Core.Common.Gui;
 using Core.Components.Charting.Data;
@@ -45,184 +46,184 @@
 
         public void Execute(params object[] arguments)
         {
-            var line1 = new ChartLineData(new Collection<Tuple<double, double>>
+            var line1 = new ChartLineData(new Collection<Point2D>
             {
-                Tuple.Create(0.0, 0.500),
-                Tuple.Create(0.1, 0.723),
-                Tuple.Create(0.2, 0.892),
-                Tuple.Create(0.3, 1.013),
-                Tuple.Create(0.4, 1.092),
-                Tuple.Create(0.5, 1.135),
-                Tuple.Create(0.6, 1.148),
-                Tuple.Create(0.7, 1.137),
-                Tuple.Create(0.8, 1.108),
-                Tuple.Create(0.9, 1.067),
-                Tuple.Create(1.0, 1.020),
-                Tuple.Create(1.1, 0.973),
-                Tuple.Create(1.2, 0.932),
-                Tuple.Create(1.3, 0.903),
-                Tuple.Create(1.4, 0.892),
-                Tuple.Create(1.5, 0.905),
-                Tuple.Create(1.6, 0.948),
-                Tuple.Create(1.7, 1.027),
-                Tuple.Create(1.8, 1.148),
-                Tuple.Create(1.9, 1.317),
-                Tuple.Create(2.0, 1.540),
-                Tuple.Create(2.1, 1.823)
+                new Point2D(0.0, 0.500),
+                new Point2D(0.1, 0.723),
+                new Point2D(0.2, 0.892),
+                new Point2D(0.3, 1.013),
+                new Point2D(0.4, 1.092),
+                new Point2D(0.5, 1.135),
+                new Point2D(0.6, 1.148),
+                new Point2D(0.7, 1.137),
+                new Point2D(0.8, 1.108),
+                new Point2D(0.9, 1.067),
+                new Point2D(1.0, 1.020),
+                new Point2D(1.1, 0.973),
+                new Point2D(1.2, 0.932),
+                new Point2D(1.3, 0.903),
+                new Point2D(1.4, 0.892),
+                new Point2D(1.5, 0.905),
+                new Point2D(1.6, 0.948),
+                new Point2D(1.7, 1.027),
+                new Point2D(1.8, 1.148),
+                new Point2D(1.9, 1.317),
+                new Point2D(2.0, 1.540),
+                new Point2D(2.1, 1.823)
             }, Resources.OpenChartViewCommand_Execute_Line_one)
             {
                 Style = new ChartLineStyle(Color.DarkRed, 3, DashStyle.Solid)
             };
 
 
-            var line2 = new ChartLineData(new Collection<Tuple<double, double>>
+            var line2 = new ChartLineData(new Collection<Point2D>
             {
-                Tuple.Create(0.0, 0.800),
-                Tuple.Create(0.1, 1.009),
-                Tuple.Create(0.2, 1.162),
-                Tuple.Create(0.3, 1.267),
-                Tuple.Create(0.4, 1.328),
-                Tuple.Create(0.5, 1.351),
-                Tuple.Create(0.6, 1.340),
-                Tuple.Create(0.7, 1.302),
-                Tuple.Create(0.8, 1.242),
-                Tuple.Create(0.9, 1.165),
-                Tuple.Create(1.0, 1.076),
-                Tuple.Create(1.1, 0.982),
-                Tuple.Create(1.2, 0.886),
-                Tuple.Create(1.3, 0.796),
-                Tuple.Create(1.4, 0.716),
-                Tuple.Create(1.5, 0.652),
-                Tuple.Create(1.6, 0.608),
-                Tuple.Create(1.7, 0.591),
-                Tuple.Create(1.8, 0.606),
-                Tuple.Create(1.9, 0.658),
-                Tuple.Create(2.0, 0.752),
-                Tuple.Create(2.1, 0.895)
+                new Point2D(0.0, 0.800),
+                new Point2D(0.1, 1.009),
+                new Point2D(0.2, 1.162),
+                new Point2D(0.3, 1.267),
+                new Point2D(0.4, 1.328),
+                new Point2D(0.5, 1.351),
+                new Point2D(0.6, 1.340),
+                new Point2D(0.7, 1.302),
+                new Point2D(0.8, 1.242),
+                new Point2D(0.9, 1.165),
+                new Point2D(1.0, 1.076),
+                new Point2D(1.1, 0.982),
+                new Point2D(1.2, 0.886),
+                new Point2D(1.3, 0.796),
+                new Point2D(1.4, 0.716),
+                new Point2D(1.5, 0.652),
+                new Point2D(1.6, 0.608),
+                new Point2D(1.7, 0.591),
+                new Point2D(1.8, 0.606),
+                new Point2D(1.9, 0.658),
+                new Point2D(2.0, 0.752),
+                new Point2D(2.1, 0.895)
             }, Resources.OpenChartViewCommand_Execute_Line_two)
             {
                 Style = new ChartLineStyle(Color.DarkSlateBlue, 2, DashStyle.DashDot)
             };
 
-            var area1 = new ChartAreaData(new Collection<Tuple<double, double>>
+            var area1 = new ChartAreaData(new Collection<Point2D>
             {
-                Tuple.Create(0.0, 0.500),
-                Tuple.Create(0.1, 0.723),
-                Tuple.Create(0.2, 0.892),
-                Tuple.Create(0.3, 1.013),
-                Tuple.Create(0.4, 1.092),
-                Tuple.Create(0.5, 1.135),
-                Tuple.Create(0.6, 1.148),
-                Tuple.Create(0.7, 1.137),
-                Tuple.Create(0.8, 1.108),
-                Tuple.Create(0.9, 1.067),
-                Tuple.Create(1.0, 1.020),
-                Tuple.Create(1.1, 0.973),
-                Tuple.Create(1.2, 0.932),
-                Tuple.Create(1.3, 0.903),
-                Tuple.Create(1.4, 0.892),
-                Tuple.Create(1.5, 0.905),
-                Tuple.Create(1.5, 0.905 - 0.5),
-                Tuple.Create(1.4, 0.892 - 0.5),
-                Tuple.Create(1.3, 0.903 - 0.5),
-                Tuple.Create(1.2, 0.932 - 0.5),
-                Tuple.Create(1.1, 0.973 - 0.5),
-                Tuple.Create(1.0, 1.020 - 0.5),
-                Tuple.Create(0.9, 1.067 - 0.5),
-                Tuple.Create(0.8, 1.108 - 0.51),
-                Tuple.Create(0.7, 1.137 - 0.52),
-                Tuple.Create(0.6, 1.148 - 0.53),
-                Tuple.Create(0.5, 1.135 - 0.52),
-                Tuple.Create(0.4, 1.092 - 0.51),
-                Tuple.Create(0.3, 1.013 - 0.5),
-                Tuple.Create(0.2, 0.892 - 0.5),
-                Tuple.Create(0.1, 0.723 - 0.5),
-                Tuple.Create(0.0, 0.000),
-                Tuple.Create(0.0, 0.500)
+                new Point2D(0.0, 0.500),
+                new Point2D(0.1, 0.723),
+                new Point2D(0.2, 0.892),
+                new Point2D(0.3, 1.013),
+                new Point2D(0.4, 1.092),
+                new Point2D(0.5, 1.135),
+                new Point2D(0.6, 1.148),
+                new Point2D(0.7, 1.137),
+                new Point2D(0.8, 1.108),
+                new Point2D(0.9, 1.067),
+                new Point2D(1.0, 1.020),
+                new Point2D(1.1, 0.973),
+                new Point2D(1.2, 0.932),
+                new Point2D(1.3, 0.903),
+                new Point2D(1.4, 0.892),
+                new Point2D(1.5, 0.905),
+                new Point2D(1.5, 0.905 - 0.5),
+                new Point2D(1.4, 0.892 - 0.5),
+                new Point2D(1.3, 0.903 - 0.5),
+                new Point2D(1.2, 0.932 - 0.5),
+                new Point2D(1.1, 0.973 - 0.5),
+                new Point2D(1.0, 1.020 - 0.5),
+                new Point2D(0.9, 1.067 - 0.5),
+                new Point2D(0.8, 1.108 - 0.51),
+                new Point2D(0.7, 1.137 - 0.52),
+                new Point2D(0.6, 1.148 - 0.53),
+                new Point2D(0.5, 1.135 - 0.52),
+                new Point2D(0.4, 1.092 - 0.51),
+                new Point2D(0.3, 1.013 - 0.5),
+                new Point2D(0.2, 0.892 - 0.5),
+                new Point2D(0.1, 0.723 - 0.5),
+                new Point2D(0.0, 0.000),
+                new Point2D(0.0, 0.500)
             }, Resources.OpenChartViewCommand_Execute_Area_one)
             {
                 Style = new ChartAreaStyle(Color.DarkSeaGreen, Color.DarkGreen, 5)
             };
 
 
-            var area2 = new ChartAreaData(new Collection<Tuple<double, double>>
+            var area2 = new ChartAreaData(new Collection<Point2D>
             {
-                Tuple.Create(0.1, 0.723 - 0.5),
-                Tuple.Create(0.2, 0.892 - 0.5),
-                Tuple.Create(0.3, 1.013 - 0.49),
-                Tuple.Create(0.4, 1.092 - 0.48),
-                Tuple.Create(0.5, 1.135 - 0.47),
-                Tuple.Create(0.6, 1.148 - 0.46),
-                Tuple.Create(0.7, 1.137 - 0.47),
-                Tuple.Create(0.8, 1.108 - 0.48),
-                Tuple.Create(0.9, 1.067 - 0.49),
-                Tuple.Create(1.0, 1.020 - 0.50),
-                Tuple.Create(1.1, 0.973 - 0.5),
-                Tuple.Create(1.2, 0.932 - 0.5),
-                Tuple.Create(1.3, 0.903 - 0.5),
-                Tuple.Create(1.4, 0.892 - 0.5),
-                Tuple.Create(1.5, 0.905 - 0.5),
-                Tuple.Create(1.5, 0.905),
-                Tuple.Create(1.6, 0.948),
-                Tuple.Create(1.7, 1.027),
-                Tuple.Create(1.8, 1.148),
-                Tuple.Create(1.8, 0.606),
-                Tuple.Create(1.9, 0.658),
-                Tuple.Create(2.0, 0.752),
-                Tuple.Create(2.0, 0.350),
-                Tuple.Create(1.5, 0.905 - 0.7),
-                Tuple.Create(1.4, 0.892 - 0.7),
-                Tuple.Create(1.3, 0.903 - 0.7),
-                Tuple.Create(1.2, 0.932 - 0.7),
-                Tuple.Create(1.1, 0.973 - 0.7),
-                Tuple.Create(1.0, 1.020 - 0.7),
-                Tuple.Create(0.9, 1.067 - 0.7),
-                Tuple.Create(0.8, 1.108 - 0.7),
-                Tuple.Create(0.7, 1.137 - 0.7),
-                Tuple.Create(0.6, 1.148 - 0.7),
-                Tuple.Create(0.5, 1.135 - 0.7),
-                Tuple.Create(0.4, 1.092 - 0.7),
-                Tuple.Create(0.3, 1.013 - 0.7),
-                Tuple.Create(0.2, 0.892 - 0.7),
-                Tuple.Create(0.1, 0.723 - 0.7),
-                Tuple.Create(0.1, 0.723 - 0.5)
+                new Point2D(0.1, 0.723 - 0.5),
+                new Point2D(0.2, 0.892 - 0.5),
+                new Point2D(0.3, 1.013 - 0.49),
+                new Point2D(0.4, 1.092 - 0.48),
+                new Point2D(0.5, 1.135 - 0.47),
+                new Point2D(0.6, 1.148 - 0.46),
+                new Point2D(0.7, 1.137 - 0.47),
+                new Point2D(0.8, 1.108 - 0.48),
+                new Point2D(0.9, 1.067 - 0.49),
+                new Point2D(1.0, 1.020 - 0.50),
+                new Point2D(1.1, 0.973 - 0.5),
+                new Point2D(1.2, 0.932 - 0.5),
+                new Point2D(1.3, 0.903 - 0.5),
+                new Point2D(1.4, 0.892 - 0.5),
+                new Point2D(1.5, 0.905 - 0.5),
+                new Point2D(1.5, 0.905),
+                new Point2D(1.6, 0.948),
+                new Point2D(1.7, 1.027),
+                new Point2D(1.8, 1.148),
+                new Point2D(1.8, 0.606),
+                new Point2D(1.9, 0.658),
+                new Point2D(2.0, 0.752),
+                new Point2D(2.0, 0.350),
+                new Point2D(1.5, 0.905 - 0.7),
+                new Point2D(1.4, 0.892 - 0.7),
+                new Point2D(1.3, 0.903 - 0.7),
+                new Point2D(1.2, 0.932 - 0.7),
+                new Point2D(1.1, 0.973 - 0.7),
+                new Point2D(1.0, 1.020 - 0.7),
+                new Point2D(0.9, 1.067 - 0.7),
+                new Point2D(0.8, 1.108 - 0.7),
+                new Point2D(0.7, 1.137 - 0.7),
+                new Point2D(0.6, 1.148 - 0.7),
+                new Point2D(0.5, 1.135 - 0.7),
+                new Point2D(0.4, 1.092 - 0.7),
+                new Point2D(0.3, 1.013 - 0.7),
+                new Point2D(0.2, 0.892 - 0.7),
+                new Point2D(0.1, 0.723 - 0.7),
+                new Point2D(0.1, 0.723 - 0.5)
             }, Resources.OpenChartViewCommand_Execute_Area_two)
             {
                 Style = new ChartAreaStyle(Color.FromArgb(120, Color.Wheat), Color.DarkOrange, 2)
             };
 
-            var points1 = new ChartPointData(new Collection<Tuple<double, double>>
+            var points1 = new ChartPointData(new Collection<Point2D>
             {
-                Tuple.Create(0.2, 0.892 + 0.04),
-                Tuple.Create(0.3, 1.013 + 0.02),
-                Tuple.Create(0.4, 1.092),
-                Tuple.Create(0.5, 1.135 - 0.02),
-                Tuple.Create(0.6, 1.148 + 0.01),
-                Tuple.Create(1.4, 0.892 - 0.02),
-                Tuple.Create(1.5, 0.905 + 0.01),
-                Tuple.Create(1.8, 1.148 + 0.02)
+                new Point2D(0.2, 0.892 + 0.04),
+                new Point2D(0.3, 1.013 + 0.02),
+                new Point2D(0.4, 1.092),
+                new Point2D(0.5, 1.135 - 0.02),
+                new Point2D(0.6, 1.148 + 0.01),
+                new Point2D(1.4, 0.892 - 0.02),
+                new Point2D(1.5, 0.905 + 0.01),
+                new Point2D(1.8, 1.148 + 0.02)
             }, Resources.OpenChartViewCommand_Execute_Points_one)
             {
                 Style = new ChartPointStyle(Color.Crimson, 6, Color.AntiqueWhite, 3, ChartPointSymbol.Circle)
             };
 
-            var points2 = new ChartPointData(new Collection<Tuple<double, double>>
+            var points2 = new ChartPointData(new Collection<Point2D>
             {
-                Tuple.Create(0.0, 0.800 + 0.01),
-                Tuple.Create(0.1, 1.009 + 0.02),
-                Tuple.Create(0.2, 1.162 + 0.03),
-                Tuple.Create(0.2, 1.162 + 0.05),
-                Tuple.Create(0.2, 1.162 - 0.03),
-                Tuple.Create(0.2, 1.162 - 0.01),
-                Tuple.Create(0.3, 1.267),
-                Tuple.Create(0.4, 1.328 - 0.01),
-                Tuple.Create(0.53, 1.351),
-                Tuple.Create(0.69, 1.340),
-                Tuple.Create(0.73, 1.302),
-                Tuple.Create(1.4, 0.716 - 0.02),
-                Tuple.Create(1.4, 0.716 + 0.02),
-                Tuple.Create(1.7, 0.591),
-                Tuple.Create(1.8, 0.606)
+                new Point2D(0.0, 0.800 + 0.01),
+                new Point2D(0.1, 1.009 + 0.02),
+                new Point2D(0.2, 1.162 + 0.03),
+                new Point2D(0.2, 1.162 + 0.05),
+                new Point2D(0.2, 1.162 - 0.03),
+                new Point2D(0.2, 1.162 - 0.01),
+                new Point2D(0.3, 1.267),
+                new Point2D(0.4, 1.328 - 0.01),
+                new Point2D(0.53, 1.351),
+                new Point2D(0.69, 1.340),
+                new Point2D(0.73, 1.302),
+                new Point2D(1.4, 0.716 - 0.02),
+                new Point2D(1.4, 0.716 + 0.02),
+                new Point2D(1.7, 0.591),
+                new Point2D(1.8, 0.606)
             }, Resources.OpenChartViewCommand_Execute_Points_two)
             {
                 Style = new ChartPointStyle(Color.FromArgb(190, Color.Gold), 7, Color.DeepSkyBlue, 2, ChartPointSymbol.Diamond)