var h_row;
var h_pts;
- var highlightCallback = function(e, x, pts, row) {
+ var highlightCallback = function(e, x, pts, row) {
+ assertEquals(g, this);
h_row = row;
h_pts = pts;
};
var called = false;
var callback = function() {
+ assertEquals(g, this);
called = true;
};
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, {
- drawPointCallback : callback,
+ drawPointCallback: callback,
});
assertFalse(called);
*/
CallbackTestCase.prototype.testDrawPointCallback_enabled = function() {
var called = false;
+ var callbackThis = null;
var callback = function() {
+ callbackThis = this;
called = true;
};
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, {
- drawPoints : true,
- drawPointCallback : callback
+ drawPoints: true,
+ drawPointCallback: callback
});
assertTrue(called);
+ assertEquals(g, callbackThis);
};
/**
var count = 0;
var callback = function(g, seriesName, canvasContext, cx, cy, color, pointSizeParam) {
+ assertEquals(g, this);
pointSize = pointSizeParam;
count++;
};
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, {
- drawPoints : true,
- drawPointCallback : callback
+ drawPoints: true,
+ drawPointCallback: callback
});
assertEquals(1.5, pointSize);
assertEquals(12, count); // one call per data point.
var g = new Dygraph(graph, data, {
- drawPoints : true,
- drawPointCallback : callback,
- pointSize : 8
+ drawPoints: true,
+ drawPointCallback: callback,
+ pointSize: 8
});
assertEquals(8, pointSize);
var g;
var callback = function(g, seriesName, canvasContext, cx, cy, color, pointSizeParam) {
+ assertEquals(g, this);
var dx = g.toDataXCoord(cx);
xvalues.push(dx);
Dygraph.Circles.DEFAULT.apply(this, arguments);
CallbackTestCase.prototype.testDrawHighlightPointCallbackIsCalled = function() {
var called = false;
- var drawHighlightPointCallback = function() {
+ var drawHighlightPointCallback = function() {
+ assertEquals(g, this);
called = true;
};
var g = new Dygraph(graph, data,
{
width: 100,
- height : 100,
- drawHighlightPointCallback : drawHighlightPointCallback
+ height: 100,
+ drawHighlightPointCallback: drawHighlightPointCallback
});
assertFalse(called);
}
});
- var highlightCallback = function(e, x, pts, row, set) {
+ var highlightCallback = function(e, x, pts, row, set) {
+ assertEquals(g, this);
h_row = row;
h_pts = pts;
h_series = set;
*/
CallbackTestCase.prototype.testClosestPointCallbackCss1 = function() {
var css = "div.dygraph-legend > span { display: block; }\n" +
- "div.dygraph-legend > span.highlight { border: 1px solid grey; }\n";
+ "div.dygraph-legend > span.highlight { border: 1px solid grey; }\n";
this.styleSheet.innerHTML = css;
runClosestTest(false, 2, 4);
this.styleSheet.innerHTML = '';
*/
CallbackTestCase.prototype.testClosestPointCallbackCss2 = function() {
var css = "div.dygraph-legend > span { display: none; }\n" +
- "div.dygraph-legend > span.highlight { display: inline; }\n";
+ "div.dygraph-legend > span.highlight { display: inline; }\n";
this.styleSheet.innerHTML = css;
runClosestTest(false, 10, 15);
this.styleSheet.innerHTML = '';
var h_row;
var h_pts;
- var highlightCallback = function(e, x, pts, row) {
+ var highlightCallback = function(e, x, pts, row) {
+ assertEquals(g, this);
h_row = row;
h_pts = pts;
};
var h_row;
var h_pts;
- var highlightCallback = function(e, x, pts, row) {
+ var highlightCallback = function(e, x, pts, row) {
+ assertEquals(g, this);
h_row = row;
h_pts = pts;
};
assertEquals(1, res.row);
assertEquals('c', res.seriesName);
- // First gap, no data due to NaN contagion.
+ // All-NaN area at left, should get no points.
+ dom = g.toDomCoords(9.1, 0.9);
+ res = g.findStackedPoint(dom[0], dom[1]);
+ assertEquals(0, res.row);
+ assertEquals(undefined, res.seriesName);
+
+ // First gap, get 'c' since it's non-NaN.
dom = g.toDomCoords(12.1, 0.9);
res = g.findStackedPoint(dom[0], dom[1]);
assertEquals(3, res.row);
- assertEquals(undefined, res.seriesName);
+ assertEquals('c', res.seriesName);
- // Second gap, no data due to NaN contagion.
+ // Second gap, get 'b' since 'c' is NaN.
dom = g.toDomCoords(15.1, 0.9);
res = g.findStackedPoint(dom[0], dom[1]);
assertEquals(6, res.row);
- assertEquals(undefined, res.seriesName);
+ assertEquals('b', res.seriesName);
// Isolated points should work, finding series b in this case.
dom = g.toDomCoords(15.9, 3.1);
var h_row;
var h_pts;
- var highlightCallback = function(e, x, pts, row) {
+ var highlightCallback = function(e, x, pts, row) {
+ assertEquals(g, this);
h_row = row;
h_pts = pts;
};
connectSeparatedPoints: true,
drawPoints: true,
labels: ['x', 'A', 'B'],
- highlightCallback : highlightCallback
+ highlightCallback: highlightCallback
});
DygraphOps.dispatchMouseMove(g, 1.1, 10);
CallbackTestCase.prototype.testHighlightCallbackRow = function() {
var highlightRow;
var highlightCallback = function(e, x, pts, row) {
+ assertEquals(g, this);
highlightRow = row;
};
var yMin, yMax;
var callback = function(canvas, area, g) {
+ assertEquals(g, this);
called = true;
yMin = g.yAxisRange(0)[0];
- yMax = g.yAxisRange(0)[0];
+ yMax = g.yAxisRange(0)[1];
};
var graph = document.getElementById("graph");
assertFalse(isNaN(yMin));
assertFalse(isNaN(yMax));
};
+
+/**
+ * Test that underlay callback receives the correct y-axis range.
+ */
+CallbackTestCase.prototype.underlayCallback_yAxisRange = function() {
+ var called = false;
+ var yMin, yMax;
+
+ var callback = function(canvas, area, g) {
+ assertEquals(g, this);
+ yMin = g.yAxisRange(0)[0];
+ yMax = g.yAxisRange(0)[1];
+ };
+
+ var graph = document.getElementById("graph");
+ var g = new Dygraph(graph, "\n", {
+ valueRange: [0,10],
+ underlayCallback: callback
+ });
+
+ assertEquals(0, yMin);
+ assertEquals(10, yMax);
+};
+
+/**
+ * Test that drawPointCallback is called for isolated points and correct idx for the point is returned.
+ */
+CallbackTestCase.prototype.testDrawPointCallback_idx = function() {
+ var indices = [];
+
+ var g;
+ var callback = function(g, seriesName, canvasContext, cx, cy, color, pointSizeParam,idx) {
+ assertEquals(g, this);
+ indices.push(idx);
+ 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 correct idx for isolated points are passed to the callback.
+ g = new Dygraph(graph, testdata, graphOpts);
+ assertEquals(2, indices.length);
+ assertEquals([3, 5],indices);
+
+ // Test that correct indices for isolated points + gap points are passed to the callback when
+ // drawGapEdgePoints 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.
+ indices = []; // Reset for new test
+ graphOpts.drawGapEdgePoints = true;
+ g = new Dygraph(graph, testdata, graphOpts);
+ assertEquals(3, indices.length);
+ assertEquals([1, 3, 5],indices);
+
+
+ //Test that correct indices are passed to the callback when zoomed in.
+ indices = []; // Reset for new test
+ graphOpts.dateWindow = [12.5,13.5]
+ graphOpts.drawPoints = true;
+ testdata = [[10, 2], [11, 3], [12, 4], [13, 2], [14, 5], [15, 3]];
+ g = new Dygraph(graph, testdata, graphOpts);
+ assertEquals(3, indices.length);
+ assertEquals([2, 3, 4],indices);
+};
+
+/**
+ * Test that the correct idx is returned for the point in the onHiglightCallback.
+ */
+CallbackTestCase.prototype.testDrawHighlightPointCallback_idx = function() {
+ var idxToCheck = null;
+
+ var drawHighlightPointCallback = function(g, seriesName, canvasContext, cx, cy, color, pointSizeParam,idx) {
+ assertEquals(g, this);
+ idxToCheck = idx;
+ };
+ var testdata = [[1, 2], [2, 3], [3, NaN], [4, 2], [5, NaN], [6, 3]];
+ var graph = document.getElementById("graph");
+ var g = new Dygraph(graph, testdata,
+ {
+ drawHighlightPointCallback : drawHighlightPointCallback
+ });
+
+ assertNull(idxToCheck);
+ DygraphOps.dispatchMouseMove(g, 3, 0);
+ // check that NaN point is not highlighted
+ assertNull(idxToCheck);
+ DygraphOps.dispatchMouseMove(g, 1, 2);
+ // check that correct index is returned
+ assertEquals(0,idxToCheck);
+ DygraphOps.dispatchMouseMove(g, 6, 3);
+ assertEquals(5,idxToCheck);
+};