var DygraphLayout = function(dygraph) {
this.dygraph_ = dygraph;
this.datasets = [];
+ this.setNames = [];
this.annotations = [];
this.yAxes_ = null;
};
DygraphLayout.prototype.addDataset = function(setname, set_xy) {
- this.datasets[setname] = set_xy;
+ this.datasets.push(set_xy);
+ this.setNames.push(setname);
};
DygraphLayout.prototype.getPlotArea = function() {
area.w = this.dygraph_.width_ - area.x - this.attr_('rightGap');
area.h = this.dygraph_.height_;
+
+ // Let plugins reserve space.
+ var e = {
+ chart_div: this.dygraph_.graphDiv,
+ reserveSpaceLeft: function(px) {
+ var r = {
+ x: area.x,
+ y: area.y,
+ w: px,
+ h: area.h
+ };
+ area.x += px;
+ area.w -= px;
+ return r;
+ },
+ reserveSpaceTop: function(px) {
+ var r = {
+ x: area.x,
+ y: area.y,
+ w: area.w,
+ h: px
+ };
+ area.y += px;
+ area.h -= px;
+ return r;
+ },
+ chartRect: function() {
+ return {x:area.x, y:area.y, w:area.w, h:area.h};
+ }
+ };
+ this.dygraph_.cascadeEvents_('layout', e);
+
if (this.attr_('drawXAxis')) {
if (this.attr_('xAxisHeight')) {
area.h -= this.attr_('xAxisHeight');
"to use " + this.dygraph_.numAxes() + ")");
}
+/*
// Add space for chart labels: title, xlabel and ylabel.
if (this.attr_('title')) {
area.h -= this.attr_('titleHeight');
// doesn't, the yAxisLabelWidth option can be increased.
}
+ if (this.attr_('y2label')) {
+ // same logic applies here as for ylabel.
+ // TODO(danvk): make yAxisLabelWidth a per-axis property
+ }
+*/
+
// Add space for range selector, if needed.
if (this.attr_('showRangeSelector')) {
area.h -= this.attr_('rangeSelectorHeight') + 4;
this.minxval = this.dateWindow_[0];
this.maxxval = this.dateWindow_[1];
} else {
- for (var name in this.datasets) {
- if (!this.datasets.hasOwnProperty(name)) continue;
- var series = this.datasets[name];
+ for (var setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
+ var series = this.datasets[setIdx];
if (series.length > 1) {
var x1 = series[0][0];
if (!this.minxval || x1 < this.minxval) this.minxval = x1;
};
DygraphLayout.prototype._evaluateLineCharts = function() {
- // add all the rects
- this.points = [];
// 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.
this.setPointsLengths = [];
+ this.setPointsOffsets = [];
+
+ var connectSeparated = this.attr_('connectSeparatedPoints');
+ // 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 i = 0;
+ var setIdx;
+
+ // Preallocating the size of points reduces reallocations, and therefore,
+ // calls to collect garbage.
+ var totalPoints = 0;
+ for (setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
+ totalPoints += this.datasets[setIdx].length;
+ }
+ this.points = new Array(totalPoints);
- for (var setName in this.datasets) {
- if (!this.datasets.hasOwnProperty(setName)) continue;
-
- var dataset = this.datasets[setName];
+ for (setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
+ this.setPointsOffsets.push(i);
+ var dataset = this.datasets[setIdx];
+ var setName = this.setNames[setIdx];
var axis = this.dygraph_.axisPropertiesForSeries(setName);
- var setPointsLength = 0;
-
for (var j = 0; j < dataset.length; j++) {
var item = dataset[j];
- var xValue = parseFloat(item[0]);
- var yValue = parseFloat(item[1]);
+ var xValue = DygraphLayout.parseFloat_(item[0]);
+ var yValue = DygraphLayout.parseFloat_(item[1]);
// 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 point = {
+ if (connectSeparated && item[1] === null) {
+ yValue = null;
+ }
+ this.points[i] = {
// TODO(danvk): here
x: xNormal,
y: yNormal,
yval: yValue,
name: setName
};
- this.points.push(point);
- setPointsLength += 1;
+ i++;
}
- this.setPointsLengths.push(setPointsLength);
+ this.setPointsLengths.push(i - this.setPointsOffsets[setIdx]);
}
};
+/**
+ * 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 = [];
// Copy over the error terms
var i = 0; // index in this.points
- for (var setName in this.datasets) {
- if (!this.datasets.hasOwnProperty(setName)) continue;
+ for (var setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
var j = 0;
- var dataset = this.datasets[setName];
+ var dataset = this.datasets[setIdx];
+ var setName = this.setNames[setIdx];
var axis = this.dygraph_.axisPropertiesForSeries(setName);
for (j = 0; j < dataset.length; j++, i++) {
var item = dataset[j];
- var xv = parseFloat(item[0]);
- var yv = parseFloat(item[1]);
+ var xv = DygraphLayout.parseFloat_(item[0]);
+ var yv = DygraphLayout.parseFloat_(item[1]);
if (xv == this.points[i].xval &&
yv == this.points[i].yval) {
- var errorMinus = parseFloat(item[2]);
- var errorPlus = parseFloat(item[3]);
+ var errorMinus = DygraphLayout.parseFloat_(item[2]);
+ var errorPlus = DygraphLayout.parseFloat_(item[3]);
var yv_minus = yv - errorMinus;
var yv_plus = yv + errorPlus;
*/
DygraphLayout.prototype.removeAllDatasets = function() {
delete this.datasets;
+ delete this.setNames;
+ delete this.setPointsLengths;
+ delete this.setPointsOffsets;
this.datasets = [];
+ this.setNames = [];
+ this.setPointsLengths = [];
+ this.setPointsOffsets = [];
};
/**
*/
DygraphLayout.prototype.unstackPointAtIndex = function(idx) {
var point = this.points[idx];
+ // If the point is missing, no unstacking is necessary
+ if (!point.yval) {
+ return point;
+ }
// Clone the point since we modify it
var unstackedPoint = {};
// 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) {
+ if ((this.points[i].xval == point.xval) && this.points[i].yval) {
unstackedPoint.yval -= this.points[i].yval;
break;
}
projects / dygraphs.git / blobdiff