added EllipticalArc to DrawPathTests

Author: derBobo

src/ImageSharp.Drawing/Shapes/EllipticalArcLineSegment.cs

@@ -31,7 +31,7 @@ public sealed class EllipticalArcLineSegment : ILineSegment
         /// <param name="y"> The y-coordinate of the center point of the ellips from which the arc is taken.</param>
         /// <param name="radiusX">X radius of the ellipsis.</param>
         /// <param name="radiusY">Y radius of the ellipsis.</param>
-        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees anticlockwise.</param>
+        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees clockwise.</param>
         /// <param name="startAngle">The Start angle of the ellipsis, measured in degrees anticlockwise from the Y-axis.</param>
         /// <param name="sweepAngle"> The angle between (<paramref name="startAngle"/> and the end of the arc. </param>
         /// <param name="transformation">The Tranformation matrix, that should be used on the arc.</param>
@@ -43,7 +43,7 @@ public EllipticalArcLineSegment(float x, float y, float radiusX, float radiusY,
             this.y = y;
             this.radiusX = radiusX;
             this.radiusY = radiusY;
-            this.rotation = -rotation % 360;
+            this.rotation = rotation % 360;
             this.startAngle = startAngle % 360;
             this.transformation = transformation;
             this.sweepAngle = sweepAngle;

src/ImageSharp.Drawing/Shapes/PathBuilder.cs

@@ -203,7 +203,7 @@ public PathBuilder AddBezier(PointF startPoint, PointF controlPoint1, PointF con
         /// Adds an elliptical arc to the current  figure
         /// </summary>
         /// <param name="rect"> A <see cref="RectangleF"/> that represents the rectangular bounds of the ellipse from which the arc is taken.</param>
-        /// <param name="rotation">The rotation of (<paramref name="rect"/>, measured in degrees anticlockwise.</param>
+        /// <param name="rotation">The rotation of (<paramref name="rect"/>, measured in degrees clockwise.</param>
         /// <param name="startAngle">The Start angle of the ellipsis, measured in degrees anticlockwise from the Y-axis.</param>
         /// <param name="sweepAngle"> The angle between (<paramref name="startAngle"/> and the end of the arc. </param>
         /// <returns>The <see cref="PathBuilder"/></returns>
@@ -213,7 +213,7 @@ public PathBuilder AddBezier(PointF startPoint, PointF controlPoint1, PointF con
         /// Adds an elliptical arc to the current  figure
         /// </summary>
         /// <param name="rect"> A <see cref="Rectangle"/> that represents the rectangular bounds of the ellipse from which the arc is taken.</param>
-        /// <param name="rotation">The rotation of (<paramref name="rect"/>, measured in degrees anticlockwise.</param>
+        /// <param name="rotation">The rotation of (<paramref name="rect"/>, measured in degrees clockwise.</param>
         /// <param name="startAngle">The Start angle of the ellipsis, measured in degrees anticlockwise from the Y-axis.</param>
         /// <param name="sweepAngle"> The angle between (<paramref name="startAngle"/> and the end of the arc. </param>
         /// <returns>The <see cref="PathBuilder"/></returns>
@@ -225,7 +225,7 @@ public PathBuilder AddBezier(PointF startPoint, PointF controlPoint1, PointF con
         /// <param name="center"> The center <see cref="PointF"/> of the ellips from which the arc is taken.</param>
         /// <param name="radiusX">X radius of the ellipsis.</param>
         /// <param name="radiusY">Y radius of the ellipsis.</param>
-        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees anticlockwise.</param>
+        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees clockwise.</param>
         /// <param name="startAngle">The Start angle of the ellipsis, measured in degrees anticlockwise from the Y-axis.</param>
         /// <param name="sweepAngle"> The angle between (<paramref name="startAngle"/> and the end of the arc. </param>
         /// <returns>The <see cref="PathBuilder"/></returns>
@@ -237,7 +237,7 @@ public PathBuilder AddBezier(PointF startPoint, PointF controlPoint1, PointF con
         /// <param name="center"> The center <see cref="Point"/> of the ellips from which the arc is taken.</param>
         /// <param name="radiusX">X radius of the ellipsis.</param>
         /// <param name="radiusY">Y radius of the ellipsis.</param>
-        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees anticlockwise.</param>
+        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees clockwise.</param>
         /// <param name="startAngle">The Start angle of the ellipsis, measured in degrees anticlockwise from the Y-axis.</param>
         /// <param name="sweepAngle"> The angle between (<paramref name="startAngle"/> and the end of the arc. </param>
         /// <returns>The <see cref="PathBuilder"/></returns>
@@ -250,7 +250,7 @@ public PathBuilder AddBezier(PointF startPoint, PointF controlPoint1, PointF con
         /// <param name="y"> The y-coordinate of the center point of the ellips from which the arc is taken.</param>
         /// <param name="radiusX">X radius of the ellipsis.</param>
         /// <param name="radiusY">Y radius of the ellipsis.</param>
-        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees anticlockwise.</param>
+        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees clockwise.</param>
         /// <param name="startAngle">The Start angle of the ellipsis, measured in degrees anticlockwise from the Y-axis.</param>
         /// <param name="sweepAngle"> The angle between (<paramref name="startAngle"/> and the end of the arc. </param>
         /// <returns>The <see cref="PathBuilder"/></returns>
@@ -268,7 +268,7 @@ public PathBuilder AddEllipticalArc(int x, int y, int radiusX, int radiusY, int
         /// <param name="y"> The y-coordinate of the center point of the ellips from which the arc is taken.</param>
         /// <param name="radiusX">X radius of the ellipsis.</param>
         /// <param name="radiusY">Y radius of the ellipsis.</param>
-        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees anticlockwise.</param>
+        /// <param name="rotation">The rotation of (<paramref name="radiusX"/> to the X-axis and (<paramref name="radiusY"/> to the Y-axis, measured in degrees clockwise.</param>
         /// <param name="startAngle">The Start angle of the ellipsis, measured in degrees anticlockwise from the Y-axis.</param>
         /// <param name="sweepAngle"> The angle between (<paramref name="startAngle"/> and the end of the arc. </param>
         /// <returns>The <see cref="PathBuilder"/></returns>

tests/ImageSharp.Drawing.Tests/Drawing/DrawPathTests.cs

@@ -23,7 +23,7 @@ public class DrawPathTests
             };
 
         [Theory]
-        [WithSolidFilledImages(nameof(DrawPathData), 300, 450, "Blue", PixelTypes.Rgba32)]
+        [WithSolidFilledImages(nameof(DrawPathData), 300, 600, "Blue", PixelTypes.Rgba32)]
         public void DrawPath<TPixel>(TestImageProvider<TPixel> provider, string colorName, byte alpha, float thickness)
             where TPixel : unmanaged, IPixel<TPixel>
         {
@@ -36,8 +36,10 @@ public void DrawPath<TPixel>(TestImageProvider<TPixel> provider, string colorNam
                 new Vector2(500, 500),
                 new Vector2(60, 10),
                 new Vector2(10, 400));
+            var ellipticArcSegment1 = new EllipticalArcLineSegment(80, 425, (float)Math.Sqrt(5525), 40, (float)(Math.Atan2(25, 70) * 180 / Math.PI), -90, -180, Matrix3x2.Identity);
+            var ellipticArcSegment2 = new EllipticalArcLineSegment(150, 520, 140, 70, 0, 180, 360, Matrix3x2.Identity);
 
-            var path = new Path(linearSegment, bezierSegment);
+            var path = new Path(linearSegment, bezierSegment, ellipticArcSegment1, ellipticArcSegment2);
 
             Rgba32 rgba = TestUtils.GetColorByName(colorName);
             rgba.A = alpha;

tests/ImageSharp.Drawing.Tests/Shapes/EllipticalArcLineSegmentTest.cs

@@ -12,7 +12,7 @@ public class EllipticalArcLineSegmentTest
         [Fact]
         public void ContainsStartandEnd()
         {
-            var segment = new EllipticalArcLineSegment(new PointF(10, 10), 10, 20, 0, 0, 90, Matrix3x2.Identity);
+            var segment = new EllipticalArcLineSegment(10, 10, 10, 20, 0, 0, 90, Matrix3x2.Identity);
             IReadOnlyList<PointF> points = segment.Flatten().ToArray();
             Assert.Equal(10, points[0].X, 5);
             Assert.Equal(30, points[0].Y, 5);