};
DygraphLayout.prototype.getPlotArea = function() {
- return this.computePlotArea_();
+ return this.area_;
};
// Compute the box which the chart should be drawn in. This is the canvas's
// box, less space needed for axis and chart labels.
-DygraphLayout.prototype.computePlotArea_ = function() {
+// NOTE: This should only be called by Dygraph.predraw_().
+DygraphLayout.prototype.computePlotArea = function() {
var area = {
// TODO(danvk): per-axis setting.
x: 0,
};
this.dygraph_.cascadeEvents_('layout', e);
- // Add space for range selector, if needed.
- if (this.attr_('showRangeSelector')) {
- area.h -= this.attr_('rangeSelectorHeight') + 4;
- }
-
- return area;
+ this.area_ = area;
};
DygraphLayout.prototype.setAnnotations = function(ann) {
var parse = this.attr_('xValueParser') || function(x) { return x; };
for (var i = 0; i < ann.length; i++) {
var a = {};
- if (!ann[i].xval && !ann[i].x) {
+ if (!ann[i].xval && ann[i].x === undefined) {
this.dygraph_.error("Annotations must have an 'x' property");
return;
}
}
};
-DygraphLayout._calcYNormal = function(axis, value) {
- if (axis.logscale) {
+DygraphLayout._calcYNormal = function(axis, value, logscale) {
+ if (logscale) {
return 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
} else {
return 1.0 - ((value - axis.minyval) * axis.yscale);
var dataset = this.datasets[setIdx];
var setName = this.setNames[setIdx];
var axis = this.dygraph_.axisPropertiesForSeries(setName);
+ // TODO (konigsberg): use optionsForAxis instead.
+ var logscale = this.dygraph_.attributes_.getForSeries("logscale", setName);
// Preallocating the size of points reduces reallocations, and therefore,
// calls to collect garbage.
// Range from 0-1 where 0 represents left and 1 represents right.
var xNormal = (xValue - this.minxval) * this.xscale;
// Range from 0-1 where 0 represents top and 1 represents bottom
- var yNormal = DygraphLayout._calcYNormal(axis, yValue);
+ var yNormal = DygraphLayout._calcYNormal(axis, yValue, logscale);
// TODO(danvk): drop the point in this case, don't null it.
// The nulls create complexity in DygraphCanvasRenderer._drawSeries.
// Assume it's a number or NaN. If it's something else, I'll be shocked.
return val;
-}
+};
DygraphLayout.prototype._evaluateLineTicks = function() {
var i, tick, label, pos;
var dataset = this.datasets[setIdx];
var setName = this.setNames[setIdx];
var axis = this.dygraph_.axisPropertiesForSeries(setName);
+ // TODO (konigsberg): use optionsForAxis instead.
+ var logscale = this.dygraph_.attributes_.getForSeries("logscale", setName);
+
for (j = 0; j < dataset.length; j++, i++) {
var item = dataset[j];
var xv = DygraphLayout.parseFloat_(item[0]);
var yv_minus = yv - errorMinus;
var yv_plus = yv + errorPlus;
- points[j].y_top = DygraphLayout._calcYNormal(axis, yv_minus);
- points[j].y_bottom = DygraphLayout._calcYNormal(axis, yv_plus);
+ points[j].y_top = DygraphLayout._calcYNormal(axis, yv_minus, logscale);
+ points[j].y_bottom = DygraphLayout._calcYNormal(axis, yv_plus, logscale);
}
}
}
// The unstacked yval is equal to the current yval minus the yval of the
// next point at the same xval.
- var points = this.points[setIdx];
- for (var i = row + 1; i < points.length; i++) {
- if ((points[i].xval == point.xval) && points[i].yval) {
- unstackedPoint.yval -= points[i].yval;
- break;
- }
+ if (setIdx == this.points.length - 1) {
+ // We're the last series, so no unstacking is necessary.
+ return unstackedPoint;
+ }
+
+ var points = this.points[setIdx + 1];
+ if (points[row].xval == point.xval && // should always be true?
+ points[row].yval) {
+ unstackedPoint.yval -= points[row].yval;
}
return unstackedPoint;