X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-canvas.js;h=5b2cac8a610c19ac60fa84dc5e1de8fe21801735;hb=0842b24b38096009a743ee1d28c25c4714fa2123;hp=4a5ca44c9d5cabeb71f5423cb7019d9b82611270;hpb=5f453f17a4e6cd8a588018ce54d9cbab45e0ffac;p=dygraphs.git diff --git a/dygraph-canvas.js b/dygraph-canvas.js index 4a5ca44..5b2cac8 100644 --- a/dygraph-canvas.js +++ b/dygraph-canvas.js @@ -1,5 +1,8 @@ -// Copyright 2006 Dan Vanderkam (danvdk@gmail.com) -// All Rights Reserved. +/** + * @license + * Copyright 2006 Dan Vanderkam (danvdk@gmail.com) + * MIT-licensed (http://opensource.org/licenses/MIT) + */ /** * @fileoverview Based on PlotKit.CanvasRenderer, but modified to meet the @@ -41,77 +44,31 @@ DygraphCanvasRenderer = function(dygraph, element, elementContext, layout) { this.annotations = new Array(); this.chartLabels = {}; - this.area = this.computeArea_(); + this.area = layout.getPlotArea(); this.container.style.position = "relative"; this.container.style.width = this.width + "px"; // Set up a clipping area for the canvas (and the interaction canvas). // This ensures that we don't overdraw. - var ctx = this.dygraph_.canvas_ctx_; - ctx.beginPath(); - ctx.rect(this.area.x, this.area.y, this.area.w, this.area.h); - ctx.clip(); - - ctx = this.dygraph_.hidden_ctx_; - ctx.beginPath(); - ctx.rect(this.area.x, this.area.y, this.area.w, this.area.h); - ctx.clip(); + if (this.dygraph_.isUsingExcanvas_) { + this._createIEClipArea(); + } else { + var ctx = this.dygraph_.canvas_ctx_; + ctx.beginPath(); + ctx.rect(this.area.x, this.area.y, this.area.w, this.area.h); + ctx.clip(); + + ctx = this.dygraph_.hidden_ctx_; + ctx.beginPath(); + ctx.rect(this.area.x, this.area.y, this.area.w, this.area.h); + ctx.clip(); + } }; DygraphCanvasRenderer.prototype.attr_ = function(x) { return this.dygraph_.attr_(x); }; -// Compute the box which the chart should be drawn in. This is the canvas's -// box, less space needed for axis and chart labels. -// TODO(danvk): this belongs in DygraphLayout. -DygraphCanvasRenderer.prototype.computeArea_ = function() { - var area = { - // TODO(danvk): per-axis setting. - x: 0, - y: 0 - }; - if (this.attr_('drawYAxis')) { - area.x = this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize'); - } - - area.w = this.width - area.x - this.attr_('rightGap'); - area.h = this.height; - if (this.attr_('drawXAxis')) { - if (this.attr_('xAxisHeight')) { - area.h -= this.attr_('xAxisHeight'); - } else { - area.h -= this.attr_('axisLabelFontSize') + 2 * this.attr_('axisTickSize'); - } - } - - // Shrink the drawing area to accomodate additional y-axes. - if (this.dygraph_.numAxes() == 2) { - // TODO(danvk): per-axis setting. - area.w -= (this.attr_('yAxisLabelWidth') + 2 * this.attr_('axisTickSize')); - } else if (this.dygraph_.numAxes() > 2) { - this.dygraph_.error("Only two y-axes are supported at this time. (Trying " + - "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. - } - - return area; -}; - DygraphCanvasRenderer.prototype.clear = function() { if (this.isIE) { // VML takes a while to start up, so we just poll every this.IEDelay @@ -202,6 +159,7 @@ DygraphCanvasRenderer.prototype.render = function() { if (this.attr_('drawYGrid')) { var ticks = this.layout.yticks; + // TODO(konigsberg): I don't think these calls to save() have a corresponding restore(). ctx.save(); ctx.strokeStyle = this.attr_('gridLineColor'); ctx.lineWidth = this.attr_('gridLineWidth'); @@ -237,10 +195,58 @@ DygraphCanvasRenderer.prototype.render = function() { // Do the ordinary rendering, as before this._renderLineChart(); this._renderAxis(); - this._renderChartLabels(); + this._renderChartLabels(); this._renderAnnotations(); }; +DygraphCanvasRenderer.prototype._createIEClipArea = function() { + var className = 'dygraph-clip-div'; + var graphDiv = this.dygraph_.graphDiv; + + // Remove old clip divs. + for (var i = graphDiv.childNodes.length-1; i >= 0; i--) { + if (graphDiv.childNodes[i].className == className) { + graphDiv.removeChild(graphDiv.childNodes[i]); + } + } + + // Determine background color to give clip divs. + var backgroundColor = document.bgColor; + var element = this.dygraph_.graphDiv; + while (element != document) { + var bgcolor = element.currentStyle.backgroundColor; + if (bgcolor && bgcolor != 'transparent') { + backgroundColor = bgcolor; + break; + } + element = element.parentNode; + } + + function createClipDiv(area) { + if (area.w == 0 || area.h == 0) { + return; + } + var elem = document.createElement('div'); + elem.className = className; + elem.style.backgroundColor = backgroundColor; + elem.style.position = 'absolute'; + elem.style.left = area.x + 'px'; + elem.style.top = area.y + 'px'; + elem.style.width = area.w + 'px'; + elem.style.height = area.h + 'px'; + graphDiv.appendChild(elem); + } + + var plotArea = this.area; + // Left side + createClipDiv({x:0, y:0, w:plotArea.x, h:this.height}); + // Top + createClipDiv({x:plotArea.x, y:0, w:this.width-plotArea.x, h:plotArea.y}); + // Right side + createClipDiv({x:plotArea.x+plotArea.w, y:0, w:this.width-plotArea.x-plotArea.w, h:this.height}); + // Bottom + createClipDiv({x:plotArea.x, y:plotArea.y+plotArea.h, w:this.width-plotArea.x, h:this.height-plotArea.h-plotArea.y}); +} DygraphCanvasRenderer.prototype._renderAxis = function() { if (!this.attr_('drawXAxis') && !this.attr_('drawYAxis')) return; @@ -258,9 +264,10 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { color: this.attr_('axisLabelColor'), width: this.attr_('axisLabelWidth') + "px", // height: this.attr_('axisLabelFontSize') + 2 + "px", + lineHeight: "normal", // Something other than "normal" line-height screws up label positioning. overflow: "hidden" }; - var makeDiv = function(txt, axis) { + var makeDiv = function(txt, axis, prec_axis) { var div = document.createElement("div"); for (var name in labelStyle) { if (labelStyle.hasOwnProperty(name)) { @@ -268,8 +275,9 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { } } var inner_div = document.createElement("div"); - // TODO(danvk): separate class for secondary y-axis - inner_div.className = 'dygraph-axis-label dygraph-axis-label-' + axis; + inner_div.className = 'dygraph-axis-label' + + ' dygraph-axis-label-' + axis + + (prec_axis ? ' dygraph-axis-label-' + prec_axis : ''); inner_div.appendChild(document.createTextNode(txt)); div.appendChild(inner_div); return div; @@ -282,23 +290,29 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { if (this.attr_('drawYAxis')) { if (this.layout.yticks && this.layout.yticks.length > 0) { + var num_axes = this.dygraph_.numAxes(); for (var i = 0; i < this.layout.yticks.length; i++) { var tick = this.layout.yticks[i]; if (typeof(tick) == "function") return; var x = this.area.x; var sgn = 1; + var prec_axis = 'y1'; if (tick[0] == 1) { // right-side y-axis x = this.area.x + this.area.w; sgn = -1; + prec_axis = 'y2'; } var y = this.area.y + tick[1] * this.area.h; + + /* Tick marks are currently clipped, so don't bother drawing them. context.beginPath(); context.moveTo(halfUp(x), halfDown(y)); context.lineTo(halfUp(x - sgn * this.attr_('axisTickSize')), halfDown(y)); context.closePath(); context.stroke(); + */ - var label = makeDiv(tick[2], 'y'); + var label = makeDiv(tick[2], 'y', num_axes == 2 ? prec_axis : null); var top = (y - this.attr_('axisLabelFontSize') / 2); if (top < 0) top = 0; @@ -357,11 +371,14 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { var x = this.area.x + tick[0] * this.area.w; var y = this.area.y + this.area.h; + + /* Tick marks are currently clipped, so don't bother drawing them. context.beginPath(); context.moveTo(halfUp(x), halfDown(y)); context.lineTo(halfUp(x), halfDown(y + this.attr_('axisTickSize'))); context.closePath(); context.stroke(); + */ var label = makeDiv(tick[1], 'x'); label.style.textAlign = "center"; @@ -592,6 +609,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'); @@ -658,12 +679,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; @@ -747,11 +766,7 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { } } - var isNullOrNaN = function(x) { - return (x === null || isNaN(x)); - }; - - // Drawing of a graph without error bars. + // Drawing the lines. var firstIndexInSet = 0; var afterLastIndexInSet = 0; var setLength = 0; @@ -790,6 +805,11 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { 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.