DygraphLayout.prototype._evaluateLimits = function() {
this.minxval = this.maxxval = null;
- for (var name in this.datasets) {
- var series = this.datasets[name];
- var x1 = series[0][0];
- if (!this.minxval || x1 < this.minxval) this.minxval = x1;
-
- var x2 = series[series.length - 1][0];
- if (!this.maxxval || x2 > this.maxxval) this.maxxval = x2;
+ if (this.options.dateWindow) {
+ this.minxval = this.options.dateWindow[0];
+ this.maxxval = this.options.dateWindow[1];
+ } else {
+ for (var name in this.datasets) {
+ if (!this.datasets.hasOwnProperty(name)) continue;
+ var series = this.datasets[name];
+ var x1 = series[0][0];
+ if (!this.minxval || x1 < this.minxval) this.minxval = x1;
+
+ var x2 = series[series.length - 1][0];
+ if (!this.maxxval || x2 > this.maxxval) this.maxxval = x2;
+ }
}
this.xrange = this.maxxval - this.minxval;
this.xscale = (this.xrange != 0 ? 1/this.xrange : 1.0);
// add all the rects
this.points = new Array();
for (var setName in this.datasets) {
+ if (!this.datasets.hasOwnProperty(setName)) continue;
+
var dataset = this.datasets[setName];
for (var j = 0; j < dataset.length; j++) {
var item = dataset[j];
var point = {
+ // TODO(danvk): here
x: ((parseFloat(item[0]) - this.minxval) * this.xscale),
y: 1.0 - ((parseFloat(item[1]) - this.minyval) * this.yscale),
xval: parseFloat(item[0]),
if (point.y >= 1.0) {
point.y = 1.0;
}
- if ((point.x >= 0.0) && (point.x <= 1.0)) {
- this.points.push(point);
- }
+ this.points.push(point);
}
}
};
// Copy over the error terms
var i = 0; // index in this.points
for (var setName in this.datasets) {
+ if (!this.datasets.hasOwnProperty(setName)) continue;
var j = 0;
var dataset = this.datasets[setName];
for (var j = 0; j < dataset.length; j++, i++) {
"axisLabelWidth": 50,
"drawYGrid": true,
"drawXGrid": true,
- "gridLineColor": "rgb(128,128,128)"
+ "gridLineColor": "rgb(128,128,128)",
+ "fillAlpha": 0.15,
+ "underlayCallback": null
};
Dygraph.update(this.options, options);
DygraphCanvasRenderer.prototype.render = function() {
// Draw the new X/Y grid
var ctx = this.element.getContext("2d");
+
+ if (this.options.underlayCallback) {
+ this.options.underlayCallback(ctx, this.area, this.layout, this.dygraph_);
+ }
+
if (this.options.drawYGrid) {
var ticks = this.layout.yticks;
ctx.save();
var makeDiv = function(txt) {
var div = document.createElement("div");
for (var name in labelStyle) {
- div.style[name] = labelStyle[name];
+ if (labelStyle.hasOwnProperty(name)) {
+ div.style[name] = labelStyle[name];
+ }
}
div.appendChild(document.createTextNode(txt));
return div;
context.lineWidth = this.options.axisLineWidth;
if (this.options.drawYAxis) {
- if (this.layout.yticks) {
+ if (this.layout.yticks && this.layout.yticks.length > 0) {
for (var i = 0; i < this.layout.yticks.length; i++) {
var tick = this.layout.yticks[i];
if (typeof(tick) == "function") return;
var context = this.element.getContext("2d");
var colorCount = this.options.colorScheme.length;
var colorScheme = this.options.colorScheme;
+ var fillAlpha = this.options.fillAlpha;
var errorBars = this.layout.options.errorBars;
+ var fillGraph = this.layout.options.fillGraph;
+ var stackedGraph = this.layout.options.stackedGraph;
var setNames = [];
- for (var name in this.layout.datasets) setNames.push(name);
+ for (var name in this.layout.datasets) {
+ if (this.layout.datasets.hasOwnProperty(name)) {
+ setNames.push(name);
+ }
+ }
var setCount = setNames.length;
- //Update Points
+ this.colors = {}
+ for (var i = 0; i < setCount; i++) {
+ this.colors[setNames[i]] = colorScheme[i % colorCount];
+ }
+
+ // Update Points
+ // TODO(danvk): here
for (var i = 0; i < this.layout.points.length; i++) {
var point = this.layout.points[i];
point.canvasx = this.area.w * point.x + this.area.x;
var ctx = context;
if (errorBars) {
+ if (fillGraph) {
+ this.dygraph_.warn("Can't use fillGraph option with error bars");
+ }
+
for (var i = 0; i < setCount; i++) {
var setName = setNames[i];
- var color = colorScheme[i % colorCount];
+ var color = this.colors[setName];
// setup graphics context
ctx.save();
- ctx.strokeStyle = color;
- ctx.lineWidth = this.options.strokeWidth;
- var prevX = -1;
+ var prevX = NaN;
var prevYs = [-1, -1];
- var count = 0;
var yscale = this.layout.yscale;
// should be same color as the lines but only 15% opaque.
var rgb = new RGBColor(color);
- var err_color = 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',0.15)';
+ var err_color = 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' +
+ fillAlpha + ')';
ctx.fillStyle = err_color;
ctx.beginPath();
for (var j = 0; j < this.layout.points.length; j++) {
var point = this.layout.points[j];
- count++;
if (point.name == setName) {
- if (!point.y || isNaN(point.y)) {
- prevX = -1;
+ if (!isOK(point.y)) {
+ prevX = NaN;
continue;
}
+ // TODO(danvk): here
var newYs = [ point.y - point.errorPlus * yscale,
point.y + point.errorMinus * yscale ];
newYs[0] = this.area.h * newYs[0] + this.area.y;
newYs[1] = this.area.h * newYs[1] + this.area.y;
- if (prevX >= 0) {
+ if (!isNaN(prevX)) {
+ ctx.moveTo(prevX, prevYs[0]);
+ ctx.lineTo(point.canvasx, newYs[0]);
+ ctx.lineTo(point.canvasx, newYs[1]);
+ ctx.lineTo(prevX, prevYs[1]);
+ ctx.closePath();
+ }
+ prevYs = newYs;
+ prevX = point.canvasx;
+ }
+ }
+ ctx.fill();
+ }
+ } else if (fillGraph) {
+ var axisY = 1.0 + this.layout.minyval * this.layout.yscale;
+ if (axisY < 0.0) axisY = 0.0;
+ else if (axisY > 1.0) axisY = 1.0;
+ axisY = this.area.h * axisY + this.area.y;
+
+ var baseline = [] // for stacked graphs: baseline for filling
+
+ // process sets in reverse order (needed for stacked graphs)
+ for (var i = setCount - 1; i >= 0; i--) {
+ var setName = setNames[i];
+ var color = this.colors[setName];
+
+ // setup graphics context
+ ctx.save();
+ var prevX = NaN;
+ var prevYs = [-1, -1];
+ var yscale = this.layout.yscale;
+ // should be same color as the lines but only 15% opaque.
+ var rgb = new RGBColor(color);
+ var err_color = 'rgba(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ',' +
+ fillAlpha + ')';
+ ctx.fillStyle = err_color;
+ ctx.beginPath();
+ for (var j = 0; j < this.layout.points.length; j++) {
+ var point = this.layout.points[j];
+ if (point.name == setName) {
+ if (!isOK(point.y)) {
+ prevX = NaN;
+ continue;
+ }
+ var newYs;
+ if (stackedGraph) {
+ lastY = baseline[point.canvasx];
+ if (lastY === undefined) lastY = axisY;
+ baseline[point.canvasx] = point.canvasy;
+ newYs = [ point.canvasy, lastY ];
+ } else {
+ newYs = [ point.canvasy, axisY ];
+ }
+ if (!isNaN(prevX)) {
ctx.moveTo(prevX, prevYs[0]);
ctx.lineTo(point.canvasx, newYs[0]);
ctx.lineTo(point.canvasx, newYs[1]);
ctx.lineTo(prevX, prevYs[1]);
ctx.closePath();
}
- prevYs[0] = newYs[0];
- prevYs[1] = newYs[1];
+ prevYs = newYs;
prevX = point.canvasx;
}
}
for (var i = 0; i < setCount; i++) {
var setName = setNames[i];
- var color = colorScheme[i%colorCount];
+ var color = this.colors[setName];
// setup graphics context
context.save();
projects / dygraphs.git / blobdiff