Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs =================================================================== diff -u -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12 -r246dc954b190c640ad46a4ea8c7dc53076a45808 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs (.../RingtoetsChartDataFactory.cs) (revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsChartDataFactory.cs (.../RingtoetsChartDataFactory.cs) (revision 246dc954b190c640ad46a4ea8c7dc53076a45808) @@ -62,7 +62,7 @@ } /// - /// Create a for a surface line. + /// Create a for a soil profile. /// /// The created . public static ChartDataCollection CreateSoilProfileChartData() Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs =================================================================== diff -u -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12 -r246dc954b190c640ad46a4ea8c7dc53076a45808 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs (.../MacroStabilityInwardsChartDataFactory.cs) (revision 246dc954b190c640ad46a4ea8c7dc53076a45808) @@ -26,6 +26,7 @@ using Core.Components.Chart.Styles; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Forms.Factories { @@ -35,6 +36,17 @@ internal static class MacroStabilityInwardsChartDataFactory { /// + /// Create with default styling for a characteristic point + /// of type shoulder base inside. + /// + /// The created . + public static ChartPointData CreateShoulderBaseInsideChartData() + { + return new ChartPointData(RingtoetsCommonDataResources.CharacteristicPoint_ShoulderBaseInside, + GetCharacteristicPointStyle(Color.BlueViolet, Color.SeaGreen, ChartPointSymbol.Triangle)); + } + + /// /// Create for a based on its color. /// /// The index of the in for which to create . @@ -91,5 +103,17 @@ ? soilProfile.Name : Resources.StochasticSoilProfileProperties_DisplayName; } + + private static ChartPointStyle GetCharacteristicPointStyle(Color fillColor, Color strokeColor, ChartPointSymbol symbol) + { + return new ChartPointStyle + { + Color = fillColor, + StrokeColor = strokeColor, + Size = 8, + StrokeThickness = 1, + Symbol = symbol + }; + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs =================================================================== diff -u -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12 -r246dc954b190c640ad46a4ea8c7dc53076a45808 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision 246dc954b190c640ad46a4ea8c7dc53076a45808) @@ -35,6 +35,18 @@ public class MacroStabilityInwardsChartDataFactoryTest { [Test] + public void CreateShoulderBaseInsideChartData_ReturnsChartPointDataWithDefaultStyling() + { + // Call + ChartPointData data = MacroStabilityInwardsChartDataFactory.CreateShoulderBaseInsideChartData(); + + // Assert + Assert.IsFalse(data.HasData); + Assert.AreEqual("Insteek binnenberm", data.Name); + AssertEqualStyle(data.Style, Color.BlueViolet, 8, Color.SeaGreen, 1, ChartPointSymbol.Triangle); + } + + [Test] public void CreateSoilLayerChartData_SoilProfileNull_ThrowsArgumentNullException() { // Call @@ -162,11 +174,14 @@ Assert.AreEqual("soilLayerIndex", paramName); } - private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style) + private static void AssertEqualStyle(ChartPointStyle pointStyle, Color fillColor, int size, + Color strokeColor, int strokeThickness, ChartPointSymbol symbol) { - Assert.AreEqual(color, lineStyle.Color); - Assert.AreEqual(width, lineStyle.Width); - Assert.AreEqual(style, lineStyle.DashStyle); + Assert.AreEqual(fillColor, pointStyle.Color); + Assert.AreEqual(size, pointStyle.Size); + Assert.AreEqual(strokeColor, pointStyle.StrokeColor); + Assert.AreEqual(strokeThickness, pointStyle.StrokeThickness); + Assert.AreEqual(symbol, pointStyle.Symbol); } private static void AssertEqualStyle(ChartAreaStyle areaStyle, Color fillColor, Color strokeColor, int width) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs =================================================================== diff -u -r83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12 -r246dc954b190c640ad46a4ea8c7dc53076a45808 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 83c8f376bcd0ebf1bdfc1301d5fea953e98a3f12) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 246dc954b190c640ad46a4ea8c7dc53076a45808) @@ -258,13 +258,6 @@ Assert.AreEqual("soilLayerIndex", paramName); } - private static void AssertEqualStyle(ChartLineStyle lineStyle, Color color, int width, ChartLineDashStyle style) - { - Assert.AreEqual(color, lineStyle.Color); - Assert.AreEqual(width, lineStyle.Width); - Assert.AreEqual(style, lineStyle.DashStyle); - } - private static void AssertEqualStyle(ChartPointStyle pointStyle, Color color, int size, Color strokeColor, int strokeThickness, ChartPointSymbol symbol) { Assert.AreEqual(color, pointStyle.Color);