Fix for minor tick alignment issues when using the exactTick feature …

…with negative values. Corrects the tick delta by using a correct modulus function, and prevents overflow past the maxValue.
sonthanhdan · Aug 1, 2017 · 3cd48ba · 3cd48ba
1 parent 7e17166
commit 3cd48ba
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/gauge.min.js b/gauge.min.js
diff --git a/gauge.min.js.map b/gauge.min.js.map
diff --git a/lib/BaseGauge.js b/lib/BaseGauge.js
@@ -436,6 +436,16 @@ export default class BaseGauge extends EventEmitter {
 
         return value;
     }
+
+    /**
+     * Corrects javascript modulus bug
+     * @param {number} n
+     * @param {number} m
+     * @return {number}
+     */
+    static mod(n,m) {
+        return ((n % m) + m) % m;
+    }
 }
 
 

diff --git a/lib/LinearGauge.js b/lib/LinearGauge.js
@@ -770,10 +770,12 @@ function drawLinearMinorTicks(context, options) {
 
     if (minTicks) {
         if (options.exactTicks) {
-            let delta = (options.majorTicks[0] % minTicks) || 0;
+            let delta = BaseGauge.mod(options.majorTicks[0], minTicks) || 0;
 
             for (; i < options.maxValue; i += minTicks) {
-                ticks.push(delta + i);
+                if ((delta+i) < options.maxValue) {
+                    ticks.push(delta + i);
+                }
             }
         }
 

diff --git a/lib/RadialGauge.js b/lib/RadialGauge.js
@@ -256,7 +256,7 @@ function drawRadialMinorTicks(context, options) {
     if (options.exactTicks) {
         range = options.maxValue - options.minValue;
         s = minTicks ? range / minTicks : 0;
-        delta = ((options.majorTicks[0] % minTicks) || 0)  * ratio;
+        delta = (BaseGauge.mod(options.majorTicks[0], minTicks) || 0)  * ratio;
     }
 
     else {
@@ -265,13 +265,14 @@ function drawRadialMinorTicks(context, options) {
 
     for (; i < s; ++i) {
         angle = options.startAngle + delta + i * (options.ticksAngle / s);
+        if (angle <= (options.ticksAngle + options.startAngle )) {
+            context.rotate(drawings.radians(angle));
 
-        context.rotate(drawings.radians(angle));
-
-        context.beginPath();
-        context.moveTo(0, radius);
-        context.lineTo(0, radius - context.max * 0.075);
-        closeStrokedPath(context);
+            context.beginPath();
+            context.moveTo(0, radius);
+            context.lineTo(0, radius - context.max * 0.075);
+            closeStrokedPath(context);
+        }
     }
 }