var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- assertEqualsDelta([-0.1, -0.08, -0.06, -0.04, -0.02, 0, 0.02, 0.04, 0.06, 0.08],
+ assertEqualsDelta([-0.1,-0.05,0,0.05],
Util.makeNumbers(Util.getYLabels()), this.kCloseFloat);
opts.valueRange = [-0.05, 0.05];
g.updateOptions(opts);
- assertEquals([-0.05, -0.04, -0.03, -0.02, -0.01, 0, 0.01, 0.02, 0.03, 0.04],
+ assertEquals([-0.04,-0.02,0,0.02,0.04],
Util.makeNumbers(Util.getYLabels()));
opts.valueRange = [-0.01, 0.01];
g.updateOptions(opts);
- assertEquals([-0.01, -8.00e-3, -6.00e-3, -4.00e-3, -2.00e-3, 0, 2.00e-3, 4.00e-3, 6.00e-3, 8.00e-3],
+ assertEquals([-0.01,-0.005,0,0.005],
Util.makeNumbers(Util.getYLabels()));
g.setSelection(1);
opts.valueRange = [9.999, 10.001];
g.updateOptions(opts);
// TODO(danvk): this is even worse!
- assertEquals(["10","10","10","10","10","10","10","10","10","10"], Util.getYLabels());
+ assertEquals(["10","10","10","10"], Util.getYLabels());
g.setSelection(1);
assertEquals('1: Y: 0', Util.getLegend());
var g = new Dygraph(graph, data, opts);
assertEquals(['x0','x2','x4','x6','x8'], Util.getXLabels());
- assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
+ assertEquals(["y0","y5","y10","y15"], Util.getYLabels());
g.setSelection(2);
assertEquals("2: y: 4", Util.getLegend());
height: 320,
axes : {
x : {
+ pixelsPerLabel: 60,
axisLabelFormatter : function(x, granularity, opts, dg) {
assertTrue(Dygraph.isDateLike(x));
assertEquals('number', typeof(granularity));
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- assertEquals(["x2011/01/01", "x2011/01/02", "x2011/01/03", "x2011/01/04", "x2011/01/05", "x2011/01/06", "x2011/01/07", "x2011/01/08"], Util.getXLabels());
- assertEquals(['y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
+ assertEquals(["x2011/01/02","x2011/01/04","x2011/01/06","x2011/01/08"], Util.getXLabels());
+ assertEquals(["y5","y10","y15"], Util.getYLabels());
g.setSelection(0);
assertEquals("2011/01/01: y: 2", Util.getLegend());
var opts = {
width: 480,
height: 320,
- axes : {
- x : {
- valueFormatter: function(x, opts, series_name, dg) {
+ axes: {
+ x: {
+ valueFormatter: function(x, opts, series_name, dg, row, col) {
assertEquals('number', typeof(x));
assertEquals('function', typeof(opts));
assertEquals('string', typeof(series_name));
assertEquals('[Dygraph graph]', dg.toString());
+ assertEquals('number', typeof(row));
+ assertEquals('number', typeof(col));
+ assertEquals(dg, this);
return 'x' + x;
}
},
- y : {
- valueFormatter: function(y, opts, series_name, dg) {
+ y: {
+ valueFormatter: function(y, opts, series_name, dg, row, col) {
assertEquals('number', typeof(y));
assertEquals('function', typeof(opts));
assertEquals('string', typeof(series_name));
assertEquals('[Dygraph graph]', dg.toString());
+ assertEquals('number', typeof(row));
+ assertEquals('number', typeof(col));
+ assertEquals(dg, this);
return 'y' + y;
}
}
// the valueFormatter options do not affect the ticks.
assertEquals(['0','2','4','6','8'], Util.getXLabels());
- assertEquals(['0','2','4','6','8','10','12','14','16','18'],
+ assertEquals(["0","5","10","15"],
Util.getYLabels());
// they do affect the legend, however.
height: 320,
axes : {
x : {
- valueFormatter: function(x, opts, series_name, dg) {
+ pixelsPerLabel: 60,
+ valueFormatter: function(x, opts, series_name, dg, row, col) {
assertEquals('number', typeof(x));
assertEquals('function', typeof(opts));
assertEquals('string', typeof(series_name));
assertEquals('[Dygraph graph]', dg.toString());
+ assertEquals('number', typeof(row));
+ assertEquals('number', typeof(col));
+ assertEquals(dg, this);
return 'x' + Util.formatDate(x);
}
},
y : {
- valueFormatter: function(y, opts, series_name, dg) {
+ valueFormatter: function(y, opts, series_name, dg, row, col) {
assertEquals('number', typeof(y));
assertEquals('function', typeof(opts));
assertEquals('string', typeof(series_name));
assertEquals('[Dygraph graph]', dg.toString());
+ assertEquals('number', typeof(row));
+ assertEquals('number', typeof(col));
+ assertEquals(dg, this);
return 'y' + y;
}
}
var g = new Dygraph(graph, data, opts);
// valueFormatters do not affect ticks.
- assertEquals(['01Jan','02Jan','03Jan','04Jan','05Jan','06Jan','07Jan','08Jan'], Util.getXLabels());
- assertEquals(['2','4','6','8','10','12','14','16','18'], Util.getYLabels());
+ assertEquals(["02 Jan","04 Jan","06 Jan","08 Jan"], Util.getXLabels());
+ assertEquals(["5","10","15"], Util.getYLabels());
// the valueFormatter options also affect the legend.
g.setSelection(2);
axes : {
x : {
valueFormatter: function(x) {
+ assertEquals('[Dygraph graph]', this.toString());
return 'xvf' + x;
},
axisLabelFormatter: function(x, granularity) {
+ assertEquals('[Dygraph graph]', this.toString());
return 'x' + x;
}
},
y : {
valueFormatter: function(y) {
+ assertEquals('[Dygraph graph]', this.toString());
return 'yvf' + y;
},
axisLabelFormatter: function(y) {
+ assertEquals('[Dygraph graph]', this.toString());
return 'y' + y;
}
}
var g = new Dygraph(graph, data, opts);
assertEquals(['x0','x2','x4','x6','x8'], Util.getXLabels());
- assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
+ assertEquals(["y0","y5","y10","y15"], Util.getYLabels());
g.setSelection(9);
assertEquals("xvf9: y: yvf18", Util.getLegend());
});
assertEquals(["x0","x2","x4","x6","x8"], Util.getXLabels());
- assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels());
+ assertEquals(["y0","y5","y10","y15"], Util.getYLabels());
g.setSelection(9);
assertEquals("xvf9: y: yvf18", Util.getLegend());
height: 320,
labels: ['x', 'y'],
valueFormatter: function(x) {
+ assertEquals('[Dygraph graph]', this);
return 'vf' + x;
},
axisLabelFormatter: function(x) {
+ assertEquals('[Dygraph graph]', this);
return 'alf' + x;
}
};
var g = new Dygraph(graph, data, opts);
assertEquals(['alf0','alf2','alf4','alf6','alf8'], Util.getXLabels());
- assertEquals(['alf0','alf2','alf4','alf6','alf8','alf10','alf12','alf14','alf16','alf18'], Util.getYLabels());
+ assertEquals(["alf0","alf5","alf10","alf15"], Util.getYLabels());
g.setSelection(9);
assertEquals("vf9: y: vf18", Util.getLegend());
};
+AxisLabelsTestCase.prototype.testValueFormatterParameters = function() {
+ var calls = [];
+ // change any functions in list to 'fn' -- functions can't be asserted.
+ var killFunctions = function(list) {
+ var out = [];
+ for (var i = 0; i < list.length; i++) {
+ if (typeof(list[i]) == 'function') {
+ out[i] = 'fn';
+ } else {
+ out[i] = list[i];
+ }
+ }
+ return out;
+ };
+ var taggedRecorder = function(tag) {
+ return function() {
+ calls.push([tag].concat([this], killFunctions(arguments)));
+ return '';
+ }
+ };
+ var opts = {
+ axes: {
+ x: { valueFormatter: taggedRecorder('x') },
+ y: { valueFormatter: taggedRecorder('y') },
+ y2: { valueFormatter: taggedRecorder('y2') }
+ },
+ series: {
+ 'y1': { axis: 'y1'},
+ 'y2': { axis: 'y2'}
+ },
+ labels: ['x', 'y1', 'y2']
+ };
+ var data = [
+ [0, 1, 2],
+ [1, 3, 4]
+ ];
+ var graph = document.getElementById('graph');
+ var g = new Dygraph(graph, data, opts);
+
+ assertEquals([], calls);
+ g.setSelection(0);
+ assertEquals([
+ // num or millis, opts, series, dygraph, row, col
+ [ 'x', g, 0, 'fn', 'x', g, 0, 0],
+ [ 'y', g, 1, 'fn', 'y1', g, 0, 1],
+ ['y2', g, 2, 'fn', 'y2', g, 0, 2]
+ ], calls);
+
+ calls = [];
+ g.setSelection(1);
+ assertEquals([
+ [ 'x', g, 1, 'fn', 'x', g, 1, 0],
+ [ 'y', g, 3, 'fn', 'y1', g, 1, 1],
+ ['y2', g, 4, 'fn', 'y2', g, 1, 2]
+ ], calls);
+};
+
AxisLabelsTestCase.prototype.testSeriesOrder = function() {
var opts = {
width: 480,
AxisLabelsTestCase.prototype.testLogScale = function() {
var g = new Dygraph("graph", [[0, 5], [1, 1000]], { logscale : true });
var nonEmptyLabels = Util.getYLabels().filter(function(x) { return x.length > 0; });
- assertEquals(["6","10","30","60","100","300","600","1000"], nonEmptyLabels);
+ assertEquals(["5","10","20","50","100","200","500","1000"], nonEmptyLabels);
g.updateOptions({ logscale : false });
assertEquals(['0','200','400','600','800','1000'], Util.getYLabels());
}
});
assertEquals(["0:X","500:X","1000:X","1500:X","2000:X"], Util.getYLabels());
- assertEquals(["1:X","1.5:X","2:X","2.5:X","3:X","3.5:X"], Util.getXLabels());
+ assertEquals(["1:X","2:X","3:X"], Util.getXLabels());
}
/*
// labelsKMB doesn't apply to the x axis. This value should be different.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
- assertEquals(["1000", "1500", "2000", "2500", "3000", "3500"], Util.getXLabels());
+ assertEquals(["1000","2000","3000"], Util.getXLabels());
assertEquals( ["0","500","1000","1500","2000"], Util.getYLabels(1));
assertEquals(["0","500","1K","1.5K","2K"], Util.getYLabels(2));
};
labelsKMG2: false,
axes: {
y2: { labelsKMG2: true },
- x: { labelsKMG2: true }
+ x: { labelsKMG2: true, pixelsPerLabel: 60 }
},
series: {
b: { axis: "y2" }
// Plus I can't be sure they're doing the same thing as they're done in different
// bits of code.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
- assertEquals(["1024","1536","2048","2560","3072","3584"], Util.getXLabels());
+ assertEquals(["1024","2048","3072"], Util.getXLabels());
assertEquals( ["0","500","1000","1500","2000"], Util.getYLabels(1));
assertEquals(["0","500","1000","1.46k","1.95k"], Util.getYLabels(2));
};
});
// sigFigs doesn't apply to the x axis. This value should be different.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
- assertEquals(["1000","1500","2000","2500","3000","3500"], Util.getXLabels());
+ assertEquals(["1000","2000","3000"], Util.getXLabels());
assertEquals(["0.0","5.0e+2","1.0e+3","1.5e+3","2.0e+3"], Util.getYLabels(1));
assertEquals(["0.00000","500.000","1000.00","1500.00","2000.00"], Util.getYLabels(2));
}
// digitsAfterDecimal is ignored for the x-axis.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
g.updateOptions({ axes: { x: { digitsAfterDecimal: 3 }}});
- assertEquals(["0.006","0.006500000000000001","0.007","0.0075","0.008","0.0085"], Util.getXLabels());
+ assertEquals(["0.006","0.007","0.008"], Util.getXLabels());
g.updateOptions({ axes: { x: { digitsAfterDecimal: 4 }}});
- assertEquals(["0.006","0.006500000000000001","0.007","0.0075","0.008","0.0085"], Util.getXLabels());
+ assertEquals(["0.006","0.007","0.008"], Util.getXLabels());
g.updateOptions({ axes: { x: { digitsAfterDecimal: 5 }}});
- assertEquals(["0.006","0.006500000000000001","0.007","0.0075","0.008","0.0085"], Util.getXLabels());
+ assertEquals(["0.006","0.007","0.008"], Util.getXLabels());
g.updateOptions({ axes: { x: { digitsAfterDecimal: null }}});
- assertEquals(["0.006","0.006500000000000001","0.007","0.0075","0.008","0.0085"], Util.getXLabels());
+ assertEquals(["0.006","0.007","0.008"], Util.getXLabels());
}
/**
// maxNumberWidth is ignored for the x-axis.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
g.updateOptions({ axes: { x: { maxNumberWidth: 4 }}});
- assertEquals(["12401","12401.5","12402","12402.5","12403","12403.5"], Util.getXLabels());
+ assertEquals(["12401","12402","12403"], Util.getXLabels());
g.updateOptions({ axes: { x: { maxNumberWidth: 5 }}});
- assertEquals(["12401","12401.5","12402","12402.5","12403","12403.5"], Util.getXLabels());
+ assertEquals(["12401","12402","12403"], Util.getXLabels());
g.updateOptions({ axes: { x: { maxNumberWidth: null }}});
- assertEquals(["12401","12401.5","12402","12402.5","12403","12403.5"], Util.getXLabels());
+ assertEquals(["12401","12402","12403"], Util.getXLabels());
}
/*