-// Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
-// All Rights Reserved.
+/**
+ * @license
+ * Copyright 2011 Dan Vanderkam (danvdk@gmail.com)
+ * MIT-licensed (http://opensource.org/licenses/MIT)
+ */
/**
* @fileoverview Based on PlotKitLayout, but modified to meet the needs of
this.datasets[setname] = set_xy;
};
+DygraphLayout.prototype.getPlotArea = function() {
+ return this.computePlotArea_();
+}
+
+// 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() {
+ var area = {
+ // TODO(danvk): per-axis setting.
+ x: 0,
+ y: 0
+ };
+ if (this.attr_('drawYAxis')) {
+ area.x = this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize');
+ }
+
+ area.w = this.dygraph_.width_ - area.x - this.attr_('rightGap');
+ area.h = this.dygraph_.height_;
+ if (this.attr_('drawXAxis')) {
+ if (this.attr_('xAxisHeight')) {
+ area.h -= this.attr_('xAxisHeight');
+ } else {
+ area.h -= this.attr_('axisLabelFontSize') + 2 * this.attr_('axisTickSize');
+ }
+ }
+
+ // Shrink the drawing area to accomodate additional y-axes.
+ if (this.dygraph_.numAxes() == 2) {
+ // TODO(danvk): per-axis setting.
+ area.w -= (this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize'));
+ } else if (this.dygraph_.numAxes() > 2) {
+ this.dygraph_.error("Only two y-axes are supported at this time. (Trying " +
+ "to use " + this.dygraph_.numAxes() + ")");
+ }
+
+ // Add space for chart labels: title, xlabel and ylabel.
+ if (this.attr_('title')) {
+ area.h -= this.attr_('titleHeight');
+ area.y += this.attr_('titleHeight');
+ }
+ if (this.attr_('xlabel')) {
+ area.h -= this.attr_('xLabelHeight');
+ }
+ if (this.attr_('ylabel')) {
+ // It would make sense to shift the chart here to make room for the y-axis
+ // label, but the default yAxisLabelWidth is large enough that this results
+ // in overly-padded charts. The y-axis label should fit fine. If it
+ // doesn't, the yAxisLabelWidth option can be increased.
+ }
+
+ // Add space for range selector, if needed.
+ if (this.attr_('showRangeSelector')) {
+ area.h -= this.attr_('rangeSelectorHeight') + 4;
+ }
+
+ return area;
+};
+
DygraphLayout.prototype.setAnnotations = function(ann) {
// The Dygraph object's annotations aren't parsed. We parse them here and
// save a copy. If there is no parser, then the user must be using raw format.
if (series.length > 1) {
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;
}
}
};
+DygraphLayout._calcYNormal = function(axis, value) {
+ if (axis.logscale) {
+ return 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
+ } else {
+ return 1.0 - ((value - axis.minyval) * axis.yscale);
+ }
+};
+
DygraphLayout.prototype._evaluateLineCharts = function() {
// add all the rects
this.points = new Array();
// An array to keep track of how many points will be drawn for each set.
// This will allow for the canvas renderer to not have to check every point
- // for every data set since the points are added in order of the sets in datasets
+ // for every data set since the points are added in order of the sets in
+ // datasets.
this.setPointsLengths = new Array();
for (var setName in this.datasets) {
var dataset = this.datasets[setName];
var axis = this.dygraph_.axisPropertiesForSeries(setName);
- var graphWidth = this.dygraph_.width_;
- var graphHeight = this.dygraph_.height_;
- var prevXPx = NaN;
- var prevYPx = NaN;
- var currXPx = NaN;
- var currYPx = NaN;
var setPointsLength = 0;
- // Ignore the pixel skipping optimization if there are error bars.
- var skip_opt = (this.attr_("errorBars") ||
- this.attr_("customBars") ||
- this.annotations.length > 0);
-
for (var j = 0; j < dataset.length; j++) {
var item = dataset[j];
var xValue = parseFloat(dataset[j][0]);
var yValue = parseFloat(dataset[j][1]);
- // Range from 0-1 where 0 represents top and 1 represents bottom
- var xNormal = (xValue - this.minxval) * this.xscale;
// Range from 0-1 where 0 represents left and 1 represents right.
- var yNormal;
- if (axis.logscale) {
- yNormal = 1.0 - ((Dygraph.log10(yValue) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
- } else {
- yNormal = 1.0 - ((yValue - axis.minyval) * axis.yscale);
- }
-
- // Current pixel coordinates that the data point would fill.
- currXPx = Math.round(xNormal * graphWidth);
- currYPx = Math.round(yNormal * graphHeight);
-
- // Skip over pushing points that lie on the same pixel.
- // TODO(antrob): optimize this for graphs with error bars.
- if (skip_opt || prevXPx != currXPx || prevYPx != currYPx) {
- var point = {
- // TODO(danvk): here
- x: xNormal,
- y: yNormal,
- xval: xValue,
- yval: yValue,
- name: setName
- };
- this.points.push(point);
- setPointsLength += 1;
- }
- prevXPx = currXPx;
- prevYPx = currYPx;
+ 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 point = {
+ // TODO(danvk): here
+ x: xNormal,
+ y: yNormal,
+ xval: xValue,
+ yval: yValue,
+ name: setName
+ };
+ this.points.push(point);
+ setPointsLength += 1;
}
this.setPointsLengths.push(setPointsLength);
}
if (!this.datasets.hasOwnProperty(setName)) continue;
var j = 0;
var dataset = this.datasets[setName];
+ var axis = this.dygraph_.axisPropertiesForSeries(setName);
for (var j = 0; j < dataset.length; j++, i++) {
var item = dataset[j];
var xv = parseFloat(item[0]);
if (xv == this.points[i].xval &&
yv == this.points[i].yval) {
- this.points[i].errorMinus = parseFloat(item[2]);
- this.points[i].errorPlus = parseFloat(item[3]);
+ var errorMinus = parseFloat(item[2]);
+ var errorPlus = parseFloat(item[3]);
+
+ var yv_minus = yv - errorMinus;
+ var yv_plus = yv + errorPlus;
+ this.points[i].y_top = DygraphLayout._calcYNormal(axis, yv_minus);
+ this.points[i].y_bottom = DygraphLayout._calcYNormal(axis, yv_plus);
}
}
}
if (!this.annotations || !this.annotations.length) {
return;
}
-
+
// TODO(antrob): loop through annotations not points.
for (var i = 0; i < this.points.length; i++) {
var p = this.points[i];
*/
DygraphLayout.prototype.unstackPointAtIndex = function(idx) {
var point = this.points[idx];
-
+
// Clone the point since we modify it
- var unstackedPoint = {};
+ var unstackedPoint = {};
for (var i in point) {
unstackedPoint[i] = point[i];
}
-
+
if (!this.attr_("stackedGraph")) {
return unstackedPoint;
}
-
- // The unstacked yval is equal to the current yval minus the yval of the
+
+ // The unstacked yval is equal to the current yval minus the yval of the
// next point at the same xval.
for (var i = idx+1; i < this.points.length; i++) {
if (this.points[i].xval == point.xval) {
- unstackedPoint.yval -= this.points[i].yval;
+ unstackedPoint.yval -= this.points[i].yval;
break;
}
}
-
+
return unstackedPoint;
-}
+}