From: Klaus Weidner Date: Wed, 29 Feb 2012 18:15:50 +0000 (-0800) Subject: New approach to fix NaN handling in highlighting X-Git-Tag: v1.0.0~314^2~1^2 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=62c3d2fd065eed26fd98879cb013b5a8ebe2afef;p=dygraphs.git New approach to fix NaN handling in highlighting --- diff --git a/dygraph-utils.js b/dygraph-utils.js index 3827d91..3103986 100644 --- a/dygraph-utils.js +++ b/dygraph-utils.js @@ -332,6 +332,18 @@ Dygraph.isOK = function(x) { }; /** + * @private + * @param { Object } p The point to consider, valid points are {x, y} objects + * @return { Boolean } Whether the point has numeric x and y. + */ +Dygraph.isValidPoint = function(p) { + if (!p) return false; // null or undefined object + if (isNaN(p.x) || p.x === null || p.x === undefined) return false; + if (isNaN(p.y) || p.y === null || p.y === undefined) return false; + return true; +}; + +/** * Number formatting function which mimicks the behavior of %g in printf, i.e. * either exponential or fixed format (without trailing 0s) is used depending on * the length of the generated string. The advantage of this format is that diff --git a/dygraph.js b/dygraph.js index 8162d8e..40f1d11 100644 --- a/dygraph.js +++ b/dygraph.js @@ -1515,7 +1515,7 @@ Dygraph.prototype.findClosestRow = function(domX) { var l = points.length; for (var i = 0; i < l; i++) { var point = points[i]; - if (point === null) continue; + if (!Dygraph.isValidPoint(point)) continue; var dist = Math.abs(point.canvasx - domX); if (minDistX === null || dist < minDistX) { minDistX = dist; @@ -1547,13 +1547,12 @@ Dygraph.prototype.findClosestPoint = function(domX, domY) { var len = this.layout_.setPointsLengths[setIdx]; for (var i = 0; i < len; ++i) { var point = points[first + i]; - if (point === null) continue; + if (!Dygraph.isValidPoint(point)) continue; dx = point.canvasx - domX; dy = point.canvasy - domY; dist = dx * dx + dy * dy; if (minDist === null || dist < minDist) { - if (!isNaN(dist)) - minDist = dist; + minDist = dist; closestPoint = point; closestSeries = setIdx; idx = i; @@ -1589,22 +1588,27 @@ Dygraph.prototype.findStackedPoint = function(domX, domY) { var len = this.layout_.setPointsLengths[setIdx]; if (row >= len) continue; var p1 = points[first + row]; + if (!Dygraph.isValidPoint(p1)) continue; var py = p1.canvasy; if (domX > p1.canvasx && row + 1 < len) { // interpolate series Y value using next point var p2 = points[first + row + 1]; - var dx = p2.canvasx - p1.canvasx; - if (dx > 0) { - var r = (domX - p1.canvasx) / dx; - py += r * (p2.canvasy - p1.canvasy); + if (Dygraph.isValidPoint(p2)) { + var dx = p2.canvasx - p1.canvasx; + if (dx > 0) { + var r = (domX - p1.canvasx) / dx; + py += r * (p2.canvasy - p1.canvasy); + } } } else if (domX < p1.canvasx && row > 0) { // interpolate series Y value using previous point var p0 = points[first + row - 1]; - var dx = p1.canvasx - p0.canvasx; - if (dx > 0) { - var r = (p1.canvasx - domX) / dx; - py += r * (p0.canvasy - p1.canvasy); + if (Dygraph.isValidPoint(p0)) { + var dx = p1.canvasx - p0.canvasx; + if (dx > 0) { + var r = (p1.canvasx - domX) / dx; + py += r * (p0.canvasy - p1.canvasy); + } } } // Stop if the point (domX, py) is above this series' upper edge