From: Robert Konigsberg Date: Fri, 30 Nov 2012 15:27:06 +0000 (-0800) Subject: Merge pull request #184 from kberg/master X-Git-Tag: v1.0.0~156 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=9838afeac7e8e46c5af67c495e73372fa30d668a;hp=d61e06a4eb7282c37589daf3a24090534aff8430;p=dygraphs.git Merge pull request #184 from kberg/master More tests in the new style, add error message that guides users who just add series{} around their series. --- diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html index 0b4dd62..b7d3a0d 100644 --- a/auto_tests/misc/local.html +++ b/auto_tests/misc/local.html @@ -31,6 +31,7 @@ + diff --git a/auto_tests/tests/multiple_axes-old.js b/auto_tests/tests/multiple_axes-old.js new file mode 100644 index 0000000..a0dc8ac --- /dev/null +++ b/auto_tests/tests/multiple_axes-old.js @@ -0,0 +1,311 @@ +/** + * @fileoverview Tests involving multiple y-axes. + * + * @author danvdk@gmail.com (Dan Vanderkam) + */ + +var MultipleAxesOldTestCase = TestCase("multiple-axes-old-tests"); + +MultipleAxesOldTestCase.prototype.setUp = function() { + document.body.innerHTML = "
"; +}; + +MultipleAxesOldTestCase.getData = function() { + var data = []; + for (var i = 1; i <= 100; i++) { + var m = "01", d = i; + if (d > 31) { m = "02"; d -= 31; } + if (m == "02" && d > 28) { m = "03"; d -= 28; } + if (m == "03" && d > 31) { m = "04"; d -= 31; } + if (d < 10) d = "0" + d; + // two series, one with range 1-100, one with range 1-2M + data.push([new Date("2010/" + m + "/" + d), + i, + 100 - i, + 1e6 * (1 + i * (100 - i) / (50 * 50)), + 1e6 * (2 - i * (100 - i) / (50 * 50))]); + } + return data; +}; + +MultipleAxesOldTestCase.prototype.testOldBasicMultipleAxes = function() { + var data = MultipleAxesTestCase.getData(); + + var g = new Dygraph( + document.getElementById("graph"), + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + width: 640, + height: 350, + 'Y3': { + axis: { + // set axis-related properties here + labelsKMB: true + } + }, + 'Y4': { + axis: 'Y3' // use the same y-axis as series Y3 + } + } + ); + + assertEquals(["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"], getYLabelsForAxis("1")); + assertEquals(["900K", "1.01M", "1.12M", "1.23M", "1.34M", "1.45M", "1.55M", "1.66M", "1.77M", "1.88M", "1.99M"], getYLabelsForAxis("2")); +}; + +MultipleAxesOldTestCase.prototype.testOldNewStylePerAxisOptions = function() { + var data = MultipleAxesTestCase.getData(); + + var g = new Dygraph( + document.getElementById("graph"), + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + width: 640, + height: 350, + 'Y3': { + axis: { } + }, + 'Y4': { + axis: 'Y3' // use the same y-axis as series Y3 + }, + axes: { + y2: { + labelsKMB: true + } + } + } + ); + + assertEquals(["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"], getYLabelsForAxis("1")); + assertEquals(["900K", "1.01M", "1.12M", "1.23M", "1.34M", "1.45M", "1.55M", "1.66M", "1.77M", "1.88M", "1.99M"], getYLabelsForAxis("2")); +}; + +MultipleAxesOldTestCase.prototype.testOldMultiAxisLayout = function() { + var data = MultipleAxesTestCase.getData(); + + var el = document.getElementById("graph"); + + var g = new Dygraph( + el, + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + width: 640, + height: 350, + 'Y3': { + axis: { } + }, + 'Y4': { + axis: 'Y3' // use the same y-axis as series Y3 + }, + axes: { + y2: { + labelsKMB: true + } + } + } + ); + + // Test that all elements are inside the bounds of the graph, set above + var innerDiv = el.firstChild; + for (var child = innerDiv.firstChild; child != null; child = child.nextSibling) { + assertTrue(child.offsetLeft >= 0); + assertTrue((child.offsetLeft + child.offsetWidth) <= 640); + assertTrue(child.offsetTop >= 0); + // TODO(flooey@google.com): Text sometimes linebreaks, + // causing the labels to appear outside the allocated area. + // assertTrue((child.offsetTop + child.offsetHeight) <= 350); + } +}; + +MultipleAxesOldTestCase.prototype.testOldTwoAxisVisibility = function() { + var data = []; + data.push([0,0,0]); + data.push([1,2,2000]); + data.push([2,4,1000]); + + var g = new Dygraph( + document.getElementById("graph"), + data, + { + labels: [ 'X', 'bar', 'zot' ], + 'zot': { + axis: { + labelsKMB: true + } + } + } + ); + + assertTrue(document.getElementsByClassName("dygraph-axis-label-y").length > 0); + assertTrue(document.getElementsByClassName("dygraph-axis-label-y2").length > 0); + + g.setVisibility(0, false); + + assertTrue(document.getElementsByClassName("dygraph-axis-label-y").length > 0); + assertTrue(document.getElementsByClassName("dygraph-axis-label-y2").length > 0); + + g.setVisibility(0, true); + g.setVisibility(1, false); + + assertTrue(document.getElementsByClassName("dygraph-axis-label-y").length > 0); + assertTrue(document.getElementsByClassName("dygraph-axis-label-y2").length > 0); +}; + +// verifies that all four chart labels (title, x-, y-, y2-axis label) can be +// used simultaneously. +MultipleAxesOldTestCase.prototype.testOldMultiChartLabels = function() { + var data = MultipleAxesTestCase.getData(); + + var el = document.getElementById("graph"); + el.style.border = '1px solid black'; + el.style.marginLeft = '200px'; + el.style.marginTop = '200px'; + + var g = new Dygraph( + el, + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + width: 640, + height: 350, + 'Y3': { + axis: { } + }, + 'Y4': { + axis: 'Y3' // use the same y-axis as series Y3 + }, + xlabel: 'x-axis', + ylabel: 'y-axis', + y2label: 'y2-axis', + title: 'Chart title' + } + ); + + assertEquals(["Chart title", "x-axis", "y-axis", "y2-axis"], + getClassTexts("dygraph-label")); + assertEquals(["Chart title"], getClassTexts("dygraph-title")); + assertEquals(["x-axis"], getClassTexts("dygraph-xlabel")); + assertEquals(["y-axis"], getClassTexts("dygraph-ylabel")); + assertEquals(["y2-axis"], getClassTexts("dygraph-y2label")); + + // TODO(danvk): check relative positioning here: title on top, y left of y2. +}; + +// Check that a chart w/o a secondary y-axis will not get a y2label, even if one +// is specified. +MultipleAxesOldTestCase.prototype.testOldNoY2LabelWithoutSecondaryAxis = function() { + var g = new Dygraph( + document.getElementById("graph"), + MultipleAxesTestCase.getData(), + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + width: 640, + height: 350, + xlabel: 'x-axis', + ylabel: 'y-axis', + y2label: 'y2-axis', + title: 'Chart title' + } + ); + + assertEquals(["Chart title", "x-axis", "y-axis"], + getClassTexts("dygraph-label")); + assertEquals(["Chart title"], getClassTexts("dygraph-title")); + assertEquals(["x-axis"], getClassTexts("dygraph-xlabel")); + assertEquals(["y-axis"], getClassTexts("dygraph-ylabel")); + assertEquals([], getClassTexts("dygraph-y2label")); +}; + +MultipleAxesOldTestCase.prototype.testOldValueRangePerAxisOptions = function() { + var data = MultipleAxesTestCase.getData(); + + g = new Dygraph( + document.getElementById("graph"), + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + 'Y3': { + axis: { + } + }, + 'Y4': { + axis: 'Y3' // use the same y-axis as series Y3 + }, + axes: { + y: { + valueRange: [40, 70] + }, + y2: { + // set axis-related properties here + labelsKMB: true + } + }, + ylabel: 'Primary y-axis', + y2label: 'Secondary y-axis', + yAxisLabelWidth: 60 + } + ); + assertEquals(["40", "45", "50", "55", "60", "65"], getYLabelsForAxis("1")); + assertEquals(["900K","1.1M","1.3M","1.5M","1.7M","1.9M"], getYLabelsForAxis("2")); + + g.updateOptions( + { + axes: { + y: { + valueRange: [40, 80] + }, + y2: { + valueRange: [1e6, 1.2e6] + } + } + } + ); + assertEquals(["40", "45", "50", "55", "60", "65", "70", "75"], getYLabelsForAxis("1")); + assertEquals(["1M", "1.02M", "1.05M", "1.08M", "1.1M", "1.13M", "1.15M", "1.18M"], getYLabelsForAxis("2")); +}; + +MultipleAxesOldTestCase.prototype.testOldDrawPointCallback = function() { + var data = MultipleAxesTestCase.getData(); + + var results = { y : {}, y2 : {}}; + var firstCallback = function(g, seriesName, ctx, canvasx, canvasy, color, radius) { + results.y[seriesName] = 1; + Dygraph.Circles.DEFAULT(g, seriesName, ctx, canvasx, canvasy, color, radius); + + }; + var secondCallback = function(g, seriesName, ctx, canvasx, canvasy, color, radius) { + results.y2[seriesName] = 1; + Dygraph.Circles.TRIANGLE(g, seriesName, ctx, canvasx, canvasy, color, radius); + }; + + g = new Dygraph( + document.getElementById("graph"), + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + drawPoints : true, + pointSize : 3, + 'Y3': { + axis: { + } + }, + 'Y4': { + axis: 'Y3' // use the same y-axis as series Y3 + }, + axes: { + y2: { + drawPointCallback: secondCallback + } + }, + drawPointCallback: firstCallback + } + ); + + assertEquals(1, results.y["Y1"]); + assertEquals(1, results.y["Y2"]); + assertEquals(1, results.y2["Y3"]); + assertEquals(1, results.y2["Y4"]); +}; diff --git a/auto_tests/tests/multiple_axes.js b/auto_tests/tests/multiple_axes.js index d08ff50..39ec8b1 100644 --- a/auto_tests/tests/multiple_axes.js +++ b/auto_tests/tests/multiple_axes.js @@ -63,40 +63,17 @@ MultipleAxesTestCase.prototype.testBasicMultipleAxes = function() { labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], width: 640, height: 350, - 'Y3': { - axis: { - // set axis-related properties here - labelsKMB: true + series : { + 'Y3': { + axis: 'y2' + }, + 'Y4': { + axis: 'y2' } }, - 'Y4': { - axis: 'Y3' // use the same y-axis as series Y3 - } - } - ); - - assertEquals(["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"], getYLabelsForAxis("1")); - assertEquals(["900K", "1.01M", "1.12M", "1.23M", "1.34M", "1.45M", "1.55M", "1.66M", "1.77M", "1.88M", "1.99M"], getYLabelsForAxis("2")); -}; - -MultipleAxesTestCase.prototype.testNewStylePerAxisOptions = function() { - var data = MultipleAxesTestCase.getData(); - - var g = new Dygraph( - document.getElementById("graph"), - data, - { - labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], - width: 640, - height: 350, - 'Y3': { - axis: { } - }, - 'Y4': { - axis: 'Y3' // use the same y-axis as series Y3 - }, - axes: { - y2: { + axes : { + y2 : { + // set axis-related properties here labelsKMB: true } } @@ -107,44 +84,6 @@ MultipleAxesTestCase.prototype.testNewStylePerAxisOptions = function() { assertEquals(["900K", "1.01M", "1.12M", "1.23M", "1.34M", "1.45M", "1.55M", "1.66M", "1.77M", "1.88M", "1.99M"], getYLabelsForAxis("2")); }; -MultipleAxesTestCase.prototype.testMultiAxisLayout = function() { - var data = MultipleAxesTestCase.getData(); - - var el = document.getElementById("graph"); - - var g = new Dygraph( - el, - data, - { - labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], - width: 640, - height: 350, - 'Y3': { - axis: { } - }, - 'Y4': { - axis: 'Y3' // use the same y-axis as series Y3 - }, - axes: { - y2: { - labelsKMB: true - } - } - } - ); - - // Test that all elements are inside the bounds of the graph, set above - var innerDiv = el.firstChild; - for (var child = innerDiv.firstChild; child != null; child = child.nextSibling) { - assertTrue(child.offsetLeft >= 0); - assertTrue((child.offsetLeft + child.offsetWidth) <= 640); - assertTrue(child.offsetTop >= 0); - // TODO(flooey@google.com): Text sometimes linebreaks, - // causing the labels to appear outside the allocated area. - // assertTrue((child.offsetTop + child.offsetHeight) <= 350); - } -}; - MultipleAxesTestCase.prototype.testTwoAxisVisibility = function() { var data = []; data.push([0,0,0]); @@ -156,8 +95,13 @@ MultipleAxesTestCase.prototype.testTwoAxisVisibility = function() { data, { labels: [ 'X', 'bar', 'zot' ], - 'zot': { - axis: { + series : { + zot : { + axis : 'y2' + } + }, + axes : { + y2: { labelsKMB: true } } @@ -196,11 +140,13 @@ MultipleAxesTestCase.prototype.testMultiChartLabels = function() { labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], width: 640, height: 350, - 'Y3': { - axis: { } - }, - 'Y4': { - axis: 'Y3' // use the same y-axis as series Y3 + series : { + 'Y3': { + axis: 'y2' + }, + 'Y4': { + axis: 'y2' + } }, xlabel: 'x-axis', ylabel: 'y-axis', @@ -252,13 +198,14 @@ MultipleAxesTestCase.prototype.testValueRangePerAxisOptions = function() { data, { labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], - 'Y3': { - axis: { + series : { + 'Y3': { + axis: 'y2' + }, + 'Y4': { + axis: 'y2' } }, - 'Y4': { - axis: 'Y3' // use the same y-axis as series Y3 - }, axes: { y: { valueRange: [40, 70] @@ -313,13 +260,14 @@ MultipleAxesTestCase.prototype.testDrawPointCallback = function() { labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], drawPoints : true, pointSize : 3, - 'Y3': { - axis: { + series : { + 'Y3': { + axis: 'y2' + }, + 'Y4': { + axis: 'y2' } }, - 'Y4': { - axis: 'Y3' // use the same y-axis as series Y3 - }, axes: { y2: { drawPointCallback: secondCallback diff --git a/auto_tests/tests/per_series.js b/auto_tests/tests/per_series.js index 8d81c7b..ab52add 100644 --- a/auto_tests/tests/per_series.js +++ b/auto_tests/tests/per_series.js @@ -146,3 +146,21 @@ perSeriesTestCase.prototype.testAxisInNewSeries_withAxes = function() { assertEquals(6, g.getOption("pointSize", "D")); assertEquals(7, g.getOption("pointSize", "E")); }; + +// TODO(konigsberg): move to multiple_axes.js +perSeriesTestCase.prototype.testOldAxisSpecInNewSeriesThrows = function() { + var opts = { + series : { + D : { axis : {} }, + }, + }; + var graph = document.getElementById("graph"); + var data = "X,A,B,C,D,E\n0,1,2,3,4,5\n"; + try { + new Dygraph(graph, data, opts); + } catch(e) { + assertEquals( + "Using objects for axis specification is not supported inside the 'series' option.", + e); + } +} diff --git a/dygraph-options.js b/dygraph-options.js index f734c5d..8352d32 100644 --- a/dygraph-options.js +++ b/dygraph-options.js @@ -72,6 +72,10 @@ DygraphOptions.axisToIndex_ = function(axis) { } throw "Dygraphs only supports two y-axes, indexed from 0-1." } + if (typeof(axis) == "object") { + throw "Using objects for axis specification " + + "is not supported inside the 'series' option."; + } if (axis) { throw "Unknown axis : " + axis; } @@ -157,15 +161,11 @@ DygraphOptions.prototype.reparseSeries = function() { } } } else { - var maxYAxis = 0; - for (var idx = 0; idx < this.labels.length; idx++) { var seriesName = this.labels[idx]; var optionsForSeries = this.user_.series[seriesName] || {}; var yAxis = DygraphOptions.axisToIndex_(optionsForSeries["axis"]); - maxYAxis = Math.max(yAxis, maxYAxis); - this.series_[seriesName] = { idx: idx, yAxis: yAxis,