Bugfix arc closepath (#3295)

Co-authored-by: Lukas Holländer <lukas.hollaender@yworks.com>
parallax · Oct 13, 2021 · af2d39d · af2d39d
1 parent babeb35
commit af2d39d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/src/modules/context2d.js b/src/modules/context2d.js
@@ -995,6 +995,9 @@ import {
     }
     counterclockwise = Boolean(counterclockwise);
 
+    var x_start = x + radius * Math.cos(startAngle);
+    var y_start = y + radius * Math.sin(startAngle);
+
     if (!this.ctx.transform.isIdentity) {
       var xpt = this.ctx.transform.applyToPoint(new Point(x, y));
       x = xpt.x;
@@ -1011,6 +1014,7 @@ import {
       startAngle = 0;
       endAngle = 2 * Math.PI;
     }
+    this.lineTo(x_start, y_start);
 
     this.path.push({
       type: "arc",
@@ -2021,7 +2025,7 @@ import {
 
         case "lt":
           var iii = moves.length;
-          if (!isNaN(xPath[i - 1].x)) {
+          if (xPath[i - 1] && !isNaN(xPath[i - 1].x)) {
             delta = [pt.x - xPath[i - 1].x, pt.y - xPath[i - 1].y];
             if (iii > 0) {
               for (iii; iii >= 0; iii--) {

diff --git a/test/reference/arc.pdf b/test/reference/arc.pdf
diff --git a/test/reference/bar_graph_with_text_and_lines.pdf b/test/reference/bar_graph_with_text_and_lines.pdf
diff --git a/test/reference/piechart.pdf b/test/reference/piechart.pdf
diff --git a/test/reference/smiley.pdf b/test/reference/smiley.pdf
diff --git a/test/specs/context2d.spec.js b/test/specs/context2d.spec.js
@@ -33,7 +33,6 @@ describe("Context2D: standard tests", () => {
       };
       const canvg = await Canvg.fromString(ctx, svg, options);
       await canvg.render(options);
-
       comparePdf(
         doc.output(),
         "bar_graph_with_text_and_lines.pdf",
@@ -320,8 +319,14 @@ describe("Context2D: standard tests", () => {
     comparePdf(doc.output(), "fillStyle_strokeStyle.pdf", "context2d");
   });
 
-  xit("context2d: arc", () => {
-    var doc = new jsPDF("p", "pt", "a4");
+  it("context2d: arc", () => {
+    var doc = new jsPDF(
+      {
+        floatPrecision: 2
+      },
+      "pt",
+      "a4"
+    );
     var ctx = doc.context2d;
 
     var y = 0;
@@ -331,32 +336,45 @@ describe("Context2D: standard tests", () => {
     ctx.fillStyle = "black";
 
     y = pad + 40;
-    ctx.arc(50, y, 20, -10, 170, false);
+    ctx.beginPath();
+    ctx.arc(50, y, 20, -Math.PI / 3, Math.PI, false);
     ctx.stroke();
     y += pad + 40;
 
-    ctx.arc(50, y, 20, -10, 170, true);
+    ctx.beginPath();
+    ctx.arc(50, y, 20, -Math.PI / 3, Math.PI, true);
     ctx.stroke();
     y += pad + 40;
 
+    ctx.beginPath();
     ctx.arc(50, y, 20, 0, Math.PI, false);
     ctx.stroke();
     y += pad + 40;
 
+    ctx.beginPath();
     ctx.arc(50, y, 20, 0, Math.PI, true);
     ctx.stroke();
     y += pad + 40;
 
+    ctx.beginPath();
     ctx.arc(50, y, 20, 0, 2 * Math.PI, false);
     ctx.stroke();
     y += pad + 40;
 
+    ctx.beginPath();
     ctx.arc(50, y, 20, 0, 2 * Math.PI, false);
     ctx.fill();
     y += pad + 40;
 
+    ctx.beginPath();
     ctx.arc(50, y, 20, 0, Math.PI, false);
     ctx.fill();
+    y += pad + 40;
+
+    ctx.beginPath();
+    ctx.arc(50, y, 20, 0, Math.PI);
+    ctx.closePath();
+    ctx.stroke();
     comparePdf(doc.output(), "arc.pdf", "context2d");
   });
 
@@ -649,7 +667,7 @@ describe("Context2D: standard tests", () => {
     comparePdf(doc.output(), "autoPaging10Pages.pdf", "context2d");
   });
 
-  it("lineWidth should be nonnegative", ()=>{
+  it("lineWidth should be nonnegative", () => {
     var doc = new jsPDF({
       orientation: "p",
       unit: "pt",