Index: Core/Components/src/Core.Components.Charting/Data/ChartAreaData.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -rc860e9ad4a6092ccf675c6b268697b2e9ab58461 --- Core/Components/src/Core.Components.Charting/Data/ChartAreaData.cs (.../ChartAreaData.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/src/Core.Components.Charting/Data/ChartAreaData.cs (.../ChartAreaData.cs) (revision c860e9ad4a6092ccf675c6b268697b2e9ab58461) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Drawing; using Core.Components.Charting.Styles; namespace Core.Components.Charting.Data @@ -30,16 +31,35 @@ public class ChartAreaData : PointBasedChartData { /// + /// Creates a new instance of with default styling. + /// + /// The name of the . + /// Thrown when is + /// null or only whitespace. + public ChartAreaData(string name) + : this(name, new ChartAreaStyle(Color.Gray, Color.Black, 2)) {} + + /// /// Creates a new instance of . /// /// The name of the . + /// The style of the data. /// Thrown when is /// null or only whitespace. - public ChartAreaData(string name) : base(name) {} + /// Thrown when + /// is null. + public ChartAreaData(string name, ChartAreaStyle style) : base(name) + { + if (style == null) + { + throw new ArgumentNullException(nameof(style)); + } + Style = style; + } /// - /// Gets or sets the style of the chart area. + /// Gets the style of the chart area. /// - public ChartAreaStyle Style { get; set; } + public ChartAreaStyle Style { get; } } } \ No newline at end of file Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs =================================================================== diff -u -r2d704a409d762d8fb54d2f8be285246861019ea0 -rc860e9ad4a6092ccf675c6b268697b2e9ab58461 --- Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs (.../ChartAreaDataConverter.cs) (revision 2d704a409d762d8fb54d2f8be285246861019ea0) +++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartAreaDataConverter.cs (.../ChartAreaDataConverter.cs) (revision c860e9ad4a6092ccf675c6b268697b2e9ab58461) @@ -46,12 +46,9 @@ protected override void SetSeriesStyle(ChartAreaData data, AreaSeries series) { - if (data.Style != null) - { - series.Fill = ChartDataHelper.Convert(data.Style.FillColor); - series.Color = ChartDataHelper.Convert(data.Style.StrokeColor); - series.StrokeThickness = data.Style.Width; - } + series.Fill = ChartDataHelper.Convert(data.Style.FillColor); + series.Color = ChartDataHelper.Convert(data.Style.StrokeColor); + series.StrokeThickness = data.Style.Width; } } } \ No newline at end of file Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartAreaDataTest.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -rc860e9ad4a6092ccf675c6b268697b2e9ab58461 --- Core/Components/test/Core.Components.Charting.Test/Data/ChartAreaDataTest.cs (.../ChartAreaDataTest.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/test/Core.Components.Charting.Test/Data/ChartAreaDataTest.cs (.../ChartAreaDataTest.cs) (revision c860e9ad4a6092ccf675c6b268697b2e9ab58461) @@ -20,8 +20,10 @@ // All rights reserved. using System; +using System.Drawing; using Core.Common.TestUtil; using Core.Components.Charting.Data; +using Core.Components.Charting.Styles; using NUnit.Framework; namespace Core.Components.Charting.Test.Data @@ -39,6 +41,9 @@ Assert.AreEqual("test data", data.Name); Assert.IsEmpty(data.Points); Assert.IsInstanceOf(data); + Assert.AreEqual(Color.Gray, data.Style.FillColor); + Assert.AreEqual(Color.Black, data.Style.StrokeColor); + Assert.AreEqual(2, data.Style.Width); } [Test] @@ -54,5 +59,32 @@ const string expectedMessage = "A name must be set to the chart data."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } + + [Test] + public void Constructor_StyleNull_ThrowArgumentNullException() + { + // Call + TestDelegate test = () => new ChartAreaData("test data", null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("style", exception.ParamName); + } + + [Test] + public void Constructor_WithStyle_ExpectedValue() + { + // Setup + var style = new ChartAreaStyle(Color.Red, Color.Fuchsia, 3); + + // Call + var data = new ChartAreaData("test data", style); + + // Assert + Assert.AreEqual("test data", data.Name); + Assert.IsEmpty(data.Points); + Assert.IsInstanceOf(data); + Assert.AreSame(style, data.Style); + } } } \ No newline at end of file Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs =================================================================== diff -u -r2d704a409d762d8fb54d2f8be285246861019ea0 -rc860e9ad4a6092ccf675c6b268697b2e9ab58461 --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs (.../ChartAreaDataConverterTest.cs) (revision 2d704a409d762d8fb54d2f8be285246861019ea0) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartAreaDataConverterTest.cs (.../ChartAreaDataConverterTest.cs) (revision c860e9ad4a6092ccf675c6b268697b2e9ab58461) @@ -87,10 +87,7 @@ var converter = new ChartAreaDataConverter(); var areaSeries = new AreaSeries(); Color expectedColor = Color.FromKnownColor(color); - var data = new ChartAreaData("test") - { - Style = new ChartAreaStyle(expectedColor, Color.Red, 3) - }; + var data = new ChartAreaData("test", new ChartAreaStyle(expectedColor, Color.Red, 3)); // Call converter.ConvertSeriesProperties(data, areaSeries); @@ -109,10 +106,7 @@ var converter = new ChartAreaDataConverter(); var areaSeries = new AreaSeries(); Color expectedColor = Color.FromKnownColor(color); - var data = new ChartAreaData("test") - { - Style = new ChartAreaStyle(Color.Red, expectedColor, 3) - }; + var data = new ChartAreaData("test", new ChartAreaStyle(Color.Red, expectedColor, 3)); // Call converter.ConvertSeriesProperties(data, areaSeries); @@ -130,10 +124,7 @@ // Setup var converter = new ChartAreaDataConverter(); var areaSeries = new AreaSeries(); - var data = new ChartAreaData("test") - { - Style = new ChartAreaStyle(Color.Red, Color.Red, width) - }; + var data = new ChartAreaData("test", new ChartAreaStyle(Color.Red, Color.Red, width)); // Call converter.ConvertSeriesProperties(data, areaSeries); Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartAreaDataSeriesTest.cs =================================================================== diff -u -r271bd5ffd4d61da4324eb50957f062b14c4c6958 -rc860e9ad4a6092ccf675c6b268697b2e9ab58461 --- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartAreaDataSeriesTest.cs (.../ChartAreaDataSeriesTest.cs) (revision 271bd5ffd4d61da4324eb50957f062b14c4c6958) +++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartAreaDataSeriesTest.cs (.../ChartAreaDataSeriesTest.cs) (revision c860e9ad4a6092ccf675c6b268697b2e9ab58461) @@ -49,7 +49,7 @@ public void Constructor_ChartAreaDataWithTestProperties_ChartAreaDataSeriesCreatedAccordingly() { // Setup - var chartAreaData = new ChartAreaData("Test name"); + var chartAreaData = new ChartAreaData("Test name", new ChartAreaStyle(Color.Red, Color.Blue, 3)); SetChartAreaDataTestProperties(chartAreaData); @@ -66,7 +66,7 @@ public void Update_ChartAreaDataWithTestProperties_ChartAreaDataSeriesUpdatedAccordingly() { // Setup - var chartAreaData = new ChartAreaData("Test name"); + var chartAreaData = new ChartAreaData("Test name", new ChartAreaStyle(Color.Red, Color.Blue, 3)); var chartAreaDataSeries = new ChartAreaDataSeries(chartAreaData); SetChartAreaDataTestProperties(chartAreaData); @@ -133,7 +133,6 @@ { chartAreaData.Name = "Another name"; chartAreaData.IsVisible = false; - chartAreaData.Style = new ChartAreaStyle(Color.Red, Color.Blue, 3); chartAreaData.Points = new[] { new Point2D(1.1, 2.2) @@ -157,9 +156,9 @@ Assert.AreEqual("Test name", chartAreaDataSeries.Title); Assert.IsTrue(chartAreaDataSeries.IsVisible); - Assert.AreEqual(2, chartAreaDataSeries.StrokeThickness); - Assert.AreEqual(OxyColor.FromArgb(0, 0, 0, 1), chartAreaDataSeries.Color); - Assert.AreEqual(OxyColor.FromArgb(0, 0, 0, 1), chartAreaDataSeries.Fill); + 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(0, chartAreaDataSeries.Points.Count); } Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs =================================================================== diff -u -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda -rc860e9ad4a6092ccf675c6b268697b2e9ab58461 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision c860e9ad4a6092ccf675c6b268697b2e9ab58461) @@ -116,9 +116,9 @@ } }; - var area1 = new ChartAreaData(Resources.OpenChartViewCommand_Execute_Area_one) + var area1 = new ChartAreaData(Resources.OpenChartViewCommand_Execute_Area_one, + new ChartAreaStyle(Color.DarkSeaGreen, Color.DarkGreen, 5)) { - Style = new ChartAreaStyle(Color.DarkSeaGreen, Color.DarkGreen, 5), Points = new[] { new Point2D(0.0, 0.500), @@ -157,9 +157,9 @@ } }; - var area2 = new ChartAreaData(Resources.OpenChartViewCommand_Execute_Area_two) + var area2 = new ChartAreaData(Resources.OpenChartViewCommand_Execute_Area_two, + new ChartAreaStyle(Color.FromArgb(120, Color.Wheat), Color.DarkOrange, 2)) { - Style = new ChartAreaStyle(Color.FromArgb(120, Color.Wheat), Color.DarkOrange, 2), Points = new[] { new Point2D(0.1, 0.723 - 0.5),