Index: Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs (.../ChartLineData.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/src/Core.Components.Charting/Data/ChartLineData.cs (.../ChartLineData.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -20,6 +20,8 @@ // All rights reserved. using System; +using System.Drawing; +using System.Drawing.Drawing2D; using Core.Components.Charting.Styles; namespace Core.Components.Charting.Data @@ -30,16 +32,33 @@ public class ChartLineData : PointBasedChartData { /// + /// Creates a new instance of with default styling. + /// + /// The name of the . + /// Thrown when is + /// null or only whitespace. + public ChartLineData(string name) + : this(name, new ChartLineStyle(Color.Black, 2, DashStyle.Solid)) {} + + /// /// Creates a new instance of . /// /// The name of the . + /// The style of the data. /// Thrown when is /// null or only whitespace. - public ChartLineData(string name) : base(name) {} + public ChartLineData(string name, ChartLineStyle style) : base(name) + { + if (style == null) + { + throw new ArgumentNullException(nameof(style)); + } + Style = style; + } /// /// Gets or sets the style of the line. /// - public ChartLineStyle Style { get; set; } + public ChartLineStyle Style { get; } } } \ No newline at end of file Index: Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs (.../ChartLineDataTest.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Components/test/Core.Components.Charting.Test/Data/ChartLineDataTest.cs (.../ChartLineDataTest.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -20,8 +20,11 @@ // All rights reserved. using System; +using System.Drawing; +using System.Drawing.Drawing2D; 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 +42,9 @@ Assert.AreEqual("test data", data.Name); Assert.IsEmpty(data.Points); Assert.IsInstanceOf(data); + Assert.AreEqual(Color.Black, data.Style.Color); + Assert.AreEqual(2, data.Style.Width); + Assert.AreEqual(DashStyle.Solid, data.Style.Style); } [Test] @@ -54,5 +60,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 ChartLineData("test data", null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("style", exception.ParamName); + } + + [Test] + public void Constructor_WithStyle_ExpectedValue() + { + // Setup + var style = new ChartLineStyle(Color.Red, 3, DashStyle.DashDot); + + // Call + var data = new ChartLineData("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/ChartLineDataConverterTest.cs =================================================================== diff -u -r2d704a409d762d8fb54d2f8be285246861019ea0 -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs (.../ChartLineDataConverterTest.cs) (revision 2d704a409d762d8fb54d2f8be285246861019ea0) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartLineDataConverterTest.cs (.../ChartLineDataConverterTest.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -84,10 +84,7 @@ var converter = new ChartLineDataConverter(); var lineSeries = new LineSeries(); Color expectedColor = Color.FromKnownColor(color); - var data = new ChartLineData("test") - { - Style = new ChartLineStyle(expectedColor, 3, DashStyle.Solid) - }; + var data = new ChartLineData("test", new ChartLineStyle(expectedColor, 3, DashStyle.Solid)); // Call converter.ConvertSeriesProperties(data, lineSeries); @@ -105,10 +102,7 @@ // Setup var converter = new ChartLineDataConverter(); var lineSeries = new LineSeries(); - var data = new ChartLineData("test") - { - Style = new ChartLineStyle(Color.Red, width, DashStyle.Solid) - }; + var data = new ChartLineData("test", new ChartLineStyle(Color.Red, width, DashStyle.Solid)); // Call converter.ConvertSeriesProperties(data, lineSeries); @@ -128,10 +122,7 @@ // Setup var converter = new ChartLineDataConverter(); var lineSeries = new LineSeries(); - var data = new ChartLineData("test") - { - Style = new ChartLineStyle(Color.Red, 3, dashStyle) - }; + var data = new ChartLineData("test", new ChartLineStyle(Color.Red, 3, dashStyle)); // Call converter.ConvertSeriesProperties(data, lineSeries); Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs =================================================================== diff -u -r271bd5ffd4d61da4324eb50957f062b14c4c6958 -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs (.../ChartLineDataSeriesTest.cs) (revision 271bd5ffd4d61da4324eb50957f062b14c4c6958) +++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ChartLineDataSeriesTest.cs (.../ChartLineDataSeriesTest.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -52,7 +52,7 @@ public void Constructor_ChartLineDataWithTestProperties_ChartLineDataSeriesCreatedAccordingly() { // Setup - var chartLineData = new ChartLineData("Test name"); + var chartLineData = new ChartLineData("Test name", new ChartLineStyle(Color.Blue, 3, DashStyle.DashDot)); SetChartLineDataTestProperties(chartLineData); @@ -69,7 +69,7 @@ public void Update_ChartLineDataWithTestProperties_ChartLineDataSeriesUpdatedAccordingly() { // Setup - var chartLineData = new ChartLineData("Test name"); + var chartLineData = new ChartLineData("Test name", new ChartLineStyle(Color.Blue, 3, DashStyle.DashDot)); var chartLineDataSeries = new ChartLineDataSeries(chartLineData); SetChartLineDataTestProperties(chartLineData); @@ -136,7 +136,6 @@ { chartLineData.Name = "Another name"; chartLineData.IsVisible = false; - chartLineData.Style = new ChartLineStyle(Color.Blue, 3, DashStyle.DashDot); chartLineData.Points = new[] { new Point2D(1.1, 2.2) @@ -160,9 +159,9 @@ Assert.AreEqual("Test name", chartLineDataSeries.Title); Assert.IsTrue(chartLineDataSeries.IsVisible); - Assert.AreEqual(2, chartLineDataSeries.StrokeThickness); - Assert.AreEqual(OxyColor.FromArgb(0, 0, 0, 1), chartLineDataSeries.Color); - Assert.AreEqual(LineStyle.Automatic, chartLineDataSeries.LineStyle); + 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(LineStyle.DashDot, chartLineDataSeries.LineStyle); Assert.AreEqual(0, chartLineDataSeries.ItemsSource.Cast().Count()); } Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs =================================================================== diff -u -r8616c7f9f5791dff264dc5fe8ce598dbfe6ecb03 -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision 8616c7f9f5791dff264dc5fe8ce598dbfe6ecb03) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -56,9 +56,9 @@ public void Execute() { - var line1 = new ChartLineData(Resources.OpenChartViewCommand_Execute_Line_one) + var line1 = new ChartLineData(Resources.OpenChartViewCommand_Execute_Line_one, + new ChartLineStyle(Color.DarkRed, 3, DashStyle.Solid)) { - Style = new ChartLineStyle(Color.DarkRed, 3, DashStyle.Solid), Points = new[] { new Point2D(0.0, 0.500), @@ -86,9 +86,9 @@ } }; - var line2 = new ChartLineData(Resources.OpenChartViewCommand_Execute_Line_two) + var line2 = new ChartLineData(Resources.OpenChartViewCommand_Execute_Line_two, + new ChartLineStyle(Color.DarkSlateBlue, 2, DashStyle.DashDot)) { - Style = new ChartLineStyle(Color.DarkSlateBlue, 2, DashStyle.DashDot), Points = new[] { new Point2D(0.0, 0.800), Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs =================================================================== diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs (.../RingtoetsChartDataFactory.cs) (revision f1f94637a6b45b394493bf16a078b317c02d329b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs (.../RingtoetsChartDataFactory.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -38,10 +38,8 @@ /// The created . public static ChartLineData CreateForeshoreGeometryChartData() { - return new ChartLineData(Resources.Foreshore_DisplayName) - { - Style = new ChartLineStyle(Color.DarkOrange, 2, DashStyle.Solid) - }; + return new ChartLineData(Resources.Foreshore_DisplayName, + new ChartLineStyle(Color.DarkOrange, 2, DashStyle.Solid)); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Factories/GrassCoverErosionInwardsChartDataFactory.cs =================================================================== diff -u -rf1f94637a6b45b394493bf16a078b317c02d329b -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Factories/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision f1f94637a6b45b394493bf16a078b317c02d329b) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Factories/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -43,10 +43,8 @@ /// The created . public static ChartLineData CreateDikeGeometryChartData() { - return new ChartLineData(Resources.DikeProfile_DisplayName) - { - Style = new ChartLineStyle(Color.SaddleBrown, 2, DashStyle.Solid) - }; + return new ChartLineData(Resources.DikeProfile_DisplayName, + new ChartLineStyle(Color.SaddleBrown, 2, DashStyle.Solid)); } /// @@ -55,10 +53,8 @@ /// The created . public static ChartLineData CreateDikeHeightChartData() { - return new ChartLineData(Resources.DikeHeight_ChartName) - { - Style = new ChartLineStyle(Color.MediumSeaGreen, 2, DashStyle.Dash) - }; + return new ChartLineData(Resources.DikeHeight_ChartName, + new ChartLineStyle(Color.MediumSeaGreen, 2, DashStyle.Dash)); } /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -41,10 +41,8 @@ /// The created . public static ChartLineData CreateSurfaceLineChartData() { - return new ChartLineData(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_DisplayName) - { - Style = new ChartLineStyle(Color.Sienna, 2, DashStyle.Solid) - }; + return new ChartLineData(Resources.RingtoetsMacroStabilityInwardsSurfaceLine_DisplayName, + new ChartLineStyle(Color.Sienna, 2, DashStyle.Solid)); } /// Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs =================================================================== diff -u -r8616c7f9f5791dff264dc5fe8ce598dbfe6ecb03 -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision 8616c7f9f5791dff264dc5fe8ce598dbfe6ecb03) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -42,10 +42,8 @@ /// The created . public static ChartLineData CreateSurfaceLineChartData() { - return new ChartLineData(Resources.RingtoetsPipingSurfaceLine_DisplayName) - { - Style = new ChartLineStyle(Color.Sienna, 2, DashStyle.Solid) - }; + return new ChartLineData(Resources.RingtoetsPipingSurfaceLine_DisplayName, + new ChartLineStyle(Color.Sienna, 2, DashStyle.Solid)); } /// Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs =================================================================== diff -u -r5fb13b35ed6bba8b867b95826e85dddb064b7036 -rd2c15316d45ca54af4dfaf5f0ff9d0e61d763dda --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs (.../WaveConditionsChartDataFactory.cs) (revision 5fb13b35ed6bba8b867b95826e85dddb064b7036) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Factories/WaveConditionsChartDataFactory.cs (.../WaveConditionsChartDataFactory.cs) (revision d2c15316d45ca54af4dfaf5f0ff9d0e61d763dda) @@ -47,10 +47,8 @@ /// The created . public static ChartLineData CreateLowerRevetmentBoundaryChartData(Color lineColor) { - return new ChartLineData(Resources.WaveConditionsChartDataFactory_LowerBoundaryRevetment_DisplayName) - { - Style = GetRevetmentBoundaryStyle(lineColor) - }; + return new ChartLineData(Resources.WaveConditionsChartDataFactory_LowerBoundaryRevetment_DisplayName, + GetRevetmentBoundaryStyle(lineColor)); } /// @@ -60,10 +58,8 @@ /// The created . public static ChartLineData CreateUpperRevetmentBoundaryChartData(Color lineColor) { - return new ChartLineData(Resources.WaveConditionsChartDataFactory_UpperBoundaryRevetment_DisplayName) - { - Style = GetRevetmentBoundaryStyle(lineColor) - }; + return new ChartLineData(Resources.WaveConditionsChartDataFactory_UpperBoundaryRevetment_DisplayName, + GetRevetmentBoundaryStyle(lineColor)); } /// @@ -73,10 +69,8 @@ /// The created . public static ChartLineData CreateRevetmentChartData(Color lineColor) { - return new ChartLineData(Resources.WaveConditionsChartDataFactory_Revetment_DisplayName) - { - Style = new ChartLineStyle(lineColor, revetmentThickness, DashStyle.Solid) - }; + return new ChartLineData(Resources.WaveConditionsChartDataFactory_Revetment_DisplayName, + new ChartLineStyle(lineColor, revetmentThickness, DashStyle.Solid)); } /// @@ -86,10 +80,8 @@ /// The created . public static ChartLineData CreateRevetmentBaseChartData(Color lineColor) { - return new ChartLineData(Resources.WaveConditionsChartDataFactory_RevetmentBase_DisplayName) - { - Style = new ChartLineStyle(Color.FromArgb(120, lineColor), revetmentThickness, DashStyle.Dash) - }; + return new ChartLineData(Resources.WaveConditionsChartDataFactory_RevetmentBase_DisplayName, + new ChartLineStyle(Color.FromArgb(120, lineColor), revetmentThickness, DashStyle.Dash)); } /// @@ -98,10 +90,8 @@ /// The created . public static ChartLineData CreateLowerWaterLevelsBoundaryChartData() { - return new ChartLineData(Resources.WaveConditionsChartDataFactory_LowerBoundaryWaterLevels_DisplayName) - { - Style = GetWaterLevelsBoundaryStyle() - }; + return new ChartLineData(Resources.WaveConditionsChartDataFactory_LowerBoundaryWaterLevels_DisplayName, + GetWaterLevelsBoundaryStyle()); } /// @@ -110,10 +100,8 @@ /// The created . public static ChartLineData CreateUpperWaterLevelsBoundaryChartData() { - return new ChartLineData(Resources.WaveConditionsChartDataFactory_UpperBoundaryWaterLevels_DisplayName) - { - Style = GetWaterLevelsBoundaryStyle() - }; + return new ChartLineData(Resources.WaveConditionsChartDataFactory_UpperBoundaryWaterLevels_DisplayName, + GetWaterLevelsBoundaryStyle()); } /// @@ -130,10 +118,8 @@ throw new ArgumentNullException(nameof(chartDataName)); } - return new ChartLineData(chartDataName) - { - Style = new ChartLineStyle(Color.LightCoral, levelThickness, DashStyle.Solid) - }; + return new ChartLineData(chartDataName, + new ChartLineStyle(Color.LightCoral, levelThickness, DashStyle.Solid)); } /// @@ -144,7 +130,11 @@ { return new ChartMultipleLineData(Resources.WaveConditionsChartDataFactory_WaterLevels_DisplayName) { - Style = new ChartLineStyle(Color.DarkTurquoise, levelThickness, new [] { 6.0, 6.0 }) + Style = new ChartLineStyle(Color.DarkTurquoise, levelThickness, new[] + { + 6.0, + 6.0 + }) }; }