return;
}
Dygraph.update(a, ann[i]);
- if (!a.xval) a.xval = parse(a.x);
+ if (!a.xval) a.xval = parse(a.x, this.dygraph_);
this.annotations.push(a);
}
};
DygraphCanvasRenderer.prototype.computeArea_ = function() {
var area = {
// TODO(danvk): per-axis setting.
- x: this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize'),
+ x: 0,
y: 0
};
+ if (this.attr_('drawYAxis')) {
+ area.x = this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize');
+ }
+
area.w = this.width - area.x - this.attr_('rightGap');
- area.h = this.height - this.attr_('axisLabelFontSize') -
- 2 * this.attr_('axisTickSize');
+ area.h = this.height;
+ if (this.attr_('drawXAxis')) {
+ area.h -= this.attr_('axisLabelFontSize') + 2 * this.attr_('axisTickSize');
+ }
// Shrink the drawing area to accomodate additional y-axes.
if (this.dygraph_.numAxes() == 2) {
var ticks = this.layout.yticks;
ctx.save();
ctx.strokeStyle = this.attr_('gridLineColor');
- ctx.lineWidth = this.attr_('axisLineWidth');
+ ctx.lineWidth = this.attr_('gridLineWidth');
for (var i = 0; i < ticks.length; i++) {
// TODO(danvk): allow secondary axes to draw a grid, too.
if (ticks[i][0] != 0) continue;
var ticks = this.layout.xticks;
ctx.save();
ctx.strokeStyle = this.attr_('gridLineColor');
- ctx.lineWidth = this.attr_('axisLineWidth');
+ ctx.lineWidth = this.attr_('gridLineWidth');
for (var i=0; i<ticks.length; i++) {
var x = halfUp(this.area.x + ticks[i][0] * this.area.w);
var y = halfDown(this.area.y + this.area.h);
width: this.attr_('axisLabelWidth') + "px",
overflow: "hidden"
};
- var makeDiv = function(txt) {
+ var makeDiv = function(txt, axis) {
var div = document.createElement("div");
for (var name in labelStyle) {
if (labelStyle.hasOwnProperty(name)) {
div.style[name] = labelStyle[name];
}
}
- div.appendChild(document.createTextNode(txt));
+ var inner_div = document.createElement("div");
+ // TODO(danvk): separate class for secondary y-axis
+ inner_div.className = 'dygraph-axis-label dygraph-axis-label-' + axis;
+ inner_div.appendChild(document.createTextNode(txt));
+ div.appendChild(inner_div);
return div;
};
context.closePath();
context.stroke();
- var label = makeDiv(tick[2]);
+ var label = makeDiv(tick[2], 'y');
var top = (y - this.attr_('axisLabelFontSize') / 2);
if (top < 0) top = 0;
context.closePath();
context.stroke();
- var label = makeDiv(tick[1]);
+ var label = makeDiv(tick[1], 'x');
label.style.textAlign = "center";
label.style.top = (y + this.attr_('axisTickSize')) + 'px';
// TODO(danvk): use this.attr_ for many of these.
var context = this.elementContext;
var fillAlpha = this.attr_('fillAlpha');
- var errorBars = this.attr_("errorBars");
+ var errorBars = this.attr_("errorBars") || this.attr_("customBars");
var fillGraph = this.attr_("fillGraph");
var stackedGraph = this.attr_("stackedGraph");
var stepPlot = this.attr_("stepPlot");
var isIsolated = (!prevX && (j == points.length - 1 ||
!Dygraph.isOK(points[j+1].canvasy)));
- if (!prevX) {
+ if (prevX === null) {
prevX = point.canvasx;
prevY = point.canvasy;
} else {