// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-/**
+/**
* @fileoverview Test cases for drawing lines with missing points.
*
* @author konigsberg@google.com (Robert Konigsberg)
var MissingPointsTestCase = TestCase("missing-points");
-var _origFunc = Dygraph.getContext;
+MissingPointsTestCase._origFunc = Dygraph.getContext;
MissingPointsTestCase.prototype.setUp = function() {
document.body.innerHTML = "<div id='graph'></div>";
Dygraph.getContext = function(canvas) {
- return new Proxy(_origFunc(canvas));
+ return new Proxy(MissingPointsTestCase._origFunc(canvas));
}
};
MissingPointsTestCase.prototype.tearDown = function() {
- Dygraph.getContext = _origFunc;
+ Dygraph.getContext = MissingPointsTestCase._origFunc;
};
MissingPointsTestCase.prototype.testSeparatedPointsDontDraw = function() {
var htx = g.hidden_ctx_;
assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#ff0000'));
assertEquals(0, CanvasAssertions.numLinesDrawn(htx, '#0000ff'));
-}
+};
MissingPointsTestCase.prototype.testSeparatedPointsDontDraw_expanded = function() {
var graph = document.getElementById("graph");
{ strokeStyle: '#0000ff', });
CanvasAssertions.assertLineDrawn(htx, [370, 87], [475, 25],
{ strokeStyle: '#0000ff', });
-}
+};
MissingPointsTestCase.prototype.testSeparatedPointsDontDraw_expanded_connected = function() {
var graph = document.getElementById("graph");
var num_lines = 0;
assertEquals(3, CanvasAssertions.numLinesDrawn(htx, '#0000ff'));
- CanvasAssertions.assertConsecutiveLinesDrawn(htx,
+ CanvasAssertions.assertConsecutiveLinesDrawn(htx,
[[56, 275], [161, 212], [370, 87], [475, 25]],
{ strokeStyle: '#0000ff' });
-}
+};
/**
* At the time of writing this test, the blue series is only points, and not lines.
var htx = g.hidden_ctx_;
assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#0000ff'));
- CanvasAssertions.assertConsecutiveLinesDrawn(htx,
+ CanvasAssertions.assertConsecutiveLinesDrawn(htx,
[[56, 225], [223, 25], [391, 125]],
{ strokeStyle: '#0000ff' });
assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#ff0000'));
- CanvasAssertions.assertConsecutiveLinesDrawn(htx,
+ CanvasAssertions.assertConsecutiveLinesDrawn(htx,
[[140, 275], [307, 125], [475, 225]],
{ strokeStyle: '#ff0000' });
-}
+};
/**
* At the time of writing this test, the blue series is only points, and not lines.
// Blue's lines are consecutive, however.
assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#0000ff'));
- CanvasAssertions.assertConsecutiveLinesDrawn(htx,
+ CanvasAssertions.assertConsecutiveLinesDrawn(htx,
[[56, 244], [149, 181], [242, 118]],
{ strokeStyle: '#0000ff' });
-}
+};
-/* These lines contain awesome powa!
+/* These lines contain awesome powa!
var lines = CanvasAssertions.getLinesDrawn(htx, {strokeStyle: "#0000ff"});
for (var idx = 0; idx < lines.length; idx++) {
var line = lines[idx];
console.log(line[0].args, line[1].args, line[0].properties.strokeStyle);
}
-*/
\ No newline at end of file
+*/
+
+MissingPointsTestCase.prototype.testErrorBarsWithMissingPoints = function() {
+ var data = [
+ [1, [2,1]],
+ [2, [3,1]],
+ [3, null],
+ [4, [5,1]],
+ [5, [4,1]],
+ [6, [null,null]],
+ ];
+ var g = new Dygraph(
+ document.getElementById("graph"),
+ data,
+ {
+ errorBars: true,
+ colors: ['red']
+ }
+ );
+
+ var htx = g.hidden_ctx_;
+
+ assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#ff0000'));
+
+ var p0 = g.toDomCoords(data[0][0], data[0][1][0]);
+ var p1 = g.toDomCoords(data[1][0], data[1][1][0]);
+ var p2 = g.toDomCoords(data[3][0], data[3][1][0]);
+ var p3 = g.toDomCoords(data[4][0], data[4][1][0]);
+ CanvasAssertions.assertConsecutiveLinesDrawn(htx,
+ [p0, p1], { strokeStyle: '#ff0000' });
+ CanvasAssertions.assertConsecutiveLinesDrawn(htx,
+ [p2, p3], { strokeStyle: '#ff0000' });
+};
+
+MissingPointsTestCase.prototype.testErrorBarsWithMissingPointsConnected = function() {
+ var data = [
+ [1, [null,1]],
+ [2, [2,1]],
+ [3, null],
+ [4, [5,1]],
+ [5, [null,null]],
+ [6, [3,1]]
+ ];
+ var g = new Dygraph(
+ document.getElementById("graph"),
+ data,
+ {
+ connectSeparatedPoints: true,
+ drawPoints: true,
+ errorBars: true,
+ colors: ['red']
+ }
+ );
+
+ var htx = g.hidden_ctx_;
+
+ assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#ff0000'));
+
+ var p1 = g.toDomCoords(data[1][0], data[1][1][0]);
+ var p2 = g.toDomCoords(data[3][0], data[3][1][0]);
+ var p3 = g.toDomCoords(data[5][0], data[5][1][0]);
+ CanvasAssertions.assertConsecutiveLinesDrawn(htx,
+ [p1, p2, p3],
+ { strokeStyle: '#ff0000' });
+};
+MissingPointsTestCase.prototype.testCustomBarsWithMissingPoints = function() {
+ var data = [
+ [1, [1,2,3]],
+ [2, [2,3,4]],
+ [3, null],
+ [4, [4,5,6]],
+ [5, [3,4,5]],
+ [6, [null,null,null]],
+ [7, [2,3,4]],
+ [8, [1,2,3]],
+ [9, NaN],
+ [10, [2,3,4]],
+ [11, [3,4,5]],
+ [12, [NaN,NaN,NaN]]
+ ];
+ var g = new Dygraph(
+ document.getElementById("graph"),
+ data,
+ {
+ customBars: true,
+ colors: ['red']
+ }
+ );
+
+ var htx = g.hidden_ctx_;
+
+ assertEquals(4, CanvasAssertions.numLinesDrawn(htx, '#ff0000'));
+
+ var p0 = g.toDomCoords(data[0][0], data[0][1][1]);
+ var p1 = g.toDomCoords(data[1][0], data[1][1][1]);
+ CanvasAssertions.assertLineDrawn(htx, p0, p1, { strokeStyle: '#ff0000' });
+
+ p0 = g.toDomCoords(data[3][0], data[3][1][1]);
+ p1 = g.toDomCoords(data[4][0], data[4][1][1]);
+ CanvasAssertions.assertLineDrawn(htx, p0, p1, { strokeStyle: '#ff0000' });
+
+ p0 = g.toDomCoords(data[6][0], data[6][1][1]);
+ p1 = g.toDomCoords(data[7][0], data[7][1][1]);
+ CanvasAssertions.assertLineDrawn(htx, p0, p1, { strokeStyle: '#ff0000' });;
+
+ p0 = g.toDomCoords(data[9][0], data[9][1][1]);
+ p1 = g.toDomCoords(data[10][0], data[10][1][1]);
+ CanvasAssertions.assertLineDrawn(htx, p0, p1, { strokeStyle: '#ff0000' });
+};
+
+MissingPointsTestCase.prototype.testCustomBarsWithMissingPointsConnected = function() {
+ var data = [
+ [1, [1,null,1]],
+ [2, [1,2,3]],
+ [3, null],
+ [4, [4,5,6]],
+ [5, [null,null,null]],
+ [6, [2,3,4]]
+ ];
+ var g = new Dygraph(
+ document.getElementById("graph"),
+ data,
+ {
+ connectSeparatedPoints: true,
+ drawPoints: true,
+ customBars: true,
+ colors: ['red']
+ }
+ );
+
+ var htx = g.hidden_ctx_;
+
+ assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#ff0000'));
+
+ var p1 = g.toDomCoords(data[1][0], data[1][1][1]);
+ var p2 = g.toDomCoords(data[3][0], data[3][1][1]);
+ var p3 = g.toDomCoords(data[5][0], data[5][1][1]);
+ CanvasAssertions.assertConsecutiveLinesDrawn(htx,
+ [p1, p2, p3],
+ { strokeStyle: '#ff0000' });
+};
+
+MissingPointsTestCase.prototype.testLeftBoundaryWithMisingPoints = function() {
+ var data = [
+ [1, null, 3],
+ [2, 1, null],
+ [3, 0, 5],
+ [4, 2, 1],
+ [5, 4, null],
+ [6, 3, 2]
+ ];
+ var g = new Dygraph(
+ document.getElementById("graph"),
+ data,
+ {
+ connectSeparatedPoints: true,
+ drawPoints: true,
+ colors: ['red','blue']
+ }
+ );
+ g.updateOptions({ dateWindow : [ 2.5, 4.5 ] });
+ assertEquals(1, g.getLeftBoundary_(0));
+ assertEquals(0, g.getLeftBoundary_(1));
+
+ var domX = g.toDomXCoord(1.9);
+ var closestRow = g.findClosestRow(domX);
+ assertEquals(1, closestRow);
+
+ g.setSelection(closestRow);
+ assertEquals(1, g.selPoints_.length);
+ assertEquals(1, g.selPoints_[0].yval);
+
+ g.setSelection(3);
+ assertEquals(2, g.selPoints_.length);
+ assertEquals(g.selPoints_[0].xval, g.selPoints_[1].xval);
+ assertEquals(2, g.selPoints_[0].yval);
+ assertEquals(1, g.selPoints_[1].yval);
+};
+
+// Regression test for issue #411
+MissingPointsTestCase.prototype.testEmptySeries = function() {
+ var graphDiv = document.getElementById("graph");
+ var g = new Dygraph(
+ graphDiv,
+ "Time,Empty Series,Series 1,Series 2\n" +
+ "1381134460,,0,100\n" +
+ "1381134461,,1,99\n" +
+ "1381134462,,2,98\n" +
+ "1381134463,,3,97\n" +
+ "1381134464,,4,96\n" +
+ "1381134465,,5,95\n" +
+ "1381134466,,6,94\n" +
+ "1381134467,,7,93\n" +
+ "1381134468,,8,92\n" +
+ "1381134469,,9,91\n", {
+ visibility: [true, false, true],
+ dateWindow: [1381134465, 1381134467]
+ });
+
+ g.setSelection(6);
+ assertEquals("1381134466: Series 2: 94", Util.getLegend(graphDiv));
+};
projects / dygraphs.git / blobdiff