From c742293ba320687849b9e695ef1ac9f205e6bf23 Mon Sep 17 00:00:00 2001 From: Robert Konigsberg Date: Fri, 4 Feb 2011 17:28:59 -0500 Subject: [PATCH] Turns out that I had to also check for infinity, which happens when minYval is 0. Fixed that, plus, only set those values when it's log scale. Also fancied up the console message. --- dygraph-canvas.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dygraph-canvas.js b/dygraph-canvas.js index 9b70f81..8133d86 100644 --- a/dygraph-canvas.js +++ b/dygraph-canvas.js @@ -89,11 +89,14 @@ DygraphLayout.prototype._evaluateLimits = function() { axis.yrange = axis.maxyval - axis.minyval; axis.yscale = (axis.yrange != 0 ? 1.0 / axis.yrange : 1.0); - axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval); - axis.ylogscale = (axis.ylogrange != 0 ? 1.0 / axis.ylogrange : 1.0); - if (axis.g.attr_("logscale") && isNaN(axis.ylogrange)) { - axis.g.error('axis ' + i + ' can\'t be displayed in log scale for range [' + - axis.minyval + ' - ' + axis.maxyval + ']'); + if (axis.g.attr_("logscale")) { + axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval); + axis.ylogscale = (axis.ylogrange != 0 ? 1.0 / axis.ylogrange : 1.0); + if (!isFinite(axis.ylogrange) || isNaN(axis.ylogrange)) { + axis.g.error('axis ' + i + ' of graph at ' + axis.g + + ' can\'t be displayed in log scale for range [' + + axis.minyval + ' - ' + axis.maxyval + ']'); + } } } }; -- 2.7.4