Fixed zoom not adjusting line properly

quintindunn · Oct 23, 2023 · 19e6279 · 19e6279
1 parent 62432d0
commit 19e6279
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/static/.DS_Store b/static/.DS_Store
diff --git a/static/graphs/.DS_Store b/static/graphs/.DS_Store
diff --git a/static/graphs/js/.DS_Store b/static/graphs/js/.DS_Store
diff --git a/static/graphs/js/dva_graphs/dva_graphs.js b/static/graphs/js/dva_graphs/dva_graphs.js
@@ -130,6 +130,8 @@ function checkInput(expr, is_condition=false) {
 
 // Zooms the graph by multiplying the axes
 function zoom(factor) {
+    if (factor == -Infinity || factor == Infinity || factor == NaN || factor === 0) { return; }
+
     domain[0] *= factor;
     domain[1] *= factor;
     range[0] *= factor;

diff --git a/static/graphs/js/dva_graphs/function.js b/static/graphs/js/dva_graphs/function.js
@@ -21,19 +21,9 @@ export class MathFunction {
 
     // Generate an array of x,y pairs for graphing.
     toPointsArray(points, min, max) {
-        let range = max - min;  // What points to graph it in between.
+        let change = (max - min) / points; // What to increment the x value by, more points = a greater resolution
 
-        let pointsArr = new Array(max - min);
-
-        let change = range / points; // What to increment the x value by, more points = a greater resolution
-        let currentX = min;
-
-        for (let i = 0; i < range; i++) {
-            pointsArr[i] = [currentX, this.func(currentX)];  // Set pointsArr[i] to the x, y pair.
-            currentX += change;
-        }
-
-        return pointsArr;
+        return Array.from( { length: points }, (_, i) => [i * change, this.yAt(i * change)] );
     }
 }
 
@@ -65,18 +55,8 @@ export class PiecewiseFunction {
 
     // Generate an array of x,y pairs for graphing.
     toPointsArray(points, min, max) {
-        let range = max - min;  // What points to graph it in between.
-
-        let pointsArr = new Array(max - min);
-
-        let change = range / points; // What to increment the x value by, more points = a greater resolution
-        let currentX = min;
-
-        for (let i = 0; i < range; i++) {
-            pointsArr[i] = [currentX, this.iterate(currentX)];  // Set pointsArr[i] to the x, y pair.
-            currentX += change;
-        }
+        let change = (max - min) / points; // What to increment the x value by, more points = a greater resolution
 
-        return pointsArr;
+        return Array.from( { length: points }, (_, i) => [i * change, this.iterate(i * change)] );
     }
 }