X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-layout.js;h=c6d829726557b7d4e18a8ba704f7a3b2548209ed;hb=e6f7144ae5645d533c3e0344424def9ed79036b7;hp=58f169b6b2745da21d315d96e4ab40c89b4f3e1c;hpb=117b8bee20ce2bf7d36668af054285244d438b5c;p=dygraphs.git diff --git a/dygraph-layout.js b/dygraph-layout.js index 58f169b..c6d8297 100644 --- a/dygraph-layout.js +++ b/dygraph-layout.js @@ -69,6 +69,58 @@ DygraphLayout.prototype.computePlotArea_ = 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; + }, + reserveSpaceRight: function(px) { + var r = { + x: area.x + area.w - px, + y: area.y, + w: px, + h: area.h + }; + 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; + }, + reserveSpaceBottom: function(px) { + var r = { + x: area.x, + y: area.y + area.h - px, + w: area.w, + h: 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'); @@ -86,26 +138,6 @@ DygraphLayout.prototype.computePlotArea_ = function() { "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. - } - - 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; @@ -206,8 +238,6 @@ DygraphLayout._calcYNormal = function(axis, value) { }; 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 @@ -216,25 +246,41 @@ DygraphLayout.prototype._evaluateLineCharts = function() { this.setPointsOffsets = []; var connectSeparated = this.attr_('connectSeparatedPoints'); - for (var setIdx = 0; setIdx < this.datasets.length; ++setIdx) { + // 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 (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 = 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, @@ -242,16 +288,26 @@ DygraphLayout.prototype._evaluateLineCharts = function() { yval: yValue, name: setName }; - if (connectSeparated && item[1] === null) { - point.yval = null; - } - 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 = []; @@ -296,13 +352,13 @@ DygraphLayout.prototype.evaluateWithError = function() { 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;