};
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
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 totalPoints = 0;
for (var setIdx = 0; setIdx < this.datasets.length; ++setIdx) {
+ totalPoints += this.datasets[setIdx].length;
+ }
+ this.points = new Array(totalPoints);
+
+ for (var 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);
- this.setPointsOffsets.push(this.points.length);
- 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 = item[0];
+ var yValue = 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]);
}
};
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 = item[0];
+ var yv = 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 = item[2];
+ var errorPlus = item[3];
var yv_minus = yv - errorMinus;
var yv_plus = yv + errorPlus;
*/
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;
}