X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-canvas.js;h=9a162db0032d2971273de229b174a4a9f72d7ef8;hb=f35016e8b97d39691777a8ad850bfa314e7e223a;hp=04c53b81bd077f069ce928a0214fd22fd5a62a0a;hpb=ecf9b464f6a10e3b99f22132ec300e2f83584aaf;p=dygraphs.git diff --git a/dygraph-canvas.js b/dygraph-canvas.js index 04c53b8..9a162db 100644 --- a/dygraph-canvas.js +++ b/dygraph-canvas.js @@ -592,6 +592,10 @@ DygraphCanvasRenderer.prototype._renderAnnotations = function() { * Overrides the CanvasRenderer method to draw error bars */ DygraphCanvasRenderer.prototype._renderLineChart = function() { + var isNullOrNaN = function(x) { + return (x === null || isNaN(x)); + }; + // TODO(danvk): use this.attr_ for many of these. var context = this.elementContext; var fillAlpha = this.attr_('fillAlpha'); @@ -599,6 +603,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { var fillGraph = this.attr_("fillGraph"); var stackedGraph = this.attr_("stackedGraph"); var stepPlot = this.attr_("stepPlot"); + var points = this.layout.points; + var pointsLength = points.length; var setNames = []; for (var name in this.layout.datasets) { @@ -616,8 +622,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { // Update Points // TODO(danvk): here - for (var i = 0; i < this.layout.points.length; i++) { - var point = this.layout.points[i]; + for (var i = pointsLength; i--;) { + var point = points[i]; point.canvasx = this.area.w * point.x + this.area.x; point.canvasy = this.area.h * point.y + this.area.y; } @@ -646,8 +652,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { fillAlpha + ')'; ctx.fillStyle = err_color; ctx.beginPath(); - for (var j = 0; j < this.layout.points.length; j++) { - var point = this.layout.points[j]; + for (var j = 0; j < pointsLength; j++) { + var point = points[j]; if (point.name == setName) { if (!Dygraph.isOK(point.y)) { prevX = NaN; @@ -656,12 +662,10 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { // TODO(danvk): here if (stepPlot) { - var newYs = [ prevY - point.errorPlus * yscale, - prevY + point.errorMinus * yscale ]; + var newYs = [ point.y_bottom, point.y_top ]; prevY = point.y; } else { - var newYs = [ point.y - point.errorPlus * yscale, - point.y + point.errorMinus * yscale ]; + var newYs = [ point.y_bottom, point.y_top ]; } newYs[0] = this.area.h * newYs[0] + this.area.y; newYs[1] = this.area.h * newYs[1] + this.area.y; @@ -710,8 +714,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { fillAlpha + ')'; ctx.fillStyle = err_color; ctx.beginPath(); - for (var j = 0; j < this.layout.points.length; j++) { - var point = this.layout.points[j]; + for (var j = 0; j < pointsLength; j++) { + var point = points[j]; if (point.name == setName) { if (!Dygraph.isOK(point.y)) { prevX = NaN; @@ -745,75 +749,78 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { } } - var isNullOrNaN = function(x) { - return (x === null || isNaN(x)); - }; - - for (var i = 0; i < setCount; i++) { + // Drawing the lines. + var firstIndexInSet = 0; + var afterLastIndexInSet = 0; + var setLength = 0; + for (var i = 0; i < setCount; i += 1) { + setLength = this.layout.setPointsLengths[i]; + afterLastIndexInSet += setLength; var setName = setNames[i]; var color = this.colors[setName]; var strokeWidth = this.dygraph_.attr_("strokeWidth", setName); // setup graphics context context.save(); - var point = this.layout.points[0]; var pointSize = this.dygraph_.attr_("pointSize", setName); var prevX = null, prevY = null; var drawPoints = this.dygraph_.attr_("drawPoints", setName); - var points = this.layout.points; - for (var j = 0; j < points.length; j++) { + for (var j = firstIndexInSet; j < afterLastIndexInSet; j++) { var point = points[j]; - if (point.name == setName) { - if (isNullOrNaN(point.canvasy)) { - if (stepPlot && prevX != null) { - // Draw a horizontal line to the start of the missing data + if (isNullOrNaN(point.canvasy)) { + if (stepPlot && prevX != null) { + // Draw a horizontal line to the start of the missing data + ctx.beginPath(); + ctx.strokeStyle = color; + ctx.lineWidth = this.attr_('strokeWidth'); + ctx.moveTo(prevX, prevY); + ctx.lineTo(point.canvasx, prevY); + ctx.stroke(); + } + // this will make us move to the next point, not draw a line to it. + prevX = prevY = null; + } else { + // A point is "isolated" if it is non-null but both the previous + // and next points are null. + var isIsolated = (!prevX && (j == points.length - 1 || + isNullOrNaN(points[j+1].canvasy))); + if (prevX === null) { + prevX = point.canvasx; + prevY = point.canvasy; + } else { + // Skip over points that will be drawn in the same pixel. + if (Math.round(prevX) == Math.round(point.canvasx) && + Math.round(prevY) == Math.round(point.canvasy)) { + continue; + } + // TODO(antrob): skip over points that lie on a line that is already + // going to be drawn. There is no need to have more than 2 + // consecutive points that are collinear. + if (strokeWidth) { ctx.beginPath(); ctx.strokeStyle = color; - ctx.lineWidth = this.attr_('strokeWidth'); + ctx.lineWidth = strokeWidth; ctx.moveTo(prevX, prevY); - ctx.lineTo(point.canvasx, prevY); - ctx.stroke(); - } - // this will make us move to the next point, not draw a line to it. - prevX = prevY = null; - } else { - // A point is "isolated" if it is non-null but both the previous - // and next points are null. - var isIsolated = (!prevX && (j == points.length - 1 || - isNullOrNaN(points[j+1].canvasy))); - - if (prevX === null) { + if (stepPlot) { + ctx.lineTo(point.canvasx, prevY); + } prevX = point.canvasx; prevY = point.canvasy; - } else { - // TODO(antrob): skip over points that lie on a line that is already - // going to be drawn. There is no need to have more than 2 - // consecutive points that are collinear. - if (strokeWidth) { - ctx.beginPath(); - ctx.strokeStyle = color; - ctx.lineWidth = strokeWidth; - ctx.moveTo(prevX, prevY); - if (stepPlot) { - ctx.lineTo(point.canvasx, prevY); - } - prevX = point.canvasx; - prevY = point.canvasy; - ctx.lineTo(prevX, prevY); - ctx.stroke(); - } + ctx.lineTo(prevX, prevY); + ctx.stroke(); } + } - if (drawPoints || isIsolated) { - ctx.beginPath(); - ctx.fillStyle = color; - ctx.arc(point.canvasx, point.canvasy, pointSize, - 0, 2 * Math.PI, false); - ctx.fill(); - } + if (drawPoints || isIsolated) { + ctx.beginPath(); + ctx.fillStyle = color; + ctx.arc(point.canvasx, point.canvasy, pointSize, + 0, 2 * Math.PI, false); + ctx.fill(); } } } + firstIndexInSet = afterLastIndexInSet; } context.restore();