From 661a8c8ca5caf37697096867deb67a528ff91d31 Mon Sep 17 00:00:00 2001
From: Preet Shihn <preetshihn@gmail.com>
Date: Sat, 30 May 2020 17:51:58 -0700
Subject: [PATCH] Ability to set the number of passes to annotate a shape

---
 src/model.ts  |  1 +
 src/render.ts | 60 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/src/model.ts b/src/model.ts
index 425652d..85f439e 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -19,6 +19,7 @@ export interface RoughAnnotationConfig {
   color?: string; // defaults to currentColor
   strokeWidth?: number; // default based on type
   padding?: number; // defaults to 5px
+  iterations?: number; // defaults to 2
 }
 
 export interface RoughAnnotation {
diff --git a/src/render.ts b/src/render.ts
index 6f55981..b012ac5 100644
--- a/src/render.ts
+++ b/src/render.ts
@@ -34,18 +34,29 @@ export function renderAnnotation(svg: SVGSVGElement, rect: Rect, config: RoughAn
   let strokeWidth = config.strokeWidth || 2;
   const padding = (config.padding === 0) ? 0 : (config.padding || 5);
   const animate = (config.animate === undefined) ? true : (!!config.animate);
+  const iterations = config.iterations || 2;
 
   switch (config.type) {
     case 'underline': {
       const y = rect.y + rect.h + padding;
-      opList.push(line(rect.x, y, rect.x + rect.w, y, singleStrokeOptions));
-      opList.push(line(rect.x + rect.w, y, rect.x, y, singleStrokeOptions));
+      for (let i = 0; i < iterations; i++) {
+        if (i % 2) {
+          opList.push(line(rect.x + rect.w, y, rect.x, y, singleStrokeOptions));
+        } else {
+          opList.push(line(rect.x, y, rect.x + rect.w, y, singleStrokeOptions));
+        }
+      }
       break;
     }
     case 'strike-through': {
       const y = rect.y + (rect.h / 2);
-      opList.push(line(rect.x, y, rect.x + rect.w, y, singleStrokeOptions));
-      opList.push(line(rect.x + rect.w, y, rect.x, y, singleStrokeOptions));
+      for (let i = 0; i < iterations; i++) {
+        if (i % 2) {
+          opList.push(line(rect.x + rect.w, y, rect.x, y, singleStrokeOptions));
+        } else {
+          opList.push(line(rect.x, y, rect.x + rect.w, y, singleStrokeOptions));
+        }
+      }
       break;
     }
     case 'box': {
@@ -53,8 +64,9 @@ export function renderAnnotation(svg: SVGSVGElement, rect: Rect, config: RoughAn
       const y = rect.y - padding;
       const width = rect.w + (2 * padding);
       const height = rect.h + (2 * padding);
-      opList.push(rectangle(x, y, width, height, singleStrokeOptions));
-      opList.push(rectangle(x, y, width, height, singleStrokeOptions));
+      for (let i = 0; i < iterations; i++) {
+        opList.push(rectangle(x, y, width, height, singleStrokeOptions));
+      }
       break;
     }
     case 'crossed-off': {
@@ -62,10 +74,20 @@ export function renderAnnotation(svg: SVGSVGElement, rect: Rect, config: RoughAn
       const y = rect.y;
       const x2 = x + rect.w;
       const y2 = y + rect.h;
-      opList.push(line(x, y, x2, y2, singleStrokeOptions));
-      opList.push(line(x2, y2, x, y, singleStrokeOptions));
-      opList.push(line(x2, y, x, y2, singleStrokeOptions));
-      opList.push(line(x, y2, x2, y, singleStrokeOptions));
+      for (let i = 0; i < iterations; i++) {
+        if (i % 2) {
+          opList.push(line(x2, y2, x, y, singleStrokeOptions));
+        } else {
+          opList.push(line(x, y, x2, y2, singleStrokeOptions));
+        }
+      }
+      for (let i = 0; i < iterations; i++) {
+        if (i % 2) {
+          opList.push(line(x, y2, x2, y, singleStrokeOptions));
+        } else {
+          opList.push(line(x2, y, x, y2, singleStrokeOptions));
+        }
+      }
       break;
     }
     case 'circle': {
@@ -74,14 +96,26 @@ export function renderAnnotation(svg: SVGSVGElement, rect: Rect, config: RoughAn
       const height = rect.h + (2 * p2);
       const x = rect.x - p2 + (width / 2);
       const y = rect.y - p2 + (height / 2);
-      opList.push(ellipse(x, y, width, height, defaultOptions));
+      const fullItr = Math.floor(iterations / 2);
+      const singleItr = iterations - (fullItr * 2);
+      for (let i = 0; i < fullItr; i++) {
+        opList.push(ellipse(x, y, width, height, defaultOptions));
+      }
+      for (let i = 0; i < singleItr; i++) {
+        opList.push(ellipse(x, y, width, height, singleStrokeOptions));
+      }
       break;
     }
     case 'highlight': {
       strokeWidth = rect.h * 0.95;
       const y = rect.y + (rect.h / 2);
-      opList.push(line(rect.x, y, rect.x + rect.w, y, highlightOptions));
-      opList.push(line(rect.x + rect.w, y, rect.x, y, highlightOptions));
+      for (let i = 0; i < iterations; i++) {
+        if (i % 2) {
+          opList.push(line(rect.x + rect.w, y, rect.x, y, highlightOptions));
+        } else {
+          opList.push(line(rect.x, y, rect.x + rect.w, y, highlightOptions));
+        }
+      }
       break;
     }
   }