X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fmultiple_axes.js;h=a995ecaa4709edb93791a9fb9b64086e296a0e3a;hb=e0269a3d8b5b65fecc93226ffbb2f429a8951997;hp=829e9968127df61572693ff5f8049b458c9df41c;hpb=48e614acf3084b9836803f8b014bf0e65f1ca119;p=dygraphs.git diff --git a/auto_tests/tests/multiple_axes.js b/auto_tests/tests/multiple_axes.js index 829e996..a995eca 100644 --- a/auto_tests/tests/multiple_axes.js +++ b/auto_tests/tests/multiple_axes.js @@ -10,20 +10,6 @@ MultipleAxesTestCase.prototype.setUp = function() { document.body.innerHTML = "
"; }; -function getYLabelsForAxis(axis_num) { - var y_labels = document.getElementsByClassName("dygraph-axis-label-y" + axis_num); - var ary = []; - for (var i = 0; i < y_labels.length; i++) { - ary.push(y_labels[i].innerHTML); - } - return ary; -} - -function getLegend() { - var legend = document.getElementsByClassName("dygraph-legend")[0]; - return legend.textContent; -} - MultipleAxesTestCase.getData = function() { var data = []; for (var i = 1; i <= 100; i++) { @@ -45,53 +31,253 @@ MultipleAxesTestCase.getData = function() { MultipleAxesTestCase.prototype.testBasicMultipleAxes = function() { var data = MultipleAxesTestCase.getData(); - g = new Dygraph( + var g = new Dygraph( document.getElementById("graph"), data, { labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], width: 640, height: 350, - 'Y3': { - axis: { + series : { + 'Y3': { + axis: 'y2' + }, + 'Y4': { + axis: 'y2' + } + }, + axes : { + y2 : { // set axis-related properties here labelsKMB: true } + } + } + ); + + assertEquals(["0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"], Util.getYLabels("1")); + assertEquals(["900K", "1.01M", "1.12M", "1.23M", "1.34M", "1.45M", "1.55M", "1.66M", "1.77M", "1.88M", "1.99M"], Util.getYLabels("2")); +}; + +MultipleAxesTestCase.prototype.testTwoAxisVisibility = 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' ], + series : { + zot : { + axis : 'y2' + } }, - '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")); + 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); }; -MultipleAxesTestCase.prototype.testNewStylePerAxisOptions = function() { +// verifies that all four chart labels (title, x-, y-, y2-axis label) can be +// used simultaneously. +MultipleAxesTestCase.prototype.testMultiChartLabels = function() { var data = MultipleAxesTestCase.getData(); - g = new Dygraph( - document.getElementById("graph"), + 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: { } + series : { + 'Y3': { + axis: 'y2' + }, + 'Y4': { + axis: 'y2' + } }, - '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"], + Util.getClassTexts("dygraph-label")); + assertEquals(["Chart title"], Util.getClassTexts("dygraph-title")); + assertEquals(["x-axis"], Util.getClassTexts("dygraph-xlabel")); + assertEquals(["y-axis"], Util.getClassTexts("dygraph-ylabel")); + assertEquals(["y2-axis"], Util.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. +MultipleAxesTestCase.prototype.testNoY2LabelWithoutSecondaryAxis = 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"], + Util.getClassTexts("dygraph-label")); + assertEquals(["Chart title"], Util.getClassTexts("dygraph-title")); + assertEquals(["x-axis"], Util.getClassTexts("dygraph-xlabel")); + assertEquals(["y-axis"], Util.getClassTexts("dygraph-ylabel")); + assertEquals([], Util.getClassTexts("dygraph-y2label")); +}; + +MultipleAxesTestCase.prototype.testValueRangePerAxisOptions = function() { + var data = MultipleAxesTestCase.getData(); + + g = new Dygraph( + document.getElementById("graph"), + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + series : { + 'Y3': { + axis: 'y2' + }, + 'Y4': { + axis: 'y2' + } }, 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"], Util.getYLabels("1")); + assertEquals(["900K","1.1M","1.3M","1.5M","1.7M","1.9M"], Util.getYLabels("2")); + + g.updateOptions( + { + axes: { + y: { + valueRange: [40, 80] + }, + y2: { + valueRange: [1e6, 1.2e6] + } + } + } + ); + assertEquals(["40", "45", "50", "55", "60", "65", "70", "75"], Util.getYLabels("1")); + assertEquals(["1M", "1.02M", "1.05M", "1.08M", "1.1M", "1.13M", "1.15M", "1.18M"], Util.getYLabels("2")); +}; + +MultipleAxesTestCase.prototype.testDrawPointCallback = 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.DEFAULT(g, seriesName, ctx, canvasx, canvasy, color, radius); + }; + + g = new Dygraph( + document.getElementById("graph"), + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + drawPoints : true, + pointSize : 3, + series : { + 'Y3': { + axis: 'y2' + }, + 'Y4': { + axis: 'y2' + } + }, + 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"]); +}; + +// Test for http://code.google.com/p/dygraphs/issues/detail?id=436 +MultipleAxesTestCase.prototype.testRemovingSecondAxis = function() { + var data = MultipleAxesTestCase.getData(); + + var results = { y : {}, y2 : {}}; + + g = new Dygraph( + document.getElementById("graph"), + data, + { + labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ], + drawPoints : true, + pointSize : 3, + series : { + 'Y4': { + axis: 'y2' + } + }, } ); - 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")); + g.updateOptions({ series : { Y4 : { axis : 'y' } } }); };