Index: Core/Components/src/Core.Components.Charting/Core.Components.Charting.csproj
===================================================================
diff -u -r4ae122e1d83aaf61af8aec92f0b26ecd72d1adac -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/src/Core.Components.Charting/Core.Components.Charting.csproj (.../Core.Components.Charting.csproj) (revision 4ae122e1d83aaf61af8aec92f0b26ecd72d1adac)
+++ Core/Components/src/Core.Components.Charting/Core.Components.Charting.csproj (.../Core.Components.Charting.csproj) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -54,6 +54,7 @@
Resources.resx
+
Index: Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs (.../ChartLineData.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs (.../ChartLineData.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Styles;
namespace Core.Components.Charting.Data
@@ -35,7 +34,7 @@
{
Color = Color.Black,
Width = 2,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
};
///
Index: Core/Components/src/Core.Components.Charting/Data/ChartMultipleLineData.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/src/Core.Components.Charting/Data/ChartMultipleLineData.cs (.../ChartMultipleLineData.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/src/Core.Components.Charting/Data/ChartMultipleLineData.cs (.../ChartMultipleLineData.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Drawing.Drawing2D;
using System.Linq;
using Core.Common.Base.Geometry;
using Core.Components.Charting.Styles;
@@ -38,7 +37,7 @@
{
Color = Color.Black,
Width = 2,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
};
private IEnumerable lines;
Index: Core/Components/src/Core.Components.Charting/Properties/Resources.Designer.cs
===================================================================
diff -u -r0d567fac4f1c49a54f6621fef10335f2b3cc09de -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/src/Core.Components.Charting/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0d567fac4f1c49a54f6621fef10335f2b3cc09de)
+++ Core/Components/src/Core.Components.Charting/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -1,25 +1,4 @@
-// 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 Lesser 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser 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.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -82,6 +61,51 @@
}
///
+ /// Looks up a localized string similar to Onderbroken.
+ ///
+ internal static string ChartLineDashStyle_Dash_DisplayName {
+ get {
+ return ResourceManager.GetString("ChartLineDashStyle_Dash_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Streep-stip.
+ ///
+ internal static string ChartLineDashStyle_DashDot_DisplayName {
+ get {
+ return ResourceManager.GetString("ChartLineDashStyle_DashDot_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Streep-stip-stip.
+ ///
+ internal static string ChartLineDashStyle_DashDotDot_DisplayName {
+ get {
+ return ResourceManager.GetString("ChartLineDashStyle_DashDotDot_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Gestippeld.
+ ///
+ internal static string ChartLineDashStyle_Dot_DisplayName {
+ get {
+ return ResourceManager.GetString("ChartLineDashStyle_Dot_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Doorgetrokken.
+ ///
+ internal static string ChartLineDashStyle_Solid_DisplayName {
+ get {
+ return ResourceManager.GetString("ChartLineDashStyle_Solid_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Cirkel.
///
internal static string Circle_DisplayName {
Index: Core/Components/src/Core.Components.Charting/Properties/Resources.resx
===================================================================
diff -u -r0d567fac4f1c49a54f6621fef10335f2b3cc09de -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/src/Core.Components.Charting/Properties/Resources.resx (.../Resources.resx) (revision 0d567fac4f1c49a54f6621fef10335f2b3cc09de)
+++ Core/Components/src/Core.Components.Charting/Properties/Resources.resx (.../Resources.resx) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -120,6 +120,21 @@
Cirkel
+
+ Streep-stip-stip
+
+
+ Streep-stip
+
+
+ Onderbroken
+
+
+ Gestippeld
+
+
+ Doorgetrokken
+
Ruit
Index: Core/Components/src/Core.Components.Charting/Styles/ChartLineDashStyle.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Charting/Styles/ChartLineDashStyle.cs (revision 0)
+++ Core/Components/src/Core.Components.Charting/Styles/ChartLineDashStyle.cs (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -0,0 +1,43 @@
+// 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 Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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 Core.Common.Utils.Attributes;
+using Core.Components.Charting.Properties;
+
+namespace Core.Components.Charting.Styles
+{
+ ///
+ /// All Dash styles supported by .
+ ///
+ public enum ChartLineDashStyle
+ {
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartLineDashStyle_Solid_DisplayName))]
+ Solid,
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartLineDashStyle_Dash_DisplayName))]
+ Dash,
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartLineDashStyle_Dot_DisplayName))]
+ Dot,
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartLineDashStyle_DashDot_DisplayName))]
+ DashDot,
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartLineDashStyle_DashDotDot_DisplayName))]
+ DashDotDot
+ }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.Charting/Styles/ChartLineStyle.cs
===================================================================
diff -u -r0d567fac4f1c49a54f6621fef10335f2b3cc09de -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/src/Core.Components.Charting/Styles/ChartLineStyle.cs (.../ChartLineStyle.cs) (revision 0d567fac4f1c49a54f6621fef10335f2b3cc09de)
+++ Core/Components/src/Core.Components.Charting/Styles/ChartLineStyle.cs (.../ChartLineStyle.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.Base.Data;
using Core.Components.Charting.Properties;
@@ -67,6 +66,6 @@
///
/// Gets or sets the line dash style.
///
- public DashStyle DashStyle { get; set; }
+ public ChartLineDashStyle DashStyle { get; set; }
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs
===================================================================
diff -u -r4ae122e1d83aaf61af8aec92f0b26ecd72d1adac -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs (.../ChartDataHelper.cs) (revision 4ae122e1d83aaf61af8aec92f0b26ecd72d1adac)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs (.../ChartDataHelper.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,7 +22,6 @@
using System;
using System.ComponentModel;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using OxyPlot;
@@ -35,35 +34,35 @@
public static class ChartDataHelper
{
///
- /// Converts to .
+ /// Converts to .
///
- /// The to convert.
+ /// The to convert.
/// The converted .
/// Thrown when
/// cannot be converted.
- public static LineStyle Convert(DashStyle dashStyle)
+ public static LineStyle Convert(ChartLineDashStyle dashStyle)
{
var lineStyle = LineStyle.Solid;
switch (dashStyle)
{
- case DashStyle.Solid:
+ case ChartLineDashStyle.Solid:
break;
- case DashStyle.Dash:
+ case ChartLineDashStyle.Dash:
lineStyle = LineStyle.Dash;
break;
- case DashStyle.Dot:
+ case ChartLineDashStyle.Dot:
lineStyle = LineStyle.Dot;
break;
- case DashStyle.DashDot:
+ case ChartLineDashStyle.DashDot:
lineStyle = LineStyle.DashDot;
break;
- case DashStyle.DashDotDot:
+ case ChartLineDashStyle.DashDotDot:
lineStyle = LineStyle.DashDotDot;
break;
default:
throw new InvalidEnumArgumentException(nameof(dashStyle),
(int) dashStyle,
- typeof(DashStyle));
+ typeof(ChartLineDashStyle));
}
return lineStyle;
}
Index: Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj
===================================================================
diff -u -r4ae122e1d83aaf61af8aec92f0b26ecd72d1adac -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj (.../Core.Components.Charting.Test.csproj) (revision 4ae122e1d83aaf61af8aec92f0b26ecd72d1adac)
+++ Core/Components/test/Core.Components.Charting.Test/Core.Components.Charting.Test.csproj (.../Core.Components.Charting.Test.csproj) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -63,6 +63,7 @@
+
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs (.../ChartLineDataTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs (.../ChartLineDataTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.TestUtil;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
@@ -44,7 +43,7 @@
Assert.IsInstanceOf(data);
Assert.AreEqual(Color.Black, data.Style.Color);
Assert.AreEqual(2, data.Style.Width);
- Assert.AreEqual(DashStyle.Solid, data.Style.DashStyle);
+ Assert.AreEqual(ChartLineDashStyle.Solid, data.Style.DashStyle);
}
[Test]
@@ -80,7 +79,7 @@
{
Color = Color.Red,
Width = 3,
- DashStyle = DashStyle.DashDot
+ DashStyle = ChartLineDashStyle.DashDot
};
// Call
Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartMultipleLineDataTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.Charting.Test/Data/ChartMultipleLineDataTest.cs (.../ChartMultipleLineDataTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.Charting.Test/Data/ChartMultipleLineDataTest.cs (.../ChartMultipleLineDataTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.Base.Geometry;
using Core.Common.TestUtil;
using Core.Components.Charting.Data;
@@ -45,7 +44,7 @@
CollectionAssert.IsEmpty(data.Lines);
Assert.AreEqual(Color.Black, data.Style.Color);
Assert.AreEqual(2, data.Style.Width);
- Assert.AreEqual(DashStyle.Solid, data.Style.DashStyle);
+ Assert.AreEqual(ChartLineDashStyle.Solid, data.Style.DashStyle);
}
[Test]
@@ -67,7 +66,7 @@
{
Color = Color.Red,
Width = 3,
- DashStyle = DashStyle.DashDot
+ DashStyle = ChartLineDashStyle.DashDot
};
// Call
Index: Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineDashStyleTest.cs
===================================================================
diff -u
--- Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineDashStyleTest.cs (revision 0)
+++ Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineDashStyleTest.cs (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -0,0 +1,82 @@
+// 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 Lesser 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser 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.Collections.Generic;
+using Core.Common.TestUtil;
+using Core.Components.Charting.Styles;
+using NUnit.Framework;
+
+namespace Core.Components.Charting.Test.Styles
+{
+ [TestFixture]
+ public class ChartLineDashStyleTest : EnumTestFixture
+ {
+ protected override IDictionary ExpectedDisplayNameForEnumValues
+ {
+ get
+ {
+ return new Dictionary
+ {
+ {
+ ChartLineDashStyle.Solid, "Doorgetrokken"
+ },
+ {
+ ChartLineDashStyle.Dash, "Onderbroken"
+ },
+ {
+ ChartLineDashStyle.Dot, "Gestippeld"
+ },
+ {
+ ChartLineDashStyle.DashDot, "Streep-stip"
+ },
+ {
+ ChartLineDashStyle.DashDotDot, "Streep-stip-stip"
+ }
+ };
+ }
+ }
+
+ protected override IDictionary ExpectedValueForEnumValues
+ {
+ get
+ {
+ return new Dictionary
+ {
+ {
+ ChartLineDashStyle.Solid, 0
+ },
+ {
+ ChartLineDashStyle.Dash, 1
+ },
+ {
+ ChartLineDashStyle.Dot, 2
+ },
+ {
+ ChartLineDashStyle.DashDot, 3
+ },
+ {
+ ChartLineDashStyle.DashDotDot, 4
+ }
+ };
+ }
+ }
+ }
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineStyleTest.cs
===================================================================
diff -u -r0d567fac4f1c49a54f6621fef10335f2b3cc09de -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineStyleTest.cs (.../ChartLineStyleTest.cs) (revision 0d567fac4f1c49a54f6621fef10335f2b3cc09de)
+++ Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineStyleTest.cs (.../ChartLineStyleTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.TestUtil;
using Core.Components.Charting.Styles;
using NUnit.Framework;
@@ -37,7 +36,7 @@
// Setup
Color color = Color.AliceBlue;
const int width = 3;
- const DashStyle style = DashStyle.Solid;
+ const ChartLineDashStyle style = ChartLineDashStyle.Solid;
// Call
var lineStyle = new ChartLineStyle
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataHelperTest.cs
===================================================================
diff -u -r4ae122e1d83aaf61af8aec92f0b26ecd72d1adac -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataHelperTest.cs (.../ChartDataHelperTest.cs) (revision 4ae122e1d83aaf61af8aec92f0b26ecd72d1adac)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataHelperTest.cs (.../ChartDataHelperTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System.ComponentModel;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Styles;
using Core.Components.OxyPlot.Converter;
using NUnit.Framework;
@@ -59,7 +58,7 @@
public void Convert_Solid_ReturnsSolid()
{
// Call
- LineStyle lineStyle = ChartDataHelper.Convert(DashStyle.Solid);
+ LineStyle lineStyle = ChartDataHelper.Convert(ChartLineDashStyle.Solid);
// Assert
Assert.AreEqual(LineStyle.Solid, lineStyle);
@@ -69,7 +68,7 @@
public void Convert_Dash_ReturnsDash()
{
// Call
- LineStyle lineStyle = ChartDataHelper.Convert(DashStyle.Dash);
+ LineStyle lineStyle = ChartDataHelper.Convert(ChartLineDashStyle.Dash);
// Assert
Assert.AreEqual(LineStyle.Dash, lineStyle);
@@ -79,7 +78,7 @@
public void Convert_Dot_ReturnsDot()
{
// Call
- LineStyle lineStyle = ChartDataHelper.Convert(DashStyle.Dot);
+ LineStyle lineStyle = ChartDataHelper.Convert(ChartLineDashStyle.Dot);
// Assert
Assert.AreEqual(LineStyle.Dot, lineStyle);
@@ -89,7 +88,7 @@
public void Convert_DashDot_ReturnsDashDot()
{
// Call
- LineStyle lineStyle = ChartDataHelper.Convert(DashStyle.DashDot);
+ LineStyle lineStyle = ChartDataHelper.Convert(ChartLineDashStyle.DashDot);
// Assert
Assert.AreEqual(LineStyle.DashDot, lineStyle);
@@ -99,17 +98,17 @@
public void Convert_DashDotDot_ReturnsDashDotDot()
{
// Call
- LineStyle lineStyle = ChartDataHelper.Convert(DashStyle.DashDotDot);
+ LineStyle lineStyle = ChartDataHelper.Convert(ChartLineDashStyle.DashDotDot);
// Assert
Assert.AreEqual(LineStyle.DashDotDot, lineStyle);
}
[Test]
- public void Convert_Custom_ThrowsInvalidEnumArgumentException()
+ public void Convert_Unknown_ThrowsInvalidEnumArgumentException()
{
// Call
- TestDelegate call = () => ChartDataHelper.Convert(DashStyle.Custom);
+ TestDelegate call = () => ChartDataHelper.Convert((ChartLineDashStyle) 100);
// Assert
Assert.Throws(call);
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs (.../ChartLineDataConverterTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs (.../ChartLineDataConverterTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,7 +22,6 @@
using System;
using System.Collections.ObjectModel;
using System.Drawing;
-using System.Drawing.Drawing2D;
using System.Linq;
using Core.Common.Base.Geometry;
using Core.Components.Charting.Data;
@@ -88,7 +87,7 @@
{
Color = expectedColor,
Width = 3,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
// Call
@@ -111,7 +110,7 @@
{
Color = Color.Red,
Width = width,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
// Call
@@ -122,12 +121,12 @@
}
[Test]
- [TestCase(DashStyle.Solid, LineStyle.Solid)]
- [TestCase(DashStyle.Dash, LineStyle.Dash)]
- [TestCase(DashStyle.Dot, LineStyle.Dot)]
- [TestCase(DashStyle.DashDot, LineStyle.DashDot)]
- [TestCase(DashStyle.DashDotDot, LineStyle.DashDotDot)]
- public void ConvertSeriesProperties_ChartLineStyleSetWithDifferentDashStyles_AppliesStyleToSeries(DashStyle dashStyle, LineStyle expectedLineStyle)
+ [TestCase(ChartLineDashStyle.Solid, LineStyle.Solid)]
+ [TestCase(ChartLineDashStyle.Dash, LineStyle.Dash)]
+ [TestCase(ChartLineDashStyle.Dot, LineStyle.Dot)]
+ [TestCase(ChartLineDashStyle.DashDot, LineStyle.DashDot)]
+ [TestCase(ChartLineDashStyle.DashDotDot, LineStyle.DashDotDot)]
+ public void ConvertSeriesProperties_ChartLineStyleSetWithDifferentDashStyles_AppliesStyleToSeries(ChartLineDashStyle dashStyle, LineStyle expectedLineStyle)
{
// Setup
var converter = new ChartLineDataConverter();
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs
===================================================================
diff -u -rfb7c9834d4ef76498237a06786d13ebda941cf19 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs (.../ChartMultipleLineDataConverterTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs (.../ChartMultipleLineDataConverterTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -23,7 +23,6 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Drawing;
-using System.Drawing.Drawing2D;
using System.Linq;
using Core.Common.Base.Geometry;
using Core.Components.Charting.Data;
@@ -100,7 +99,7 @@
{
Color = expectedColor,
Width = 3,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
// Call
@@ -123,7 +122,7 @@
{
Color = Color.Red,
Width = width,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
// Call
@@ -134,12 +133,12 @@
}
[Test]
- [TestCase(DashStyle.Solid, LineStyle.Solid)]
- [TestCase(DashStyle.Dash, LineStyle.Dash)]
- [TestCase(DashStyle.Dot, LineStyle.Dot)]
- [TestCase(DashStyle.DashDot, LineStyle.DashDot)]
- [TestCase(DashStyle.DashDotDot, LineStyle.DashDotDot)]
- public void ConvertSeriesProperties_ChartLineStyleSetWithDifferentDashStyles_AppliesStyleToSeries(DashStyle dashStyle, LineStyle expectedLineStyle)
+ [TestCase(ChartLineDashStyle.Solid, LineStyle.Solid)]
+ [TestCase(ChartLineDashStyle.Dash, LineStyle.Dash)]
+ [TestCase(ChartLineDashStyle.Dot, LineStyle.Dot)]
+ [TestCase(ChartLineDashStyle.DashDot, LineStyle.DashDot)]
+ [TestCase(ChartLineDashStyle.DashDotDot, LineStyle.DashDotDot)]
+ public void ConvertSeriesProperties_ChartLineStyleSetWithDifferentDashStyles_AppliesStyleToSeries(ChartLineDashStyle dashStyle, LineStyle expectedLineStyle)
{
// Setup
var converter = new ChartMultipleLineDataConverter();
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs
===================================================================
diff -u -rfb7c9834d4ef76498237a06786d13ebda941cf19 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs (.../ChartLineDataSeriesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs (.../ChartLineDataSeriesTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Drawing.Drawing2D;
using System.Linq;
using Core.Common.Base.Geometry;
using Core.Components.Charting.Data;
@@ -58,7 +57,7 @@
{
Color = color,
Width = 3,
- DashStyle = DashStyle.DashDot
+ DashStyle = ChartLineDashStyle.DashDot
});
SetChartLineDataTestProperties(chartLineData);
@@ -80,7 +79,7 @@
{
Color = color,
Width = 3,
- DashStyle = DashStyle.DashDot
+ DashStyle = ChartLineDashStyle.DashDot
});
var chartLineDataSeries = new ChartLineDataSeries(chartLineData);
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs
===================================================================
diff -u -rfb7c9834d4ef76498237a06786d13ebda941cf19 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs (.../ChartMultipleLineDataSeriesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs (.../ChartMultipleLineDataSeriesTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using System.Linq;
using Core.Common.Base.Geometry;
using Core.Components.Charting.Data;
@@ -57,7 +56,7 @@
{
Color = color,
Width = 3,
- DashStyle = DashStyle.Dash
+ DashStyle = ChartLineDashStyle.Dash
});
SetChartMultipleLineDataTestProperties(chartMultipleLineData);
@@ -79,7 +78,7 @@
{
Color = color,
Width = 3,
- DashStyle = DashStyle.Dash
+ DashStyle = ChartLineDashStyle.Dash
});
var chartMultipleLineDataSeries = new ChartMultipleLineDataSeries(chartMultipleLineData);
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartLineDataProperties.cs
===================================================================
diff -u -r5c6072174d8047b062655d56d523d74c5e740039 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartLineDataProperties.cs (.../ChartLineDataProperties.cs) (revision 5c6072174d8047b062655d56d523d74c5e740039)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartLineDataProperties.cs (.../ChartLineDataProperties.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,12 +22,13 @@
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Design;
-using System.Drawing.Drawing2D;
using Core.Common.Gui.Attributes;
using Core.Common.Gui.Converters;
using Core.Common.Gui.UITypeEditors;
+using Core.Common.Utils;
using Core.Common.Utils.Attributes;
using Core.Components.Charting.Data;
+using Core.Components.Charting.Styles;
using Core.Plugins.Chart.Properties;
namespace Core.Plugins.Chart.PropertyClasses
@@ -77,8 +78,8 @@
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartLineData_DashStyle_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.ChartLineData_DashStyle_Description))]
- [TypeConverter(typeof(DashStyleConverter))]
- public DashStyle DashStyle
+ [TypeConverter(typeof(EnumTypeConverter))]
+ public ChartLineDashStyle DashStyle
{
get
{
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleLineDataProperties.cs
===================================================================
diff -u -rc43919519eebf31f0a99504cabc3be0a335c7893 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleLineDataProperties.cs (.../ChartMultipleLineDataProperties.cs) (revision c43919519eebf31f0a99504cabc3be0a335c7893)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleLineDataProperties.cs (.../ChartMultipleLineDataProperties.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,12 +22,13 @@
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Design;
-using System.Drawing.Drawing2D;
using Core.Common.Gui.Attributes;
using Core.Common.Gui.Converters;
using Core.Common.Gui.UITypeEditors;
+using Core.Common.Utils;
using Core.Common.Utils.Attributes;
using Core.Components.Charting.Data;
+using Core.Components.Charting.Styles;
using Core.Plugins.Chart.Properties;
namespace Core.Plugins.Chart.PropertyClasses
@@ -77,8 +78,8 @@
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartLineData_DashStyle_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.ChartLineData_DashStyle_Description))]
- [TypeConverter(typeof(DashStyleConverter))]
- public DashStyle DashStyle
+ [TypeConverter(typeof(EnumTypeConverter))]
+ public ChartLineDashStyle DashStyle
{
get
{
@@ -91,7 +92,6 @@
}
}
-
public override string Type
{
get
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs
===================================================================
diff -u -rfb7c9834d4ef76498237a06786d13ebda941cf19 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs (.../ChartLineDataPropertiesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs (.../ChartLineDataPropertiesTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,10 +21,10 @@
using System.ComponentModel;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.Base;
using Core.Common.Gui.Converters;
using Core.Common.TestUtil;
+using Core.Common.Utils;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using Core.Plugins.Chart.PropertyClasses;
@@ -71,7 +71,7 @@
const string styleCategory = "Stijl";
PropertyDescriptor colorProperty = dynamicProperties[colorPropertyIndex];
- Assert.IsInstanceOf(colorProperty.Converter);
+ Assert.IsInstanceOf(colorProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty,
styleCategory,
"Kleur",
@@ -84,7 +84,7 @@
"De dikte van de lijnen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor styleProperty = dynamicProperties[stylePropertyIndex];
- Assert.IsInstanceOf(styleProperty.Converter);
+ Assert.IsInstanceOf(styleProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
styleCategory,
"Lijnstijl",
@@ -97,7 +97,7 @@
// Setup
Color color = Color.Aqua;
const int width = 4;
- const DashStyle dashStyle = DashStyle.DashDot;
+ const ChartLineDashStyle dashStyle = ChartLineDashStyle.DashDot;
var chartLineData = new ChartLineData("Test", new ChartLineStyle
{
@@ -130,7 +130,7 @@
{
Color = Color.AliceBlue,
Width = 3,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
chartLineData.Attach(observerMock);
@@ -142,7 +142,7 @@
Color newColor = Color.Blue;
const int newWidth = 6;
- const DashStyle newDashStyle = DashStyle.DashDot;
+ const ChartLineDashStyle newDashStyle = ChartLineDashStyle.DashDot;
// Call
properties.Color = newColor;
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs
===================================================================
diff -u -rfb7c9834d4ef76498237a06786d13ebda941cf19 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs (.../ChartMultipleLineDataPropertiesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs (.../ChartMultipleLineDataPropertiesTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,10 +21,10 @@
using System.ComponentModel;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.Base;
using Core.Common.Gui.Converters;
using Core.Common.TestUtil;
+using Core.Common.Utils;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using Core.Plugins.Chart.PropertyClasses;
@@ -84,7 +84,7 @@
"De dikte van de lijnen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor styleProperty = dynamicProperties[stylePropertyIndex];
- Assert.IsInstanceOf(styleProperty.Converter);
+ Assert.IsInstanceOf(styleProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
styleCategory,
"Lijnstijl",
@@ -97,7 +97,7 @@
// Setup
Color color = Color.Aqua;
const int width = 4;
- const DashStyle dashStyle = DashStyle.DashDot;
+ const ChartLineDashStyle dashStyle = ChartLineDashStyle.DashDot;
var chartLineData = new ChartMultipleLineData("Test", new ChartLineStyle
{
@@ -130,7 +130,7 @@
{
Color = Color.AliceBlue,
Width = 3,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
chartLineData.Attach(observerMock);
@@ -142,7 +142,7 @@
Color newColor = Color.Blue;
const int newWidth = 6;
- const DashStyle newDashStyle = DashStyle.DashDot;
+ const ChartLineDashStyle newDashStyle = ChartLineDashStyle.DashDot;
// Call
properties.Color = newColor;
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -20,7 +20,6 @@
// All rights reserved.
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.Base.Geometry;
using Core.Common.Controls.Commands;
using Core.Common.Gui.Commands;
@@ -61,7 +60,7 @@
{
Color = Color.DarkRed,
Width = 3,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
})
{
Points = new[]
@@ -96,7 +95,7 @@
{
Color = Color.DarkSlateBlue,
Width = 2,
- DashStyle = DashStyle.DashDot
+ DashStyle = ChartLineDashStyle.DashDot
})
{
Points = new[]
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs (.../RingtoetsChartDataFactory.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs (.../RingtoetsChartDataFactory.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -20,7 +20,6 @@
// All rights reserved.
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using Ringtoets.Common.Forms.Properties;
@@ -43,7 +42,7 @@
{
Color = Color.DarkOrange,
Width = 2,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
}
}
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs
===================================================================
diff -u -rad826b05d2319d815cfe36c0359b981311edc1c3 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs (.../RingtoetsChartDataFactoryTest.cs) (revision ad826b05d2319d815cfe36c0359b981311edc1c3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsChartDataFactoryTest.cs (.../RingtoetsChartDataFactoryTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -20,7 +20,6 @@
// All rights reserved.
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using NUnit.Framework;
@@ -39,10 +38,10 @@
// Assert
Assert.AreEqual("Voorlandprofiel", data.Name);
- AssertEqualStyle(data.Style, Color.DarkOrange, 2, DashStyle.Solid);
+ AssertEqualStyle(data.Style, Color.DarkOrange, 2, ChartLineDashStyle.Solid);
}
- private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, DashStyle style)
+ private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
{
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Factories/GrassCoverErosionInwardsChartDataFactory.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Factories/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Factories/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -20,7 +20,6 @@
// All rights reserved.
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using Ringtoets.Common.Data.DikeProfiles;
@@ -48,7 +47,7 @@
{
Color = Color.SaddleBrown,
Width = 2,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
}
@@ -63,7 +62,7 @@
{
Color = Color.MediumSeaGreen,
Width = 2,
- DashStyle = DashStyle.Dash
+ DashStyle = ChartLineDashStyle.Dash
});
}
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsChartDataFactoryTest.cs
===================================================================
diff -u -rad826b05d2319d815cfe36c0359b981311edc1c3 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision ad826b05d2319d815cfe36c0359b981311edc1c3)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Factories/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -20,7 +20,6 @@
// All rights reserved.
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using NUnit.Framework;
@@ -42,7 +41,7 @@
// Assert
Assert.AreEqual("Dijkprofiel", data.Name);
- AssertEqualStyle(data.Style, Color.SaddleBrown, 2, DashStyle.Solid);
+ AssertEqualStyle(data.Style, Color.SaddleBrown, 2, ChartLineDashStyle.Solid);
}
[Test]
@@ -53,7 +52,7 @@
// Assert
Assert.AreEqual("Dijkhoogte", data.Name);
- AssertEqualStyle(data.Style, Color.MediumSeaGreen, 2, DashStyle.Dash);
+ AssertEqualStyle(data.Style, Color.MediumSeaGreen, 2, ChartLineDashStyle.Dash);
}
[Test]
@@ -151,7 +150,7 @@
Assert.AreEqual(expectedName, chartData.Name);
}
- private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, DashStyle style)
+ private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
{
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using System.Linq;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
@@ -46,7 +45,7 @@
{
Color = Color.Sienna,
Width = 2,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs
===================================================================
diff -u -rb1e70d9d071a519e61adce4f5efd3a941a3ea579 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision b1e70d9d071a519e61adce4f5efd3a941a3ea579)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.Base.Geometry;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
@@ -44,7 +43,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual("Profielschematisatie", data.Name);
- AssertEqualStyle(data.Style, Color.Sienna, 2, DashStyle.Solid);
+ AssertEqualStyle(data.Style, Color.Sienna, 2, ChartLineDashStyle.Solid);
}
[Test]
@@ -186,7 +185,7 @@
Assert.AreEqual("soilLayerIndex", paramName);
}
- private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, DashStyle style)
+ private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
{
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using System.Linq;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
@@ -47,7 +46,7 @@
{
Color = Color.Sienna,
Width = 2,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
}
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs
===================================================================
diff -u -rb1e70d9d071a519e61adce4f5efd3a941a3ea579 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision b1e70d9d071a519e61adce4f5efd3a941a3ea579)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Common.Base.Geometry;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
@@ -44,7 +43,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual("Profielschematisatie", data.Name);
- AssertEqualStyle(data.Style, Color.Sienna, 2, DashStyle.Solid);
+ AssertEqualStyle(data.Style, Color.Sienna, 2, ChartLineDashStyle.Solid);
}
[Test]
@@ -282,7 +281,7 @@
Assert.AreEqual("soilLayerIndex", paramName);
}
- private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, DashStyle style)
+ private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
{
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs (.../WaveConditionsChartDataFactory.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs (.../WaveConditionsChartDataFactory.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using Ringtoets.Common.Forms.Factories;
@@ -74,7 +73,7 @@
{
Color = lineColor,
Width = revetmentThickness,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
}
@@ -90,7 +89,7 @@
{
Color = Color.FromArgb(120, lineColor),
Width = revetmentThickness,
- DashStyle = DashStyle.Dash
+ DashStyle = ChartLineDashStyle.Dash
});
}
@@ -133,7 +132,7 @@
{
Color = Color.LightCoral,
Width = levelThickness,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
});
}
@@ -148,7 +147,7 @@
{
Color = Color.DarkTurquoise,
Width = levelThickness,
- DashStyle = DashStyle.DashDotDot
+ DashStyle = ChartLineDashStyle.DashDotDot
});
}
@@ -179,7 +178,7 @@
{
Color = lineColor,
Width = levelThickness,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
};
}
@@ -189,7 +188,7 @@
{
Color = Color.MediumBlue,
Width = levelThickness,
- DashStyle = DashStyle.Solid
+ DashStyle = ChartLineDashStyle.Solid
};
}
}
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs
===================================================================
diff -u -rc43919519eebf31f0a99504cabc3be0a335c7893 -r7b94a3537bba9fa24775f9a632507bd9534067be
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs (.../WaveConditionsChartDataFactoryTest.cs) (revision c43919519eebf31f0a99504cabc3be0a335c7893)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs (.../WaveConditionsChartDataFactoryTest.cs) (revision 7b94a3537bba9fa24775f9a632507bd9534067be)
@@ -21,7 +21,6 @@
using System;
using System.Drawing;
-using System.Drawing.Drawing2D;
using Core.Components.Charting.Data;
using Core.Components.Charting.Styles;
using NUnit.Framework;
@@ -46,7 +45,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual("Ondergrens bekleding", data.Name);
- AssertEqualStyle(data.Style, lineColor, 3, DashStyle.Solid);
+ AssertEqualStyle(data.Style, lineColor, 3, ChartLineDashStyle.Solid);
}
[Test]
@@ -61,7 +60,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual("Bovengrens bekleding", data.Name);
- AssertEqualStyle(data.Style, lineColor, 3, DashStyle.Solid);
+ AssertEqualStyle(data.Style, lineColor, 3, ChartLineDashStyle.Solid);
}
[Test]
@@ -76,7 +75,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual("Bekleding", data.Name);
- AssertEqualStyle(data.Style, lineColor, 8, DashStyle.Solid);
+ AssertEqualStyle(data.Style, lineColor, 8, ChartLineDashStyle.Solid);
}
[Test]
@@ -91,7 +90,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual("Hulplijn bekleding", data.Name);
- AssertEqualStyle(data.Style, lineColor, 8, DashStyle.Dash);
+ AssertEqualStyle(data.Style, lineColor, 8, ChartLineDashStyle.Dash);
}
[Test]
@@ -103,7 +102,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual("Ondergrens waterstanden", data.Name);
- AssertEqualStyle(data.Style, Color.MediumBlue, 3, DashStyle.Solid);
+ AssertEqualStyle(data.Style, Color.MediumBlue, 3, ChartLineDashStyle.Solid);
}
[Test]
@@ -115,7 +114,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual("Bovengrens waterstanden", data.Name);
- AssertEqualStyle(data.Style, Color.MediumBlue, 3, DashStyle.Solid);
+ AssertEqualStyle(data.Style, Color.MediumBlue, 3, ChartLineDashStyle.Solid);
}
[Test]
@@ -141,7 +140,7 @@
// Assert
Assert.IsEmpty(data.Points);
Assert.AreEqual(designWaterLevelName, data.Name);
- AssertEqualStyle(data.Style, Color.LightCoral, 3, DashStyle.Solid);
+ AssertEqualStyle(data.Style, Color.LightCoral, 3, ChartLineDashStyle.Solid);
}
[Test]
@@ -153,7 +152,7 @@
// Assert
Assert.IsEmpty(data.Lines);
Assert.AreEqual("Waterstanden in berekening", data.Name);
- AssertEqualStyle(data.Style, Color.DarkTurquoise, 3, DashStyle.DashDotDot);
+ AssertEqualStyle(data.Style, Color.DarkTurquoise, 3, ChartLineDashStyle.DashDotDot);
}
[Test]
@@ -223,7 +222,7 @@
Assert.AreEqual(expectedName, chartData.Name);
}
- private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, DashStyle style)
+ private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style)
{
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);