Index: Core/Components/src/Core.Components.Charting/Styles/ChartLineStyle.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/src/Core.Components.Charting/Styles/ChartLineStyle.cs (.../ChartLineStyle.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/src/Core.Components.Charting/Styles/ChartLineStyle.cs (.../ChartLineStyle.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -43,11 +43,5 @@
/// Gets or sets the line dash style.
///
public DashStyle DashStyle { get; set; }
-
- ///
- /// Gets the line style.
- /// Overrides .
- ///
- public double[] Dashes { get; set; }
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs
===================================================================
diff -u -rb1e70d9d071a519e61adce4f5efd3a941a3ea579 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs (.../ChartAreaDataConverter.cs) (revision b1e70d9d071a519e61adce4f5efd3a941a3ea579)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs (.../ChartAreaDataConverter.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -21,6 +21,7 @@
using System.Linq;
using Core.Components.Charting.Data;
+using Core.Components.Charting.Styles;
using OxyPlot;
using OxyPlot.Series;
@@ -46,9 +47,10 @@
protected override void SetSeriesStyle(ChartAreaData data, AreaSeries series)
{
- series.Fill = ChartDataHelper.Convert(data.Style.FillColor);
- series.Color = ChartDataHelper.Convert(data.Style.StrokeColor);
- series.StrokeThickness = data.Style.StrokeThickness;
+ ChartAreaStyle style = data.Style;
+ series.Fill = ChartDataHelper.Convert(style.FillColor);
+ series.Color = ChartDataHelper.Convert(style.StrokeColor);
+ series.StrokeThickness = style.StrokeThickness;
}
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartLineDataConverter.cs
===================================================================
diff -u -r5c6072174d8047b062655d56d523d74c5e740039 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartLineDataConverter.cs (.../ChartLineDataConverter.cs) (revision 5c6072174d8047b062655d56d523d74c5e740039)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartLineDataConverter.cs (.../ChartLineDataConverter.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -21,6 +21,7 @@
using System.Linq;
using Core.Components.Charting.Data;
+using Core.Components.Charting.Styles;
using OxyPlot;
using OxyPlot.Series;
@@ -38,9 +39,10 @@
protected override void SetSeriesStyle(ChartLineData data, LineSeries series)
{
- series.Color = ChartDataHelper.Convert(data.Style.Color);
- series.StrokeThickness = data.Style.Width;
- series.LineStyle = ChartDataHelper.Convert(data.Style.DashStyle);
+ ChartLineStyle style = data.Style;
+ series.Color = ChartDataHelper.Convert(style.Color);
+ series.StrokeThickness = style.Width;
+ series.LineStyle = ChartDataHelper.Convert(style.DashStyle);
}
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleAreaDataConverter.cs
===================================================================
diff -u -r8aff831965461dd4c846ba2e6b290992bdf0e1eb -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleAreaDataConverter.cs (.../ChartMultipleAreaDataConverter.cs) (revision 8aff831965461dd4c846ba2e6b290992bdf0e1eb)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleAreaDataConverter.cs (.../ChartMultipleAreaDataConverter.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -22,6 +22,7 @@
using System.Linq;
using Core.Common.Base.Geometry;
using Core.Components.Charting.Data;
+using Core.Components.Charting.Styles;
using Core.Components.OxyPlot.CustomSeries;
using OxyPlot;
@@ -44,9 +45,10 @@
protected override void SetSeriesStyle(ChartMultipleAreaData data, MultipleAreaSeries series)
{
- series.Fill = ChartDataHelper.Convert(data.Style.FillColor);
- series.Color = ChartDataHelper.Convert(data.Style.StrokeColor);
- series.StrokeThickness = data.Style.StrokeThickness;
+ ChartAreaStyle style = data.Style;
+ series.Fill = ChartDataHelper.Convert(style.FillColor);
+ series.Color = ChartDataHelper.Convert(style.StrokeColor);
+ series.StrokeThickness = style.StrokeThickness;
}
}
}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleLineDataConverter.cs
===================================================================
diff -u -rf1bd81c5280dd8a55be49b2ad20624ae6cb5b491 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleLineDataConverter.cs (.../ChartMultipleLineDataConverter.cs) (revision f1bd81c5280dd8a55be49b2ad20624ae6cb5b491)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartMultipleLineDataConverter.cs (.../ChartMultipleLineDataConverter.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -49,7 +49,6 @@
series.Color = ChartDataHelper.Convert(lineStyle.Color);
series.StrokeThickness = lineStyle.Width;
- series.Dashes = lineStyle.Dashes;
series.LineStyle = ChartDataHelper.Convert(lineStyle.DashStyle);
}
}
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartPointDataConverter.cs
===================================================================
diff -u -r8616c7f9f5791dff264dc5fe8ce598dbfe6ecb03 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartPointDataConverter.cs (.../ChartPointDataConverter.cs) (revision 8616c7f9f5791dff264dc5fe8ce598dbfe6ecb03)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartPointDataConverter.cs (.../ChartPointDataConverter.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -21,6 +21,7 @@
using System.Linq;
using Core.Components.Charting.Data;
+using Core.Components.Charting.Styles;
using OxyPlot;
using OxyPlot.Series;
@@ -39,11 +40,12 @@
protected override void SetSeriesStyle(ChartPointData data, LineSeries series)
{
series.LineStyle = LineStyle.None;
- series.MarkerFill = ChartDataHelper.Convert(data.Style.Color);
- series.MarkerSize = data.Style.Size;
- series.MarkerType = ChartDataHelper.Convert(data.Style.Symbol);
- series.MarkerStroke = ChartDataHelper.Convert(data.Style.StrokeColor);
- series.MarkerStrokeThickness = data.Style.StrokeThickness;
+ ChartPointStyle style = data.Style;
+ series.MarkerFill = ChartDataHelper.Convert(style.Color);
+ series.MarkerSize = style.Size;
+ series.MarkerType = ChartDataHelper.Convert(style.Symbol);
+ series.MarkerStroke = ChartDataHelper.Convert(style.StrokeColor);
+ series.MarkerStrokeThickness = style.StrokeThickness;
}
}
}
\ No newline at end of file
Index: Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineStyleTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineStyleTest.cs (.../ChartLineStyleTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.Charting.Test/Styles/ChartLineStyleTest.cs (.../ChartLineStyleTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -49,30 +49,6 @@
Assert.AreEqual(color, lineStyle.Color);
Assert.AreEqual(width, lineStyle.Width);
Assert.AreEqual(style, lineStyle.DashStyle);
- Assert.IsNull(lineStyle.Dashes);
}
-
- [Test]
- public void Constructor_WithDashes_SetsProperties()
- {
- // Setup
- Color color = Color.AliceBlue;
- const int width = 3;
- double[] style = { 3.6, 5.2 };
-
- // Call
- var lineStyle = new ChartLineStyle
- {
- Color = color,
- Width = width,
- Dashes = style
- };
-
- // Assert
- Assert.AreEqual(color, lineStyle.Color);
- Assert.AreEqual(width, lineStyle.Width);
- Assert.AreEqual(style, lineStyle.Dashes);
- Assert.AreEqual(DashStyle.Solid, lineStyle.DashStyle);
- }
}
}
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs (.../ChartMultipleLineDataConverterTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartMultipleLineDataConverterTest.cs (.../ChartMultipleLineDataConverterTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -158,32 +158,5 @@
Assert.AreEqual(expectedLineStyle, multipleLineSeries.LineStyle);
Assert.IsNull(multipleLineSeries.Dashes);
}
-
- [Test]
- public void ConvertSeriesProperties_ChartLineStyleSetWithCustomDashStyle_AppliesStyleToSeries()
- {
- // Setup
- var converter = new ChartMultipleLineDataConverter();
- var multipleLineSeries = new MultipleLineSeries();
- var random = new Random(21);
- var dashes = new[]
- {
- random.NextDouble(),
- random.NextDouble()
- };
- var data = new ChartMultipleLineData("test", new ChartLineStyle
- {
- Color = Color.Red,
- Width = 3,
- Dashes = dashes
- });
-
- // Call
- converter.ConvertSeriesProperties(data, multipleLineSeries);
-
- // Assert
- Assert.AreEqual(LineStyle.Solid, multipleLineSeries.LineStyle);
- Assert.AreEqual(dashes, multipleLineSeries.Dashes);
- }
}
}
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartAreaDataSeriesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartAreaDataSeriesTest.cs (.../ChartAreaDataSeriesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartAreaDataSeriesTest.cs (.../ChartAreaDataSeriesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -34,6 +34,9 @@
[TestFixture]
public class ChartAreaDataSeriesTest
{
+ private static readonly Color fillColor = Color.Red;
+ private static readonly Color strokeColor = Color.Blue;
+
[Test]
public void Constructor_WithoutChartAreaData_ThrowsArgumentNullException()
{
@@ -51,8 +54,8 @@
// Setup
var chartAreaData = new ChartAreaData("Test name", new ChartAreaStyle
{
- FillColor = Color.Red,
- StrokeColor = Color.Blue,
+ FillColor = fillColor,
+ StrokeColor = strokeColor,
StrokeThickness = 3
});
@@ -73,8 +76,8 @@
// Setup
var chartAreaData = new ChartAreaData("Test name", new ChartAreaStyle
{
- FillColor = Color.Red,
- StrokeColor = Color.Blue,
+ FillColor = fillColor,
+ StrokeColor = strokeColor,
StrokeThickness = 3
});
var chartAreaDataSeries = new ChartAreaDataSeries(chartAreaData);
@@ -155,8 +158,8 @@
Assert.IsFalse(chartAreaDataSeries.IsVisible);
Assert.AreEqual(3, chartAreaDataSeries.StrokeThickness);
- Assert.AreEqual(OxyColor.FromArgb(Color.Red.A, Color.Red.R, Color.Red.G, Color.Red.B), chartAreaDataSeries.Fill);
- Assert.AreEqual(OxyColor.FromArgb(Color.Blue.A, Color.Blue.R, Color.Blue.G, Color.Blue.B), chartAreaDataSeries.Color);
+ Assert.AreEqual(OxyColor.FromArgb(fillColor.A, fillColor.R, fillColor.G, fillColor.B), chartAreaDataSeries.Fill);
+ Assert.AreEqual(OxyColor.FromArgb(strokeColor.A, strokeColor.R, strokeColor.G, strokeColor.B), chartAreaDataSeries.Color);
Assert.AreEqual(1, chartAreaDataSeries.Points.Count);
}
@@ -167,8 +170,8 @@
Assert.IsTrue(chartAreaDataSeries.IsVisible);
Assert.AreEqual(3, chartAreaDataSeries.StrokeThickness);
- Assert.AreEqual(OxyColor.FromArgb(Color.Red.A, Color.Red.R, Color.Red.G, Color.Red.B), chartAreaDataSeries.Fill);
- Assert.AreEqual(OxyColor.FromArgb(Color.Blue.A, Color.Blue.R, Color.Blue.G, Color.Blue.B), chartAreaDataSeries.Color);
+ Assert.AreEqual(OxyColor.FromArgb(fillColor.A, fillColor.R, fillColor.G, fillColor.B), chartAreaDataSeries.Fill);
+ Assert.AreEqual(OxyColor.FromArgb(strokeColor.A, strokeColor.R, strokeColor.G, strokeColor.B), chartAreaDataSeries.Color);
Assert.AreEqual(0, chartAreaDataSeries.Points.Count);
}
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs (.../ChartLineDataSeriesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs (.../ChartLineDataSeriesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -37,6 +37,8 @@
[TestFixture]
public class ChartLineDataSeriesTest
{
+ private static readonly Color color = Color.Blue;
+
[Test]
public void Constructor_WithoutChartLineData_ThrowsArgumentNullException()
{
@@ -54,7 +56,7 @@
// Setup
var chartLineData = new ChartLineData("Test name", new ChartLineStyle
{
- Color = Color.Blue,
+ Color = color,
Width = 3,
DashStyle = DashStyle.DashDot
});
@@ -76,7 +78,7 @@
// Setup
var chartLineData = new ChartLineData("Test name", new ChartLineStyle
{
- Color = Color.Blue,
+ Color = color,
Width = 3,
DashStyle = DashStyle.DashDot
});
@@ -158,7 +160,7 @@
Assert.IsFalse(chartLineDataSeries.IsVisible);
Assert.AreEqual(3, chartLineDataSeries.StrokeThickness);
- Assert.AreEqual(OxyColor.FromArgb(Color.Blue.A, Color.Blue.R, Color.Blue.G, Color.Blue.B), chartLineDataSeries.Color);
+ Assert.AreEqual(OxyColor.FromArgb(color.A, color.R, color.G, color.B), chartLineDataSeries.Color);
Assert.AreEqual(LineStyle.DashDot, chartLineDataSeries.LineStyle);
Assert.AreEqual(1, chartLineDataSeries.ItemsSource.Cast().Count());
@@ -170,7 +172,7 @@
Assert.IsTrue(chartLineDataSeries.IsVisible);
Assert.AreEqual(3, chartLineDataSeries.StrokeThickness);
- Assert.AreEqual(OxyColor.FromArgb(Color.Blue.A, Color.Blue.R, Color.Blue.G, Color.Blue.B), chartLineDataSeries.Color);
+ Assert.AreEqual(OxyColor.FromArgb(color.A, color.R, color.G, color.B), chartLineDataSeries.Color);
Assert.AreEqual(LineStyle.DashDot, chartLineDataSeries.LineStyle);
Assert.AreEqual(0, chartLineDataSeries.ItemsSource.Cast().Count());
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleAreaDataSeriesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleAreaDataSeriesTest.cs (.../ChartMultipleAreaDataSeriesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleAreaDataSeriesTest.cs (.../ChartMultipleAreaDataSeriesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -35,6 +35,9 @@
[TestFixture]
public class ChartMultipleAreaDataSeriesTest
{
+ private static readonly Color fillColor = Color.Red;
+ private static readonly Color strokeColor = Color.Blue;
+
[Test]
public void Constructor_WithoutChartMultipleAreaData_ThrowsArgumentNullException()
{
@@ -52,8 +55,8 @@
// Setup
var chartMultipleAreaData = new ChartMultipleAreaData("Test name", new ChartAreaStyle
{
- FillColor = Color.Red,
- StrokeColor = Color.Blue,
+ FillColor = fillColor,
+ StrokeColor = strokeColor,
StrokeThickness = 3
});
@@ -74,8 +77,8 @@
// Setup
var chartMultipleAreaData = new ChartMultipleAreaData("Test name", new ChartAreaStyle
{
- FillColor = Color.Red,
- StrokeColor = Color.Blue,
+ FillColor = fillColor,
+ StrokeColor = strokeColor,
StrokeThickness = 3
});
var chartMultipleAreaDataSeries = new ChartMultipleAreaDataSeries(chartMultipleAreaData);
@@ -168,8 +171,8 @@
Assert.IsFalse(chartMultipleAreaDataSeries.IsVisible);
Assert.AreEqual(3, chartMultipleAreaDataSeries.StrokeThickness);
- Assert.AreEqual(OxyColor.FromArgb(Color.Red.A, Color.Red.R, Color.Red.G, Color.Red.B), chartMultipleAreaDataSeries.Fill);
- Assert.AreEqual(OxyColor.FromArgb(Color.Blue.A, Color.Blue.R, Color.Blue.G, Color.Blue.B), chartMultipleAreaDataSeries.Color);
+ Assert.AreEqual(OxyColor.FromArgb(fillColor.A, fillColor.R, fillColor.G, fillColor.B), chartMultipleAreaDataSeries.Fill);
+ Assert.AreEqual(OxyColor.FromArgb(strokeColor.A, strokeColor.R, strokeColor.G, strokeColor.B), chartMultipleAreaDataSeries.Color);
Assert.AreEqual(1, chartMultipleAreaDataSeries.Areas.Count);
}
@@ -180,8 +183,8 @@
Assert.IsTrue(chartMultipleAreaDataSeries.IsVisible);
Assert.AreEqual(3, chartMultipleAreaDataSeries.StrokeThickness);
- Assert.AreEqual(OxyColor.FromArgb(Color.Red.A, Color.Red.R, Color.Red.G, Color.Red.B), chartMultipleAreaDataSeries.Fill);
- Assert.AreEqual(OxyColor.FromArgb(Color.Blue.A, Color.Blue.R, Color.Blue.G, Color.Blue.B), chartMultipleAreaDataSeries.Color);
+ Assert.AreEqual(OxyColor.FromArgb(fillColor.A, fillColor.R, fillColor.G, fillColor.B), chartMultipleAreaDataSeries.Fill);
+ Assert.AreEqual(OxyColor.FromArgb(strokeColor.A, strokeColor.R, strokeColor.G, strokeColor.B), chartMultipleAreaDataSeries.Color);
Assert.AreEqual(0, chartMultipleAreaDataSeries.Areas.Count);
}
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs (.../ChartMultipleLineDataSeriesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartMultipleLineDataSeriesTest.cs (.../ChartMultipleLineDataSeriesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -36,6 +36,8 @@
[TestFixture]
public class ChartMultipleLineDataSeriesTest
{
+ private static readonly Color color = Color.Red;
+
[Test]
public void Constructor_ChartMultipleLineDataNull_ThrowsArgumentNullException()
{
@@ -53,7 +55,7 @@
// Setup
var chartMultipleLineData = new ChartMultipleLineData("Test name", new ChartLineStyle
{
- Color = Color.Red,
+ Color = color,
Width = 3,
DashStyle = DashStyle.Dash
});
@@ -75,7 +77,7 @@
// Setup
var chartMultipleLineData = new ChartMultipleLineData("Test name", new ChartLineStyle
{
- Color = Color.Red,
+ Color = color,
Width = 3,
DashStyle = DashStyle.Dash
});
@@ -169,7 +171,7 @@
Assert.IsFalse(chartMultipleLineDataSeries.IsVisible);
Assert.AreEqual(3, chartMultipleLineDataSeries.StrokeThickness);
- Assert.AreEqual(OxyColor.FromArgb(Color.Red.A, Color.Red.R, Color.Red.G, Color.Red.B), chartMultipleLineDataSeries.Color);
+ Assert.AreEqual(OxyColor.FromArgb(color.A, color.R, color.G, color.B), chartMultipleLineDataSeries.Color);
Assert.AreEqual(LineStyle.Dash, chartMultipleLineDataSeries.LineStyle);
Assert.AreEqual(1, chartMultipleLineDataSeries.Lines.Count);
@@ -181,7 +183,7 @@
Assert.IsTrue(chartMultipleLineDataSeries.IsVisible);
Assert.AreEqual(3, chartMultipleLineDataSeries.StrokeThickness);
- Assert.AreEqual(OxyColor.FromArgb(Color.Red.A, Color.Red.R, Color.Red.G, Color.Red.B), chartMultipleLineDataSeries.Color);
+ Assert.AreEqual(OxyColor.FromArgb(color.A, color.R, color.G, color.B), chartMultipleLineDataSeries.Color);
Assert.AreEqual(LineStyle.Dash, chartMultipleLineDataSeries.LineStyle);
Assert.AreEqual(0, chartMultipleLineDataSeries.Lines.Count);
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartPointDataSeriesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartPointDataSeriesTest.cs (.../ChartPointDataSeriesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartPointDataSeriesTest.cs (.../ChartPointDataSeriesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -36,6 +36,9 @@
[TestFixture]
public class ChartPointDataSeriesTest
{
+ private static readonly Color color = Color.Red;
+ private static readonly Color strokeColor = Color.Blue;
+
[Test]
public void Constructor_WithoutChartPointData_ThrowsArgumentNullException()
{
@@ -53,8 +56,8 @@
// Setup
var chartPointData = new ChartPointData("Test name", new ChartPointStyle
{
- Color = Color.Red,
- StrokeColor = Color.Blue,
+ Color = color,
+ StrokeColor = strokeColor,
Size = 4,
StrokeThickness = 2,
Symbol = ChartPointSymbol.Circle
@@ -77,8 +80,8 @@
// Setup
var chartPointData = new ChartPointData("Test name", new ChartPointStyle
{
- Color = Color.Red,
- StrokeColor = Color.Blue,
+ Color = color,
+ StrokeColor = strokeColor,
Size = 4,
StrokeThickness = 2,
Symbol = ChartPointSymbol.Circle
@@ -161,8 +164,8 @@
Assert.IsFalse(chartPointDataSeries.IsVisible);
Assert.AreEqual(4, chartPointDataSeries.MarkerSize);
- Assert.AreEqual(OxyColor.FromArgb(Color.Red.A, Color.Red.R, Color.Red.G, Color.Red.B), chartPointDataSeries.MarkerFill);
- Assert.AreEqual(OxyColor.FromArgb(Color.Blue.A, Color.Blue.R, Color.Blue.G, Color.Blue.B), chartPointDataSeries.MarkerStroke);
+ Assert.AreEqual(OxyColor.FromArgb(color.A, color.R, color.G, color.B), chartPointDataSeries.MarkerFill);
+ Assert.AreEqual(OxyColor.FromArgb(strokeColor.A, strokeColor.R, strokeColor.G, strokeColor.B), chartPointDataSeries.MarkerStroke);
Assert.AreEqual(2, chartPointDataSeries.MarkerStrokeThickness);
Assert.AreEqual(MarkerType.Circle, chartPointDataSeries.MarkerType);
@@ -175,8 +178,8 @@
Assert.IsTrue(chartPointDataSeries.IsVisible);
Assert.AreEqual(4, chartPointDataSeries.MarkerSize);
- Assert.AreEqual(OxyColor.FromArgb(Color.Red.A, Color.Red.R, Color.Red.G, Color.Red.B), chartPointDataSeries.MarkerFill);
- Assert.AreEqual(OxyColor.FromArgb(Color.Blue.A, Color.Blue.R, Color.Blue.G, Color.Blue.B), chartPointDataSeries.MarkerStroke);
+ Assert.AreEqual(OxyColor.FromArgb(color.A, color.R, color.G, color.B), chartPointDataSeries.MarkerFill);
+ Assert.AreEqual(OxyColor.FromArgb(strokeColor.A, strokeColor.R, strokeColor.G, strokeColor.B), chartPointDataSeries.MarkerStroke);
Assert.AreEqual(2, chartPointDataSeries.MarkerStrokeThickness);
Assert.AreEqual(MarkerType.Circle, chartPointDataSeries.MarkerType);
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartAreaDataProperties.cs
===================================================================
diff -u -rb1e70d9d071a519e61adce4f5efd3a941a3ea579 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartAreaDataProperties.cs (.../ChartAreaDataProperties.cs) (revision b1e70d9d071a519e61adce4f5efd3a941a3ea579)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartAreaDataProperties.cs (.../ChartAreaDataProperties.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -36,7 +36,7 @@
///
public class ChartAreaDataProperties : ChartDataProperties
{
- [PropertyOrder(5)]
+ [PropertyOrder(3)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_Color_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_FillColor_Description))]
@@ -55,7 +55,7 @@
}
}
- [PropertyOrder(6)]
+ [PropertyOrder(4)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_StrokeColor_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_StrokeColor_Description))]
@@ -74,7 +74,7 @@
}
}
- [PropertyOrder(7)]
+ [PropertyOrder(5)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_StrokeThickness_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_StrokeThickness_Description))]
Index: Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleAreaDataProperties.cs
===================================================================
diff -u -rb680d69bcc34468ba438ec92167970f94f0502bb -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleAreaDataProperties.cs (.../ChartMultipleAreaDataProperties.cs) (revision b680d69bcc34468ba438ec92167970f94f0502bb)
+++ Core/Plugins/src/Core.Plugins.Chart/PropertyClasses/ChartMultipleAreaDataProperties.cs (.../ChartMultipleAreaDataProperties.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -36,7 +36,7 @@
///
public class ChartMultipleAreaDataProperties : ChartDataProperties
{
- [PropertyOrder(5)]
+ [PropertyOrder(3)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_Color_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_FillColor_Description))]
@@ -55,7 +55,7 @@
}
}
- [PropertyOrder(6)]
+ [PropertyOrder(4)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_StrokeColor_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_StrokeColor_Description))]
@@ -74,7 +74,7 @@
}
}
- [PropertyOrder(7)]
+ [PropertyOrder(5)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.ChartData_StrokeThickness_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.ChartAreaData_StrokeThickness_Description))]
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs (.../ChartAreaDataPropertiesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartAreaDataPropertiesTest.cs (.../ChartAreaDataPropertiesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -67,23 +67,25 @@
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Assert.AreEqual(6, dynamicProperties.Count);
- PropertyDescriptor colorProperty = dynamicProperties[fillColorPropertyIndex];
- Assert.IsInstanceOf(colorProperty.Converter);
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty,
- "Stijl",
+ const string styleCategory = "Stijl";
+
+ PropertyDescriptor fillColorProperty = dynamicProperties[fillColorPropertyIndex];
+ Assert.IsInstanceOf(fillColorProperty.Converter);
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(fillColorProperty,
+ styleCategory,
"Kleur",
"De kleur van de vlakken waarmee deze gegevensreeks wordt weergegeven.");
- PropertyDescriptor widthProperty = dynamicProperties[strokeColorPropertyIndex];
- Assert.IsInstanceOf(colorProperty.Converter);
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
- "Stijl",
+ PropertyDescriptor strokeColorProperty = dynamicProperties[strokeColorPropertyIndex];
+ Assert.IsInstanceOf(fillColorProperty.Converter);
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeColorProperty,
+ styleCategory,
"Lijnkleur",
"De kleur van de lijn van de vlakken waarmee deze gegevensreeks wordt weergegeven.");
- PropertyDescriptor styleProperty = dynamicProperties[strokeThicknessPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
- "Stijl",
+ PropertyDescriptor strokeThicknessProperty = dynamicProperties[strokeThicknessPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeThicknessProperty,
+ styleCategory,
"Lijndikte",
"De dikte van de lijn van de vlakken waarmee deze gegevensreeks wordt weergegeven.");
}
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs (.../ChartLineDataPropertiesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartLineDataPropertiesTest.cs (.../ChartLineDataPropertiesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -68,23 +68,25 @@
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Assert.AreEqual(6, dynamicProperties.Count);
+ const string styleCategory = "Stijl";
+
PropertyDescriptor colorProperty = dynamicProperties[colorPropertyIndex];
- Assert.IsInstanceOf(colorProperty.Converter);
+ Assert.IsInstanceOf(colorProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty,
- "Stijl",
+ styleCategory,
"Kleur",
"De kleur van de lijnen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor widthProperty = dynamicProperties[widthPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
- "Stijl",
+ styleCategory,
"Lijndikte",
"De dikte van de lijnen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor styleProperty = dynamicProperties[stylePropertyIndex];
Assert.IsInstanceOf(styleProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
- "Stijl",
+ styleCategory,
"Lijnstijl",
"De stijl van de lijnen waarmee deze gegevensreeks wordt weergegeven.");
}
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs (.../ChartMultipleAreaDataPropertiesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleAreaDataPropertiesTest.cs (.../ChartMultipleAreaDataPropertiesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -67,23 +67,25 @@
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Assert.AreEqual(6, dynamicProperties.Count);
- PropertyDescriptor colorProperty = dynamicProperties[fillColorPropertyIndex];
- Assert.IsInstanceOf(colorProperty.Converter);
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty,
- "Stijl",
+ const string styleCategory = "Stijl";
+
+ PropertyDescriptor fillColorProperty = dynamicProperties[fillColorPropertyIndex];
+ Assert.IsInstanceOf(fillColorProperty.Converter);
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(fillColorProperty,
+ styleCategory,
"Kleur",
"De kleur van de vlakken waarmee deze gegevensreeks wordt weergegeven.");
- PropertyDescriptor widthProperty = dynamicProperties[strokeColorPropertyIndex];
- Assert.IsInstanceOf(colorProperty.Converter);
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
- "Stijl",
+ PropertyDescriptor strokeColorProperty = dynamicProperties[strokeColorPropertyIndex];
+ Assert.IsInstanceOf(fillColorProperty.Converter);
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeColorProperty,
+ styleCategory,
"Lijnkleur",
"De kleur van de lijn van de vlakken waarmee deze gegevensreeks wordt weergegeven.");
- PropertyDescriptor styleProperty = dynamicProperties[strokeThicknessPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
- "Stijl",
+ PropertyDescriptor strokeThicknessProperty = dynamicProperties[strokeThicknessPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeThicknessProperty,
+ styleCategory,
"Lijndikte",
"De dikte van de lijn van de vlakken waarmee deze gegevensreeks wordt weergegeven.");
}
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs (.../ChartMultipleLineDataPropertiesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartMultipleLineDataPropertiesTest.cs (.../ChartMultipleLineDataPropertiesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -68,23 +68,25 @@
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Assert.AreEqual(6, dynamicProperties.Count);
+ const string styleCategory = "Stijl";
+
PropertyDescriptor colorProperty = dynamicProperties[colorPropertyIndex];
- Assert.IsInstanceOf(colorProperty.Converter);
+ Assert.IsInstanceOf(colorProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty,
- "Stijl",
+ styleCategory,
"Kleur",
"De kleur van de lijnen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor widthProperty = dynamicProperties[widthPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthProperty,
- "Stijl",
+ styleCategory,
"Lijndikte",
"De dikte van de lijnen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor styleProperty = dynamicProperties[stylePropertyIndex];
Assert.IsInstanceOf(styleProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(styleProperty,
- "Stijl",
+ styleCategory,
"Lijnstijl",
"De stijl van de lijnen waarmee deze gegevensreeks wordt weergegeven.");
}
Index: Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs
===================================================================
diff -u -re041812064bf603c28f7ec5305060933c98be5f0 -rfb7c9834d4ef76498237a06786d13ebda941cf19
--- Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs (.../ChartPointDataPropertiesTest.cs) (revision e041812064bf603c28f7ec5305060933c98be5f0)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/PropertyClasses/ChartPointDataPropertiesTest.cs (.../ChartPointDataPropertiesTest.cs) (revision fb7c9834d4ef76498237a06786d13ebda941cf19)
@@ -21,7 +21,6 @@
using System.ComponentModel;
using System.Drawing;
-using System.Drawing.Design;
using Core.Common.Base;
using Core.Common.Gui.Converters;
using Core.Common.TestUtil;
@@ -71,36 +70,38 @@
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Assert.AreEqual(8, dynamicProperties.Count);
+ const string styleCategory = "Stijl";
+
PropertyDescriptor colorProperty = dynamicProperties[colorPropertyIndex];
Assert.IsInstanceOf(colorProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(colorProperty,
- "Stijl",
+ styleCategory,
"Kleur",
"De kleur van de symbolen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor strokeColorProperty = dynamicProperties[strokeColorPropertyIndex];
Assert.IsInstanceOf(colorProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeColorProperty,
- "Stijl",
+ styleCategory,
"Lijnkleur",
"De kleur van de lijn van de symbolen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor strokeThicknessProperty = dynamicProperties[strokeThicknessPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(strokeThicknessProperty,
- "Stijl",
+ styleCategory,
"Lijndikte",
"De dikte van de lijn van de symbolen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor sizeProperty = dynamicProperties[sizePropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(sizeProperty,
- "Stijl",
+ styleCategory,
"Grootte",
"De grootte van de symbolen waarmee deze gegevensreeks wordt weergegeven.");
PropertyDescriptor symbolProperty = dynamicProperties[symbolPropertyIndex];
Assert.IsInstanceOf(symbolProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(symbolProperty,
- "Stijl",
+ styleCategory,
"Symbool",
"Het symbool waarmee deze gegevensreeks wordt weergegeven.");
}