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);
}
}
};
"drawXGrid": true,
"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 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) {
}
var setCount = setNames.length;
+ 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++) {
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);
ctx.beginPath();
for (var j = 0; j < this.layout.points.length; j++) {
var point = this.layout.points[j];
- count++;
if (point.name == setName) {
if (!isOK(point.y)) {
- prevX = -1;
+ prevX = NaN;
continue;
}
// TODO(danvk): here
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[0] = newYs[0];
- prevYs[1] = newYs[1];
+ prevYs = newYs;
prevX = point.canvasx;
}
}
ctx.fill();
}
} else if (fillGraph) {
- // TODO(danvk): merge this code with the logic above; they're very similar.
- for (var i = 0; i < setCount; i++) {
+ 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 setNameLast;
- if (i>0) setNameLast = setNames[i-1];
- 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);
ctx.beginPath();
for (var j = 0; j < this.layout.points.length; j++) {
var point = this.layout.points[j];
- count++;
if (point.name == setName) {
if (!isOK(point.y)) {
- prevX = -1;
+ prevX = NaN;
continue;
}
- var pX = 1.0 + this.layout.minyval * this.layout.yscale;
- if (pX < 0.0) pX = 0.0;
- else if (pX > 1.0) pX = 1.0;
- var newYs = [ point.y, pX ];
- newYs[0] = this.area.h * newYs[0] + this.area.y;
- newYs[1] = this.area.h * newYs[1] + this.area.y;
- if (prevX >= 0) {
+ 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();