};
/**
+ * Test that drawPointCallback is called for isolated points when
+ * drawPoints is false, and also for gap points if that's enabled.
+ */
+CallbackTestCase.prototype.testDrawPointCallback_isolated = function() {
+ var xvalues = [];
+
+ var g;
+ var callback = function(g, seriesName, canvasContext, cx, cy, color, pointSizeParam) {
+ var dx = g.toDataXCoord(cx);
+ xvalues.push(dx);
+ Dygraph.Circles.DEFAULT.apply(this, arguments);
+ };
+
+ var graph = document.getElementById("graph");
+ var testdata = [[10, 2], [11, 3], [12, NaN], [13, 2], [14, NaN], [15, 3]];
+ var graphOpts = {
+ labels: ['X', 'Y'],
+ valueRange: [0, 4],
+ drawPoints : false,
+ drawPointCallback : callback,
+ pointSize : 8
+ };
+
+ // Test that isolated points get drawn
+ g = new Dygraph(graph, testdata, graphOpts);
+ assertEquals(2, xvalues.length);
+ assertEquals(13, xvalues[0]);
+ assertEquals(15, xvalues[1]);
+
+ // Test that isolated points + gap points get drawn when drawGapPoints is set.
+ // This should add one point at the right edge of the segment at x=11, but not
+ // at the graph edge at x=10.
+ xvalues = []; // Reset for new test
+ graphOpts.drawGapPoints = true;
+ g = new Dygraph(graph, testdata, graphOpts);
+ assertEquals(3, xvalues.length);
+ assertEquals(11, xvalues[0]);
+ assertEquals(13, xvalues[1]);
+ assertEquals(15, xvalues[2]);
+};
+
+/**
* This tests that when the function idxToRow_ returns the proper row and the onHiglightCallback
* is properly called when the first series is hidden (setVisibility = false)
*
strokeWidth: widthNormal,
strokeBorderWidth: 2,
highlightCircleSize: widthNormal * 2,
- highlightSeriesBackgroundFade: 0.7,
+ highlightSeriesBackgroundAlpha: 0.3,
highlightSeriesOpts: {
strokeWidth: widthHighlighted,
"div.dygraph-legend > span.highlight { border: 1px solid grey; }\n";
this.styleSheet.innerHTML = css;
runClosestTest(false, 2, 4);
+ this.styleSheet.innerHTML = '';
}
/**
"div.dygraph-legend > span.highlight { display: inline; }\n";
this.styleSheet.innerHTML = css;
runClosestTest(false, 10, 15);
+ this.styleSheet.innerHTML = '';
// TODO(klausw): verify that the highlighted line is drawn on top?
}
+
+/**
+ * This tests that closest point searches work for data containing NaNs.
+ *
+ * It's intended to catch a regression where a NaN Y value confuses the
+ * closest-point algorithm, treating it as closer as any previous point.
+ */
+CallbackTestCase.prototype.testNaNData = function() {
+ var dataNaN = [
+ [9, -1, NaN, NaN],
+ [10, -1, 1, 2],
+ [11, 0, 3, 1],
+ [12, 1, 4, NaN],
+ [13, 0, 2, 3],
+ [14, -1, 1, 4]];
+
+ var h_row;
+ var h_pts;
+
+ var highlightCallback = function(e, x, pts, row) {
+ h_row = row;
+ h_pts = pts;
+ };
+
+ var graph = document.getElementById("graph");
+ var g = new Dygraph(graph, dataNaN,
+ {
+ width: 600,
+ height: 400,
+ labels: ['x', 'a', 'b', 'c'],
+ visibility: [false, true, true],
+ highlightCallback: highlightCallback
+ });
+
+ DygraphOps.dispatchMouseMove(g, 10.1, 0.9);
+ //check correct row is returned
+ assertEquals(1, h_row);
+
+ // Explicitly test closest point algorithms
+ var dom = g.toDomCoords(10.1, 0.9);
+ assertEquals(1, g.findClosestRow(dom[0]));
+
+ var res = g.findClosestPoint(dom[0], dom[1]);
+ assertEquals(1, res.row);
+ assertEquals('b', res.seriesName);
+
+ res = g.findStackedPoint(dom[0], dom[1]);
+ assertEquals(1, res.row);
+ assertEquals('c', res.seriesName);
+};
+
+/**
+ * This tests that stacked point searches work for data containing NaNs.
+ */
+CallbackTestCase.prototype.testNaNDataStack = function() {
+ var dataNaN = [
+ [9, -1, NaN, NaN],
+ [10, -1, 1, 2],
+ [11, 0, 3, 1],
+ [12, 1, NaN, 2],
+ [13, 0, 2, 3],
+ [14, -1, 1, 4],
+ [15, 0, 2, NaN],
+ [16, 1, 1, 3],
+ [17, 1, NaN, 3],
+ [18, 0, 2, 5],
+ [19, 0, 1, 4]];
+
+ var h_row;
+ var h_pts;
+
+ var highlightCallback = function(e, x, pts, row) {
+ h_row = row;
+ h_pts = pts;
+ };
+
+ var graph = document.getElementById("graph");
+ var g = new Dygraph(graph, dataNaN,
+ {
+ width: 600,
+ height: 400,
+ labels: ['x', 'a', 'b', 'c'],
+ visibility: [false, true, true],
+ stackedGraph: true,
+ highlightCallback: highlightCallback
+ });
+
+ DygraphOps.dispatchMouseMove(g, 10.1, 0.9);
+ //check correct row is returned
+ assertEquals(1, h_row);
+
+ // Explicitly test stacked point algorithm.
+ var dom = g.toDomCoords(10.1, 0.9);
+ var res = g.findStackedPoint(dom[0], dom[1]);
+ assertEquals(1, res.row);
+ assertEquals('c', res.seriesName);
+
+ // First gap, no data due to NaN contagion.
+ dom = g.toDomCoords(12.1, 0.9);
+ res = g.findStackedPoint(dom[0], dom[1]);
+ assertEquals(3, res.row);
+ assertEquals(undefined, res.seriesName);
+
+ // Second gap, no data due to NaN contagion.
+ dom = g.toDomCoords(15.1, 0.9);
+ res = g.findStackedPoint(dom[0], dom[1]);
+ assertEquals(6, res.row);
+ assertEquals(undefined, res.seriesName);
+
+ // Isolated points should work, finding series b in this case.
+ dom = g.toDomCoords(15.9, 3.1);
+ res = g.findStackedPoint(dom[0], dom[1]);
+ assertEquals(7, res.row);
+ assertEquals('b', res.seriesName);
+};
+
+CallbackTestCase.prototype.testGapHighlight = function() {
+ var dataGap = [
+ [1, null, 3],
+ [2, 2, null],
+ [3, null, 5],
+ [4, 4, null],
+ [5, null, 7],
+ [6, NaN, null],
+ [8, 8, null],
+ [10, 10, null]];
+
+ var h_row;
+ var h_pts;
+
+ var highlightCallback = function(e, x, pts, row) {
+ h_row = row;
+ h_pts = pts;
+ };
+
+ var graph = document.getElementById("graph");
+ var g = new Dygraph(graph, dataGap, {
+ width: 400,
+ height: 300,
+ //stackedGraph: true,
+ connectSeparatedPoints: true,
+ drawPoints: true,
+ labels: ['x', 'A', 'B'],
+ highlightCallback : highlightCallback
+ });
+
+ DygraphOps.dispatchMouseMove(g, 1.1, 10);
+ //point from series B
+ assertEquals(0, h_row);
+ assertEquals(1, h_pts.length);
+ assertEquals(3, h_pts[0].yval);
+ assertEquals('B', h_pts[0].name);
+
+ DygraphOps.dispatchMouseMove(g, 6.1, 10);
+ // A is NaN at x=6
+ assertEquals(1, h_pts.length);
+ assert(isNaN(h_pts[0].yval));
+ assertEquals('A', h_pts[0].name);
+
+ DygraphOps.dispatchMouseMove(g, 8.1, 10);
+ //point from series A
+ assertEquals(6, h_row);
+ assertEquals(1, h_pts.length);
+ assertEquals(8, h_pts[0].yval);
+ assertEquals('A', h_pts[0].name);
+};
projects / dygraphs.git / blobdiff