* dygraphs.
*/
-/*jshint globalstrict: true */
+var DygraphLayout = (function() {
+
/*global Dygraph:false */
"use strict";
*/
var DygraphLayout = function(dygraph) {
this.dygraph_ = dygraph;
- this.datasets = [];
+ /**
+ * Array of points for each series.
+ *
+ * [series index][row index in series] = |Point| structure,
+ * where series index refers to visible series only, and the
+ * point index is for the reduced set of points for the current
+ * zoom region (including one point just outside the window).
+ * All points in the same row index share the same X value.
+ *
+ * @type {Array.<Array.<Dygraph.PointType>>}
+ */
+ this.points = [];
this.setNames = [];
this.annotations = [];
this.yAxes_ = null;
- this.points = null;
// TODO(danvk): it's odd that xTicks_ and yTicks_ are inputs, but xticks and
// yticks are outputs. Clean this up.
this.yTicks_ = null;
};
-DygraphLayout.prototype.attr_ = function(name) {
- return this.dygraph_.attr_(name);
-};
-
+/**
+ * Add points for a single series.
+ *
+ * @param {string} setname Name of the series.
+ * @param {Array.<Dygraph.PointType>} set_xy Points for the series.
+ */
DygraphLayout.prototype.addDataset = function(setname, set_xy) {
- this.datasets.push(set_xy);
+ this.points.push(set_xy);
this.setNames.push(setname);
};
y: 0
};
- area.w = this.dygraph_.width_ - area.x - this.attr_('rightGap');
+ area.w = this.dygraph_.width_ - area.x - this.dygraph_.getOption('rightGap');
area.h = this.dygraph_.height_;
// Let plugins reserve space.
// 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.
this.annotations = [];
- var parse = this.attr_('xValueParser') || function(x) { return x; };
+ var parse = this.dygraph_.getOption('xValueParser') || function(x) { return x; };
for (var i = 0; i < ann.length; i++) {
var a = {};
if (!ann[i].xval && ann[i].x === undefined) {
- this.dygraph_.error("Annotations must have an 'x' property");
+ console.error("Annotations must have an 'x' property");
return;
}
if (ann[i].icon &&
!(ann[i].hasOwnProperty('width') &&
ann[i].hasOwnProperty('height'))) {
- this.dygraph_.error("Must set width and height when setting " +
- "annotation.icon property");
+ console.error("Must set width and height when setting " +
+ "annotation.icon property");
return;
}
Dygraph.update(a, ann[i]);
};
DygraphLayout.prototype.evaluate = function() {
+ this._xAxis = {};
this._evaluateLimits();
this._evaluateLineCharts();
this._evaluateLineTicks();
DygraphLayout.prototype._evaluateLimits = function() {
var xlimits = this.dygraph_.xAxisRange();
- this.minxval = xlimits[0];
- this.maxxval = xlimits[1];
+ this._xAxis.minval = xlimits[0];
+ this._xAxis.maxval = xlimits[1];
var xrange = xlimits[1] - xlimits[0];
- this.xscale = (xrange !== 0 ? 1 / xrange : 1.0);
+ this._xAxis.scale = (xrange !== 0 ? 1 / xrange : 1.0);
+ if (this.dygraph_.getOptionForAxis("logscale", 'x')) {
+ this._xAxis.xlogrange = Dygraph.log10(this._xAxis.maxval) - Dygraph.log10(this._xAxis.minval);
+ this._xAxis.xlogscale = (this._xAxis.xlogrange !== 0 ? 1.0 / this._xAxis.xlogrange : 1.0);
+ }
for (var i = 0; i < this.yAxes_.length; i++) {
var axis = this.yAxes_[i];
axis.minyval = axis.computedValueRange[0];
axis.yrange = axis.maxyval - axis.minyval;
axis.yscale = (axis.yrange !== 0 ? 1.0 / axis.yrange : 1.0);
- if (axis.g.attr_("logscale")) {
+ if (this.dygraph_.getOption("logscale")) {
axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval);
axis.ylogscale = (axis.ylogrange !== 0 ? 1.0 / axis.ylogrange : 1.0);
if (!isFinite(axis.ylogrange) || isNaN(axis.ylogrange)) {
- axis.g.error('axis ' + i + ' of graph at ' + axis.g +
- ' can\'t be displayed in log scale for range [' +
- axis.minyval + ' - ' + axis.maxyval + ']');
+ console.error('axis ' + i + ' of graph at ' + axis.g +
+ ' can\'t be displayed in log scale for range [' +
+ axis.minyval + ' - ' + axis.maxyval + ']');
}
}
}
};
-DygraphLayout._calcYNormal = function(axis, value, logscale) {
+DygraphLayout.calcXNormal_ = function(value, xAxis, logscale) {
+ if (logscale) {
+ return ((Dygraph.log10(value) - Dygraph.log10(xAxis.minval)) * xAxis.xlogscale);
+ } else {
+ return (value - xAxis.minval) * xAxis.scale;
+ }
+};
+
+/**
+ * @param {DygraphAxisType} axis
+ * @param {number} value
+ * @param {boolean} logscale
+ * @return {number}
+ */
+DygraphLayout.calcYNormal_ = function(axis, value, logscale) {
if (logscale) {
- return 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
+ var x = 1.0 - ((Dygraph.log10(value) - Dygraph.log10(axis.minyval)) * axis.ylogscale);
+ return isFinite(x) ? x : NaN; // shim for v8 issue; see pull request 276
} else {
return 1.0 - ((value - axis.minyval) * axis.yscale);
}
};
DygraphLayout.prototype._evaluateLineCharts = function() {
- var connectSeparated = this.attr_('connectSeparatedPoints');
-
- // series index -> point index in series -> |point| structure
- this.points = new Array(this.datasets.length);
-
- // TODO(bhs): these loops are a hot-spot for high-point-count charts. In fact,
- // on chrome+linux, they are 6 times more expensive than iterating through the
- // points and drawing the lines. The brunt of the cost comes from allocating
- // the |point| structures.
- var boundaryIdStart = this.dygraph_.getLeftBoundary_();
- for (var setIdx = 0; setIdx < this.datasets.length; setIdx++) {
- var dataset = this.datasets[setIdx];
+ var isStacked = this.dygraph_.getOption("stackedGraph");
+ var isLogscaleForX = this.dygraph_.getOptionForAxis("logscale", 'x');
+
+ for (var setIdx = 0; setIdx < this.points.length; setIdx++) {
+ var points = this.points[setIdx];
var setName = this.setNames[setIdx];
+ var connectSeparated = this.dygraph_.getOption('connectSeparatedPoints', setName);
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.
- var seriesPoints = new Array(dataset.length);
-
- for (var j = 0; j < dataset.length; j++) {
- var item = dataset[j];
- var xValue = DygraphLayout.parseFloat_(item[0]);
- var yValue = DygraphLayout.parseFloat_(item[1]);
+ for (var j = 0; j < points.length; j++) {
+ var point = points[j];
// Range from 0-1 where 0 represents left and 1 represents right.
- var xNormal = (xValue - this.minxval) * this.xscale;
+ point.x = DygraphLayout.calcXNormal_(point.xval, this._xAxis, isLogscaleForX);
// Range from 0-1 where 0 represents top and 1 represents bottom
- 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.
- if (connectSeparated && item[1] === null) {
- yValue = null;
+ var yval = point.yval;
+ if (isStacked) {
+ point.y_stacked = DygraphLayout.calcYNormal_(
+ axis, point.yval_stacked, logscale);
+ if (yval !== null && !isNaN(yval)) {
+ yval = point.yval_stacked;
+ }
}
- seriesPoints[j] = {
- x: xNormal,
- y: yNormal,
- xval: xValue,
- yval: yValue,
- name: setName, // TODO(danvk): is this really necessary?
- idx: j + boundaryIdStart
- };
+ if (yval === null) {
+ yval = NaN;
+ if (!connectSeparated) {
+ point.yval = NaN;
+ }
+ }
+ point.y = DygraphLayout.calcYNormal_(axis, yval, logscale);
}
- this.points[setIdx] = seriesPoints;
+ this.dygraph_.dataHandler_.onLineEvaluated(points, axis, logscale);
}
};
-/**
- * Optimized replacement for parseFloat, which was way too slow when almost
- * all values were type number, with few edge cases, none of which were strings.
- */
-DygraphLayout.parseFloat_ = function(val) {
- // parseFloat(null) is NaN
- if (val === null) {
- return NaN;
- }
-
- // 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;
this.xticks = [];
for (i = 0; i < this.xTicks_.length; i++) {
tick = this.xTicks_[i];
label = tick.label;
- pos = this.xscale * (tick.v - this.minxval);
- if ((pos >= 0.0) && (pos <= 1.0)) {
+ pos = this.dygraph_.toPercentXCoord(tick.v);
+ if ((pos >= 0.0) && (pos < 1.0)) {
this.xticks.push([pos, label]);
}
}
tick = axis.ticks[j];
label = tick.label;
pos = this.dygraph_.toPercentYCoord(tick.v, i);
- if ((pos >= 0.0) && (pos <= 1.0)) {
+ if ((pos > 0.0) && (pos <= 1.0)) {
this.yticks.push([i, pos, label]);
}
}
}
};
-
-/**
- * Behaves the same way as PlotKit.Layout, but also copies the errors
- * @private
- */
-DygraphLayout.prototype.evaluateWithError = function() {
- this.evaluate();
- if (!(this.attr_('errorBars') || this.attr_('customBars'))) return;
-
- // Copy over the error terms
- var i = 0; // index in this.points
- for (var setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
- var points = this.points[setIdx];
- var j = 0;
- 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 = DygraphLayout.parseFloat_(item[1]);
-
- if (xv == points[j].xval &&
- yv == points[j].yval) {
- var errorMinus = DygraphLayout.parseFloat_(item[2]);
- var errorPlus = DygraphLayout.parseFloat_(item[3]);
-
- var yv_minus = yv - errorMinus;
- var yv_plus = yv + errorPlus;
- points[j].y_top = DygraphLayout._calcYNormal(axis, yv_minus, logscale);
- points[j].y_bottom = DygraphLayout._calcYNormal(axis, yv_plus, logscale);
- }
- }
- }
-};
-
DygraphLayout.prototype._evaluateAnnotations = function() {
// Add the annotations to the point to which they belong.
// Make a map from (setName, xval) to annotation for quick lookups.
* Convenience function to remove all the data sets from a graph
*/
DygraphLayout.prototype.removeAllDatasets = function() {
- delete this.datasets;
+ delete this.points;
delete this.setNames;
delete this.setPointsLengths;
delete this.setPointsOffsets;
- this.datasets = [];
+ this.points = [];
this.setNames = [];
this.setPointsLengths = [];
this.setPointsOffsets = [];
};
-/**
- * Return a copy of the point at the indicated index, with its yval unstacked.
- * @param int index of point in layout_.points
- */
-DygraphLayout.prototype.unstackPointAtIndex = function(setIdx, row) {
- var point = this.points[setIdx][row];
- // If the point is missing, no unstacking is necessary
- if (!Dygraph.isValidPoint(point)) {
- return point;
- }
-
- // Clone the point since we modify it
- var unstackedPoint = {};
- for (var pt in point) {
- unstackedPoint[pt] = point[pt];
- }
+return DygraphLayout;
- if (!this.attr_("stackedGraph")) {
- return unstackedPoint;
- }
-
- // The unstacked yval is equal to the current yval minus the yval of the
- // next point at the same xval.
- // We need to iterate over setIdx just in case some series have invalid values
- // at current row
- for(setIdx++; setIdx < this.points.length; setIdx++) {
- var nextPoint = this.points[setIdx][row];
- if (nextPoint.xval == point.xval && // should always be true?
- Dygraph.isValidPoint(nextPoint)) {
- unstackedPoint.yval -= nextPoint.yval;
- break; // stop at first valid point
- }
- }
-
- return unstackedPoint;
-};
+})();