Fix context2d lineWidth scaling (#2702)

* scale lineWidth using transform.scaleX * update spec/reference pdf * update pageoverlaps spec writeArray * update autoPaging10Pages reference Co-authored-by: Lukas Hollaender <lukas.hollaender@yworks.com>
parallax · Jul 17, 2020 · 91cecee · 91cecee
1 parent 96a582e
commit 91cecee
Show file tree

Hide file tree

Showing 41 changed files with 24 additions and 5 deletions.
diff --git a/spec/context2d.pageoverlap.spec.js b/spec/context2d.pageoverlap.spec.js
@@ -53,6 +53,7 @@ describe("Module: Context2D autoPaging", () => {
       "170. 821.89 l",
       "20. 821.89 l",
       "S",
+      "1. w",
       "0. 0. 0. rg",
       "1. 0. 0. RG",
       "0 J",
@@ -66,6 +67,7 @@ describe("Module: Context2D autoPaging", () => {
       "170. 1663.78 l",
       "20. 1663.78 l",
       "S",
+      "1. w",
       "0. 0. 0. rg",
       "1. 0. 0. RG",
       "0 J",
@@ -79,6 +81,7 @@ describe("Module: Context2D autoPaging", () => {
       "170. 2505.67 l",
       "20. 2505.67 l",
       "S",
+      "1. w",
       "0. 0. 0. rg",
       "1. 0. 0. RG",
       "0 J",
@@ -92,6 +95,7 @@ describe("Module: Context2D autoPaging", () => {
       "170. 3347.56 l",
       "20. 3347.56 l",
       "S",
+      "1. w",
       "0. G",
       "0. 0. 0. rg",
       "0. G",
@@ -106,6 +110,7 @@ describe("Module: Context2D autoPaging", () => {
       "330. 821.89 l",
       "180. 821.89 l",
       "S",
+      "1. w",
       "0. 0. 0. rg",
       "0. G",
       "0 J",
@@ -119,6 +124,7 @@ describe("Module: Context2D autoPaging", () => {
       "330. 1663.78 l",
       "180. 1663.78 l",
       "S",
+      "1. w",
       "0. 0. 0. rg",
       "0. G",
       "0 J",
@@ -132,6 +138,7 @@ describe("Module: Context2D autoPaging", () => {
       "330. 2505.67 l",
       "180. 2505.67 l",
       "S",
+      "1. w",
       "0. 0. 0. rg",
       "0. G",
       "0 J",
@@ -144,7 +151,8 @@ describe("Module: Context2D autoPaging", () => {
       "180. 3347.56 l",
       "330. 3347.56 l",
       "180. 3347.56 l",
-      "S"
+      "S",
+      "1. w"
     ]);
   });
 
@@ -160,7 +168,6 @@ describe("Module: Context2D autoPaging", () => {
 
     var writeArray = [];
     doc.__private__.setCustomOutputDestination(writeArray);
-
     ctx.fillText("test", 0, 1000);
 
     expect(writeArray).toEqual([
@@ -171,7 +178,9 @@ describe("Module: Context2D autoPaging", () => {
       "0 J",
       "1. w",
       "0 j",
-      "BT\n/F1 10 Tf\n11.5 TL\n0. 0. 0. rg\n0. 683.78 Td\n(test) Tj\nET"
+      "1. w",
+      "BT\n/F1 10 Tf\n11.5 TL\n0. 0. 0. rg\n0. 683.78 Td\n(test) Tj\nET",
+      "1. w"
     ]);
   });
 });
diff --git a/spec/reference/autoPaging10Pages.pdf b/spec/reference/autoPaging10Pages.pdf
diff --git a/spec/reference/bar_graph_with_text_and_lines.pdf b/spec/reference/bar_graph_with_text_and_lines.pdf
diff --git a/spec/reference/csscolornames.pdf b/spec/reference/csscolornames.pdf
diff --git a/spec/reference/curves.pdf b/spec/reference/curves.pdf
diff --git a/spec/reference/fillRect_strokeRect.pdf b/spec/reference/fillRect_strokeRect.pdf
diff --git a/spec/reference/fillStyle_strokeStyle.pdf b/spec/reference/fillStyle_strokeStyle.pdf
diff --git a/spec/reference/fonts.pdf b/spec/reference/fonts.pdf
diff --git a/spec/reference/moveTo_lineTo_stroke_fill.pdf b/spec/reference/moveTo_lineTo_stroke_fill.pdf
diff --git a/spec/reference/paths.pdf b/spec/reference/paths.pdf
diff --git a/spec/reference/piechart.pdf b/spec/reference/piechart.pdf
diff --git a/spec/reference/sierpinski.pdf b/spec/reference/sierpinski.pdf
diff --git a/spec/reference/smiley.pdf b/spec/reference/smiley.pdf
diff --git a/spec/reference/textBaseline.pdf b/spec/reference/textBaseline.pdf
diff --git a/spec/reference/w3s_arc.pdf b/spec/reference/w3s_arc.pdf
diff --git a/spec/reference/w3s_bezierCurveTo.pdf b/spec/reference/w3s_bezierCurveTo.pdf
diff --git a/spec/reference/w3s_clip.pdf b/spec/reference/w3s_clip.pdf
diff --git a/spec/reference/w3s_closePath_v1.pdf b/spec/reference/w3s_closePath_v1.pdf
diff --git a/spec/reference/w3s_closePath_v2.pdf b/spec/reference/w3s_closePath_v2.pdf
diff --git a/spec/reference/w3s_fillStyle.pdf b/spec/reference/w3s_fillStyle.pdf
diff --git a/spec/reference/w3s_fillText.pdf b/spec/reference/w3s_fillText.pdf
diff --git a/spec/reference/w3s_font.pdf b/spec/reference/w3s_font.pdf
diff --git a/spec/reference/w3s_lineCap_butt.pdf b/spec/reference/w3s_lineCap_butt.pdf
diff --git a/spec/reference/w3s_lineCap_round.pdf b/spec/reference/w3s_lineCap_round.pdf
diff --git a/spec/reference/w3s_lineCap_square.pdf b/spec/reference/w3s_lineCap_square.pdf
diff --git a/spec/reference/w3s_lineJoin_bevel.pdf b/spec/reference/w3s_lineJoin_bevel.pdf
diff --git a/spec/reference/w3s_lineJoin_miter.pdf b/spec/reference/w3s_lineJoin_miter.pdf
diff --git a/spec/reference/w3s_lineJoin_round.pdf b/spec/reference/w3s_lineJoin_round.pdf
diff --git a/spec/reference/w3s_lineTo.pdf b/spec/reference/w3s_lineTo.pdf
diff --git a/spec/reference/w3s_quadraticCurveTo.pdf b/spec/reference/w3s_quadraticCurveTo.pdf
diff --git a/spec/reference/w3s_rotate.pdf b/spec/reference/w3s_rotate.pdf
diff --git a/spec/reference/w3s_scale.pdf b/spec/reference/w3s_scale.pdf
diff --git a/spec/reference/w3s_setTransform.pdf b/spec/reference/w3s_setTransform.pdf
diff --git a/spec/reference/w3s_strokeStyle.pdf b/spec/reference/w3s_strokeStyle.pdf
diff --git a/spec/reference/w3s_strokeText.pdf b/spec/reference/w3s_strokeText.pdf
diff --git a/spec/reference/w3s_textAlign.pdf b/spec/reference/w3s_textAlign.pdf
diff --git a/spec/reference/w3s_textBaseline.pdf b/spec/reference/w3s_textBaseline.pdf
diff --git a/spec/reference/w3s_transform.pdf b/spec/reference/w3s_transform.pdf
diff --git a/spec/reference/w3s_translate.pdf b/spec/reference/w3s_translate.pdf
diff --git a/spec/reference/warnsign.pdf b/spec/reference/warnsign.pdf
diff --git a/src/modules/context2d.js b/src/modules/context2d.js
@@ -1605,7 +1605,8 @@
     var fillStyle = this.fillStyle;
     var strokeStyle = this.strokeStyle;
     var lineCap = this.lineCap;
-    var lineWidth = this.lineWidth;
+    var oldLineWidth = this.lineWidth;
+    var lineWidth = oldLineWidth * this.ctx.transform.scaleX;
     var lineJoin = this.lineJoin;
 
     var origPath = JSON.parse(JSON.stringify(this.path));
@@ -1665,9 +1666,12 @@
         if (isClip === false || k === 0) {
           drawPaths.call(this, rule, isClip);
         }
+        this.lineWidth = oldLineWidth;
       }
     } else {
+      this.lineWidth = lineWidth;
       drawPaths.call(this, rule, isClip);
+      this.lineWidth = oldLineWidth;
     }
     this.path = origPath;
   };
@@ -1995,7 +1999,7 @@
 
     sortPages(pages);
 
-    var clipPath, oldSize;
+    var clipPath, oldSize, oldLineWidth;
     if (this.autoPaging === true) {
       var min = pages[0];
       var max = pages[pages.length - 1];
@@ -2023,6 +2027,8 @@
         if (options.scale >= 0.01) {
           oldSize = this.pdf.internal.getFontSize();
           this.pdf.setFontSize(oldSize * options.scale);
+          oldLineWidth = this.lineWidth;
+          this.lineWidth = oldLineWidth * options.scale;
         }
         this.pdf.text(options.text, tmpRect.x, tmpRect.y, {
           angle: options.angle,
@@ -2033,12 +2039,15 @@
 
         if (options.scale >= 0.01) {
           this.pdf.setFontSize(oldSize);
+          this.lineWidth = oldLineWidth;
         }
       }
     } else {
       if (options.scale >= 0.01) {
         oldSize = this.pdf.internal.getFontSize();
         this.pdf.setFontSize(oldSize * options.scale);
+        oldLineWidth = this.lineWidth;
+        this.lineWidth = oldLineWidth * options.scale;
       }
       this.pdf.text(options.text, pt.x + this.posX, pt.y + this.posY, {
         angle: options.angle,
@@ -2049,6 +2058,7 @@
 
       if (options.scale >= 0.01) {
         this.pdf.setFontSize(oldSize);
+        this.lineWidth = oldLineWidth;
       }
     }
   };