Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs =================================================================== diff -u -r5dc7eef906ffd48f56d14ea0b0b85441e4f2d529 -rdc6c85db19b5d77aec1c4db3fd4ef43a71fdd712 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision 5dc7eef906ffd48f56d14ea0b0b85441e4f2d529) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingChartDataFactory.cs (.../PipingChartDataFactory.cs) (revision dc6c85db19b5d77aec1c4db3fd4ef43a71fdd712) @@ -73,7 +73,7 @@ return new ChartLineData(surfaceLine.ProjectGeometryToLZ(), surfaceLine.Name) { - Style = new ChartLineStyle(Color.SaddleBrown, 2, DashStyle.Solid) + Style = new ChartLineStyle(Color.Sienna, 2, DashStyle.Solid) }; } @@ -97,7 +97,7 @@ throw new ArgumentNullException("surfaceLine"); } - return CreatePointWithZAtL(entryPoint, surfaceLine, Resources.PipingInput_EntryPointL_DisplayName, Color.Blue); + return CreatePointWithZAtL(entryPoint, surfaceLine, Resources.PipingInput_EntryPointL_DisplayName, Color.Gold); } /// @@ -120,7 +120,7 @@ throw new ArgumentNullException("surfaceLine"); } - return CreatePointWithZAtL(exitPoint, surfaceLine, Resources.PipingInput_ExitPointL_DisplayName, Color.Brown); + return CreatePointWithZAtL(exitPoint, surfaceLine, Resources.PipingInput_ExitPointL_DisplayName, Color.Tomato); } /// @@ -138,7 +138,7 @@ throw new ArgumentNullException("surfaceLine"); } - return CreateCharacteristicPoint(surfaceLine.DitchPolderSide, surfaceLine, PipingDataResources.CharacteristicPoint_DitchPolderSide, Color.Red); + return CreateCharacteristicPoint(surfaceLine.DitchPolderSide, surfaceLine, PipingDataResources.CharacteristicPoint_DitchPolderSide, Color.IndianRed); } /// @@ -156,7 +156,7 @@ throw new ArgumentNullException("surfaceLine"); } - return CreateCharacteristicPoint(surfaceLine.BottomDitchPolderSide, surfaceLine, PipingDataResources.CharacteristicPoint_BottomDitchPolderSide, Color.Blue); + return CreateCharacteristicPoint(surfaceLine.BottomDitchPolderSide, surfaceLine, PipingDataResources.CharacteristicPoint_BottomDitchPolderSide, Color.Teal); } /// @@ -174,7 +174,7 @@ throw new ArgumentNullException("surfaceLine"); } - return CreateCharacteristicPoint(surfaceLine.BottomDitchDikeSide, surfaceLine, PipingDataResources.CharacteristicPoint_BottomDitchDikeSide, Color.Green); + return CreateCharacteristicPoint(surfaceLine.BottomDitchDikeSide, surfaceLine, PipingDataResources.CharacteristicPoint_BottomDitchDikeSide, Color.DarkSeaGreen); } /// @@ -192,7 +192,7 @@ throw new ArgumentNullException("surfaceLine"); } - return CreateCharacteristicPoint(surfaceLine.DitchDikeSide, surfaceLine, PipingDataResources.CharacteristicPoint_DitchDikeSide, Color.Purple); + return CreateCharacteristicPoint(surfaceLine.DitchDikeSide, surfaceLine, PipingDataResources.CharacteristicPoint_DitchDikeSide, Color.MediumPurple); } /// @@ -210,7 +210,7 @@ throw new ArgumentNullException("surfaceLine"); } - return CreateCharacteristicPoint(surfaceLine.DikeToeAtRiver, surfaceLine, PipingDataResources.CharacteristicPoint_DikeToeAtRiver, Color.Orange); + return CreateCharacteristicPoint(surfaceLine.DikeToeAtRiver, surfaceLine, PipingDataResources.CharacteristicPoint_DikeToeAtRiver, Color.DarkBlue); } /// @@ -228,7 +228,7 @@ throw new ArgumentNullException("surfaceLine"); } - return CreateCharacteristicPoint(surfaceLine.DikeToeAtPolder, surfaceLine, PipingDataResources.CharacteristicPoint_DikeToeAtPolder, Color.Silver); + return CreateCharacteristicPoint(surfaceLine.DikeToeAtPolder, surfaceLine, PipingDataResources.CharacteristicPoint_DikeToeAtPolder, Color.SlateGray); } private static ChartData CreatePointWithZAtL(RoundedDouble pointL, RingtoetsPipingSurfaceLine surfaceLine, string name, Color color) @@ -244,7 +244,7 @@ new Point2D(pointL, pointZ), }, name) { - Style = new ChartPointStyle(color, 8, Color.Gray, 2, ChartPointSymbol.Triangle) + Style = new ChartPointStyle(color, 8, Color.Transparent, 0, ChartPointSymbol.Triangle) }; } catch (ArgumentOutOfRangeException) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs =================================================================== diff -u -r5dc7eef906ffd48f56d14ea0b0b85441e4f2d529 -rdc6c85db19b5d77aec1c4db3fd4ef43a71fdd712 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 5dc7eef906ffd48f56d14ea0b0b85441e4f2d529) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision dc6c85db19b5d77aec1c4db3fd4ef43a71fdd712) @@ -97,7 +97,7 @@ AssertEqualPointCollections(surfaceLine.ProjectGeometryToLZ(), chartLineData.Points); - AssertEqualStyle(chartLineData.Style, Color.SaddleBrown, 2, DashStyle.Solid); + AssertEqualStyle(chartLineData.Style, Color.Sienna, 2, DashStyle.Solid); } [Test] @@ -148,7 +148,7 @@ entryPointOnLine }, chartPointData.Points); - AssertEqualStyle(chartPointData.Style, Color.Blue, 8, Color.Gray, 2, ChartPointSymbol.Triangle); + AssertEqualStyle(chartPointData.Style, Color.Gold, 8, Color.Transparent, 0, ChartPointSymbol.Triangle); } [Test] @@ -220,7 +220,7 @@ exitPointOnLine }, chartPointData.Points); - AssertEqualStyle(chartPointData.Style, Color.Brown, 8, Color.Gray, 2, ChartPointSymbol.Triangle); + AssertEqualStyle(chartPointData.Style, Color.Tomato, 8, Color.Transparent, 0, ChartPointSymbol.Triangle); } [Test] @@ -288,7 +288,7 @@ AssertEqualLocalPointCollection(ditchPolderSide, surfaceLine, chartPointData.Points); - AssertEqualStyle(chartPointData.Style, Color.Red, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + AssertEqualStyle(chartPointData.Style, Color.IndianRed, 8, Color.Transparent, 0, ChartPointSymbol.Circle); } [Test] @@ -335,7 +335,7 @@ AssertEqualLocalPointCollection(bottomDitchPolderSide, surfaceLine, chartPointData.Points); - AssertEqualStyle(chartPointData.Style, Color.Blue, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + AssertEqualStyle(chartPointData.Style, Color.Teal, 8, Color.Transparent, 0, ChartPointSymbol.Circle); } [Test] @@ -382,7 +382,7 @@ AssertEqualLocalPointCollection(bottomDitchDikeSide, surfaceLine, chartPointData.Points); - AssertEqualStyle(chartPointData.Style, Color.Green, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + AssertEqualStyle(chartPointData.Style, Color.DarkSeaGreen, 8, Color.Transparent, 0, ChartPointSymbol.Circle); } [Test] @@ -429,7 +429,7 @@ AssertEqualLocalPointCollection(ditchDikeSide, surfaceLine, chartPointData.Points); - AssertEqualStyle(chartPointData.Style, Color.Purple, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + AssertEqualStyle(chartPointData.Style, Color.MediumPurple, 8, Color.Transparent, 0, ChartPointSymbol.Circle); } [Test] @@ -476,7 +476,7 @@ AssertEqualLocalPointCollection(dikeToeAtRiver, surfaceLine, chartPointData.Points); - AssertEqualStyle(chartPointData.Style, Color.Orange, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + AssertEqualStyle(chartPointData.Style, Color.DarkBlue, 8, Color.Transparent, 0, ChartPointSymbol.Circle); } [Test] @@ -523,7 +523,7 @@ AssertEqualLocalPointCollection(dikeToeAtPolder, surfaceLine, chartPointData.Points); - AssertEqualStyle(chartPointData.Style, Color.Silver, 8, Color.Transparent, 0, ChartPointSymbol.Circle); + AssertEqualStyle(chartPointData.Style, Color.SlateGray, 8, Color.Transparent, 0, ChartPointSymbol.Circle); } private static RingtoetsPipingSurfaceLine GetSurfaceLineWithGeometry()