Commit | Line | Data |
---|---|---|
6a1aa64f DV |
1 | // Copyright 2006 Dan Vanderkam (danvdk@gmail.com) |
2 | // All Rights Reserved. | |
3 | ||
4 | /** | |
3df0ccf0 DV |
5 | * @fileoverview Based on PlotKit, but modified to meet the needs of dygraphs. |
6 | * In particular, support for: | |
7 | * - grid overlays | |
8 | * - error bars | |
9 | * - dygraphs attribute system | |
6a1aa64f DV |
10 | */ |
11 | ||
6a1aa64f | 12 | /** |
3df0ccf0 | 13 | * Creates a new DygraphLayout object. |
6a1aa64f | 14 | * @param {Object} options Options for PlotKit.Layout |
285a6bda | 15 | * @return {Object} The DygraphLayout object |
6a1aa64f | 16 | */ |
efe0829a DV |
17 | DygraphLayout = function(dygraph, options) { |
18 | this.dygraph_ = dygraph; | |
19 | this.options = {}; // TODO(danvk): remove, use attr_ instead. | |
20 | MochiKit.Base.update(this.options, options ? options : {}); | |
21 | this.datasets = new Array(); | |
6a1aa64f | 22 | }; |
efe0829a DV |
23 | |
24 | DygraphLayout.prototype.attr_ = function(name) { | |
25 | return this.dygraph_.attr_(name); | |
26 | }; | |
27 | ||
28 | DygraphLayout.prototype.addDataset = function(setname, set_xy) { | |
29 | this.datasets[setname] = set_xy; | |
30 | }; | |
31 | ||
32 | DygraphLayout.prototype.evaluate = function() { | |
33 | this._evaluateLimits(); | |
34 | this._evaluateLineCharts(); | |
35 | this._evaluateLineTicks(); | |
36 | }; | |
37 | ||
38 | DygraphLayout.prototype._evaluateLimits = function() { | |
39 | this.minxval = this.maxxval = null; | |
40 | for (var name in this.datasets) { | |
41 | var series = this.datasets[name]; | |
42 | var x1 = series[0][0]; | |
43 | if (!this.minxval || x1 < this.minxval) this.minxval = x1; | |
44 | ||
45 | var x2 = series[series.length - 1][0]; | |
46 | if (!this.maxxval || x2 > this.maxxval) this.maxxval = x2; | |
47 | } | |
48 | this.xrange = this.maxxval - this.minxval; | |
49 | this.xscale = (this.xrange != 0 ? 1/this.xrange : 1.0); | |
50 | ||
51 | this.minyval = this.options.yAxis[0]; | |
52 | this.maxyval = this.options.yAxis[1]; | |
53 | this.yrange = this.maxyval - this.minyval; | |
54 | this.yscale = (this.yrange != 0 ? 1/this.yrange : 1.0); | |
55 | }; | |
56 | ||
57 | DygraphLayout.prototype._evaluateLineCharts = function() { | |
58 | // add all the rects | |
59 | this.points = new Array(); | |
60 | for (var setName in this.datasets) { | |
61 | var dataset = this.datasets[setName]; | |
62 | for (var j = 0; j < dataset.length; j++) { | |
63 | var item = dataset[j]; | |
64 | var point = { | |
65 | x: ((parseFloat(item[0]) - this.minxval) * this.xscale), | |
66 | y: 1.0 - ((parseFloat(item[1]) - this.minyval) * this.yscale), | |
67 | xval: parseFloat(item[0]), | |
68 | yval: parseFloat(item[1]), | |
69 | name: setName | |
70 | }; | |
71 | ||
72 | // limit the x, y values so they do not overdraw | |
73 | if (point.y <= 0.0) { | |
74 | point.y = 0.0; | |
75 | } | |
76 | if (point.y >= 1.0) { | |
77 | point.y = 1.0; | |
78 | } | |
79 | if ((point.x >= 0.0) && (point.x <= 1.0)) { | |
80 | this.points.push(point); | |
81 | } | |
82 | } | |
83 | } | |
84 | }; | |
85 | ||
86 | DygraphLayout.prototype._evaluateLineTicks = function() { | |
87 | this.xticks = new Array(); | |
88 | for (var i = 0; i < this.options.xTicks.length; i++) { | |
89 | var tick = this.options.xTicks[i]; | |
90 | var label = tick.label; | |
91 | var pos = this.xscale * (tick.v - this.minxval); | |
92 | if ((pos >= 0.0) && (pos <= 1.0)) { | |
93 | this.xticks.push([pos, label]); | |
94 | } | |
95 | } | |
96 | ||
97 | this.yticks = new Array(); | |
98 | for (var i = 0; i < this.options.yTicks.length; i++) { | |
99 | var tick = this.options.yTicks[i]; | |
100 | var label = tick.label; | |
101 | var pos = 1.0 - (this.yscale * (tick.v - this.minyval)); | |
102 | if ((pos >= 0.0) && (pos <= 1.0)) { | |
103 | this.yticks.push([pos, label]); | |
104 | } | |
105 | } | |
106 | }; | |
107 | ||
6a1aa64f DV |
108 | |
109 | /** | |
110 | * Behaves the same way as PlotKit.Layout, but also copies the errors | |
111 | * @private | |
112 | */ | |
285a6bda | 113 | DygraphLayout.prototype.evaluateWithError = function() { |
6a1aa64f DV |
114 | this.evaluate(); |
115 | if (!this.options.errorBars) return; | |
116 | ||
117 | // Copy over the error terms | |
118 | var i = 0; // index in this.points | |
119 | for (var setName in this.datasets) { | |
120 | var j = 0; | |
121 | var dataset = this.datasets[setName]; | |
6a1aa64f DV |
122 | for (var j = 0; j < dataset.length; j++, i++) { |
123 | var item = dataset[j]; | |
124 | var xv = parseFloat(item[0]); | |
125 | var yv = parseFloat(item[1]); | |
126 | ||
127 | if (xv == this.points[i].xval && | |
128 | yv == this.points[i].yval) { | |
129 | this.points[i].errorMinus = parseFloat(item[2]); | |
130 | this.points[i].errorPlus = parseFloat(item[3]); | |
131 | } | |
132 | } | |
133 | } | |
134 | }; | |
135 | ||
136 | /** | |
137 | * Convenience function to remove all the data sets from a graph | |
138 | */ | |
285a6bda | 139 | DygraphLayout.prototype.removeAllDatasets = function() { |
6a1aa64f DV |
140 | delete this.datasets; |
141 | this.datasets = new Array(); | |
142 | }; | |
143 | ||
144 | /** | |
145 | * Change the values of various layout options | |
146 | * @param {Object} new_options an associative array of new properties | |
147 | */ | |
285a6bda | 148 | DygraphLayout.prototype.updateOptions = function(new_options) { |
6a1aa64f DV |
149 | MochiKit.Base.update(this.options, new_options ? new_options : {}); |
150 | }; | |
151 | ||
152 | // Subclass PlotKit.CanvasRenderer to add: | |
153 | // 1. X/Y grid overlay | |
154 | // 2. Ability to draw error bars (if required) | |
155 | ||
156 | /** | |
157 | * Sets some PlotKit.CanvasRenderer options | |
158 | * @param {Object} element The canvas to attach to | |
285a6bda | 159 | * @param {Layout} layout The DygraphLayout object for this graph. |
6a1aa64f DV |
160 | * @param {Object} options Options to pass on to CanvasRenderer |
161 | */ | |
9317362d DV |
162 | DygraphCanvasRenderer = function(dygraph, element, layout, options) { |
163 | // TODO(danvk): remove options, just use dygraph.attr_. | |
9317362d | 164 | this.dygraph_ = dygraph; |
fbe31dc8 DV |
165 | |
166 | // default options | |
167 | this.options = { | |
168 | "strokeWidth": 0.5, | |
169 | "drawXAxis": true, | |
170 | "drawYAxis": true, | |
171 | "axisLineColor": Color.blackColor(), | |
172 | "axisLineWidth": 0.5, | |
173 | "axisTickSize": 3, | |
174 | "axisLabelColor": Color.blackColor(), | |
175 | "axisLabelFont": "Arial", | |
176 | "axisLabelFontSize": 9, | |
177 | "axisLabelWidth": 50, | |
178 | "drawYGrid": true, | |
179 | "drawXGrid": true, | |
180 | "gridLineColor": MochiKit.Color.Color.grayColor() | |
181 | }; | |
6a1aa64f DV |
182 | MochiKit.Base.update(this.options, options); |
183 | ||
fbe31dc8 | 184 | this.layout = layout; |
b0c3b730 | 185 | this.element = element; |
fbe31dc8 DV |
186 | this.container = this.element.parentNode; |
187 | ||
188 | // Stuff relating to Canvas on IE support | |
3df0ccf0 | 189 | this.isIE = (/MSIE/.test(navigator.userAgent) && !window.opera); |
fbe31dc8 DV |
190 | |
191 | if (this.isIE && !isNil(G_vmlCanvasManager)) { | |
192 | this.IEDelay = 0.5; | |
193 | this.maxTries = 5; | |
194 | this.renderDelay = null; | |
195 | this.clearDelay = null; | |
196 | this.element = G_vmlCanvasManager.initElement(this.element); | |
197 | } | |
198 | ||
199 | this.height = this.element.height; | |
200 | this.width = this.element.width; | |
201 | ||
202 | // --- check whether everything is ok before we return | |
203 | if (!this.isIE && !(DygraphCanvasRenderer.isSupported(this.element))) | |
204 | throw "Canvas is not supported."; | |
205 | ||
206 | // internal state | |
207 | this.xlabels = new Array(); | |
208 | this.ylabels = new Array(); | |
209 | ||
210 | this.area = { | |
211 | x: this.options.yAxisLabelWidth + 2 * this.options.axisTickSize, | |
212 | y: 0 | |
213 | }; | |
214 | this.area.w = this.width - this.area.x - this.options.rightGap; | |
215 | this.area.h = this.height - this.options.axisLabelFontSize - | |
216 | 2 * this.options.axisTickSize; | |
217 | ||
b0c3b730 DV |
218 | this.container.style.position = "relative"; |
219 | this.container.style.width = this.width + "px"; | |
fbe31dc8 DV |
220 | }; |
221 | ||
222 | DygraphCanvasRenderer.prototype.clear = function() { | |
223 | if (this.isIE) { | |
224 | // VML takes a while to start up, so we just poll every this.IEDelay | |
225 | try { | |
226 | if (this.clearDelay) { | |
227 | this.clearDelay.cancel(); | |
228 | this.clearDelay = null; | |
229 | } | |
230 | var context = this.element.getContext("2d"); | |
231 | } | |
232 | catch (e) { | |
233 | this.clearDelay = MochiKit.Async.wait(this.IEDelay); | |
234 | this.clearDelay.addCallback(bind(this.clear, this)); | |
235 | return; | |
236 | } | |
237 | } | |
238 | ||
239 | var context = this.element.getContext("2d"); | |
240 | context.clearRect(0, 0, this.width, this.height); | |
241 | ||
2160ed4a | 242 | for (var i = 0; i < this.xlabels.length; i++) { |
b0c3b730 DV |
243 | var el = this.xlabels[i]; |
244 | el.parentNode.removeChild(el); | |
2160ed4a DV |
245 | } |
246 | for (var i = 0; i < this.ylabels.length; i++) { | |
b0c3b730 DV |
247 | var el = this.ylabels[i]; |
248 | el.parentNode.removeChild(el); | |
2160ed4a | 249 | } |
fbe31dc8 DV |
250 | this.xlabels = new Array(); |
251 | this.ylabels = new Array(); | |
252 | }; | |
253 | ||
254 | ||
255 | DygraphCanvasRenderer.isSupported = function(canvasName) { | |
256 | var canvas = null; | |
257 | try { | |
258 | if (MochiKit.Base.isUndefinedOrNull(canvasName)) | |
b0c3b730 | 259 | canvas = document.createElement("canvas"); |
fbe31dc8 | 260 | else |
b0c3b730 | 261 | canvas = canvasName; |
fbe31dc8 DV |
262 | var context = canvas.getContext("2d"); |
263 | } | |
264 | catch (e) { | |
265 | var ie = navigator.appVersion.match(/MSIE (\d\.\d)/); | |
266 | var opera = (navigator.userAgent.toLowerCase().indexOf("opera") != -1); | |
267 | if ((!ie) || (ie[1] < 6) || (opera)) | |
268 | return false; | |
269 | return true; | |
270 | } | |
271 | return true; | |
6a1aa64f | 272 | }; |
6a1aa64f DV |
273 | |
274 | /** | |
275 | * Draw an X/Y grid on top of the existing plot | |
276 | */ | |
285a6bda | 277 | DygraphCanvasRenderer.prototype.render = function() { |
6a1aa64f DV |
278 | // Draw the new X/Y grid |
279 | var ctx = this.element.getContext("2d"); | |
280 | if (this.options.drawYGrid) { | |
281 | var ticks = this.layout.yticks; | |
282 | ctx.save(); | |
283 | ctx.strokeStyle = this.options.gridLineColor.toRGBString(); | |
284 | ctx.lineWidth = this.options.axisLineWidth; | |
285 | for (var i = 0; i < ticks.length; i++) { | |
286 | var x = this.area.x; | |
287 | var y = this.area.y + ticks[i][0] * this.area.h; | |
288 | ctx.beginPath(); | |
289 | ctx.moveTo(x, y); | |
290 | ctx.lineTo(x + this.area.w, y); | |
291 | ctx.closePath(); | |
292 | ctx.stroke(); | |
293 | } | |
294 | } | |
295 | ||
296 | if (this.options.drawXGrid) { | |
297 | var ticks = this.layout.xticks; | |
298 | ctx.save(); | |
299 | ctx.strokeStyle = this.options.gridLineColor.toRGBString(); | |
300 | ctx.lineWidth = this.options.axisLineWidth; | |
301 | for (var i=0; i<ticks.length; i++) { | |
302 | var x = this.area.x + ticks[i][0] * this.area.w; | |
303 | var y = this.area.y + this.area.h; | |
304 | ctx.beginPath(); | |
305 | ctx.moveTo(x, y); | |
306 | ctx.lineTo(x, this.area.y); | |
307 | ctx.closePath(); | |
308 | ctx.stroke(); | |
309 | } | |
310 | } | |
2ce09b19 DV |
311 | |
312 | // Do the ordinary rendering, as before | |
313 | // TODO(danvk) Call super.render() | |
314 | this._renderLineChart(); | |
fbe31dc8 DV |
315 | this._renderAxis(); |
316 | }; | |
317 | ||
318 | ||
319 | DygraphCanvasRenderer.prototype._renderAxis = function() { | |
320 | if (!this.options.drawXAxis && !this.options.drawYAxis) | |
321 | return; | |
322 | ||
323 | var context = this.element.getContext("2d"); | |
324 | ||
325 | var labelStyle = {"style": | |
326 | {"position": "absolute", | |
327 | "fontSize": this.options.axisLabelFontSize + "px", | |
328 | "zIndex": 10, | |
329 | "color": this.options.axisLabelColor.toRGBString(), | |
330 | "width": this.options.axisLabelWidth + "px", | |
331 | "overflow": "hidden" | |
332 | } | |
333 | }; | |
334 | ||
335 | // axis lines | |
336 | context.save(); | |
337 | context.strokeStyle = this.options.axisLineColor.toRGBString(); | |
338 | context.lineWidth = this.options.axisLineWidth; | |
339 | ||
340 | ||
341 | if (this.options.drawYAxis) { | |
342 | if (this.layout.yticks) { | |
2160ed4a DV |
343 | for (var i = 0; i < this.layout.yticks.length; i++) { |
344 | var tick = this.layout.yticks[i]; | |
fbe31dc8 DV |
345 | if (typeof(tick) == "function") return; |
346 | var x = this.area.x; | |
347 | var y = this.area.y + tick[0] * this.area.h; | |
348 | context.beginPath(); | |
349 | context.moveTo(x, y); | |
350 | context.lineTo(x - this.options.axisTickSize, y); | |
351 | context.closePath(); | |
352 | context.stroke(); | |
353 | ||
354 | var label = DIV(labelStyle, tick[1]); | |
355 | var top = (y - this.options.axisLabelFontSize / 2); | |
356 | if (top < 0) top = 0; | |
357 | ||
358 | if (top + this.options.axisLabelFontSize + 3 > this.height) { | |
359 | label.style.bottom = "0px"; | |
360 | } else { | |
361 | label.style.top = top + "px"; | |
362 | } | |
363 | label.style.left = "0px"; | |
364 | label.style.textAlign = "right"; | |
365 | label.style.width = this.options.yAxisLabelWidth + "px"; | |
b0c3b730 | 366 | this.container.appendChild(label); |
fbe31dc8 | 367 | this.ylabels.push(label); |
2160ed4a | 368 | } |
fbe31dc8 DV |
369 | |
370 | // The lowest tick on the y-axis often overlaps with the leftmost | |
371 | // tick on the x-axis. Shift the bottom tick up a little bit to | |
372 | // compensate if necessary. | |
373 | var bottomTick = this.ylabels[0]; | |
374 | var fontSize = this.options.axisLabelFontSize; | |
375 | var bottom = parseInt(bottomTick.style.top) + fontSize; | |
376 | if (bottom > this.height - fontSize) { | |
377 | bottomTick.style.top = (parseInt(bottomTick.style.top) - | |
378 | fontSize / 2) + "px"; | |
379 | } | |
380 | } | |
381 | ||
382 | context.beginPath(); | |
383 | context.moveTo(this.area.x, this.area.y); | |
384 | context.lineTo(this.area.x, this.area.y + this.area.h); | |
385 | context.closePath(); | |
386 | context.stroke(); | |
387 | } | |
388 | ||
389 | if (this.options.drawXAxis) { | |
390 | if (this.layout.xticks) { | |
2160ed4a DV |
391 | for (var i = 0; i < this.layout.xticks.length; i++) { |
392 | var tick = this.layout.xticks[i]; | |
fbe31dc8 DV |
393 | if (typeof(dataset) == "function") return; |
394 | ||
395 | var x = this.area.x + tick[0] * this.area.w; | |
396 | var y = this.area.y + this.area.h; | |
397 | context.beginPath(); | |
398 | context.moveTo(x, y); | |
399 | context.lineTo(x, y + this.options.axisTickSize); | |
400 | context.closePath(); | |
401 | context.stroke(); | |
402 | ||
403 | var label = DIV(labelStyle, tick[1]); | |
404 | label.style.textAlign = "center"; | |
405 | label.style.bottom = "0px"; | |
406 | ||
407 | var left = (x - this.options.axisLabelWidth/2); | |
408 | if (left + this.options.axisLabelWidth > this.width) { | |
409 | left = this.width - this.options.xAxisLabelWidth; | |
410 | label.style.textAlign = "right"; | |
411 | } | |
412 | if (left < 0) { | |
413 | left = 0; | |
414 | label.style.textAlign = "left"; | |
415 | } | |
416 | ||
417 | label.style.left = left + "px"; | |
418 | label.style.width = this.options.xAxisLabelWidth + "px"; | |
b0c3b730 | 419 | this.container.appendChild(label); |
fbe31dc8 | 420 | this.xlabels.push(label); |
2160ed4a | 421 | } |
fbe31dc8 DV |
422 | } |
423 | ||
424 | context.beginPath(); | |
425 | context.moveTo(this.area.x, this.area.y + this.area.h); | |
426 | context.lineTo(this.area.x + this.area.w, this.area.y + this.area.h); | |
427 | context.closePath(); | |
428 | context.stroke(); | |
429 | } | |
430 | ||
431 | context.restore(); | |
6a1aa64f DV |
432 | }; |
433 | ||
fbe31dc8 | 434 | |
6a1aa64f DV |
435 | /** |
436 | * Overrides the CanvasRenderer method to draw error bars | |
437 | */ | |
285a6bda | 438 | DygraphCanvasRenderer.prototype._renderLineChart = function() { |
6a1aa64f DV |
439 | var context = this.element.getContext("2d"); |
440 | var colorCount = this.options.colorScheme.length; | |
441 | var colorScheme = this.options.colorScheme; | |
442 | var setNames = MochiKit.Base.keys(this.layout.datasets); | |
443 | var errorBars = this.layout.options.errorBars; | |
444 | var setCount = setNames.length; | |
445 | var bind = MochiKit.Base.bind; | |
446 | var partial = MochiKit.Base.partial; | |
447 | ||
448 | //Update Points | |
2160ed4a DV |
449 | for (var i = 0; i < this.layout.points.length; i++) { |
450 | var point = this.layout.points[i]; | |
6a1aa64f DV |
451 | point.canvasx = this.area.w * point.x + this.area.x; |
452 | point.canvasy = this.area.h * point.y + this.area.y; | |
453 | } | |
6a1aa64f DV |
454 | |
455 | // create paths | |
9317362d | 456 | var isOK = function(x) { return x && !isNaN(x); }; |
6a1aa64f DV |
457 | var makePath = function(ctx) { |
458 | for (var i = 0; i < setCount; i++) { | |
459 | var setName = setNames[i]; | |
460 | var color = colorScheme[i%colorCount]; | |
461 | var strokeX = this.options.strokeColorTransform; | |
462 | ||
463 | // setup graphics context | |
464 | context.save(); | |
465 | context.strokeStyle = color.toRGBString(); | |
466 | context.lineWidth = this.options.strokeWidth; | |
6a1aa64f | 467 | var point = this.layout.points[0]; |
9317362d DV |
468 | var pointSize = this.dygraph_.attr_("pointSize"); |
469 | var prevX = null, prevY = null; | |
470 | var drawPoints = this.dygraph_.attr_("drawPoints"); | |
471 | var points = this.layout.points; | |
472 | for (var j = 0; j < points.length; j++) { | |
473 | var point = points[j]; | |
6a1aa64f | 474 | if (point.name == setName) { |
9317362d | 475 | if (!isOK(point.canvasy)) { |
9a730910 | 476 | // this will make us move to the next point, not draw a line to it. |
9317362d | 477 | prevX = prevY = null; |
9a730910 | 478 | } else { |
9317362d DV |
479 | // A point is "isolated" if it is non-null but both the previous |
480 | // and next points are null. | |
481 | var isIsolated = (!prevX && (j == points.length - 1 || | |
482 | !isOK(points[j+1].canvasy))); | |
483 | ||
484 | if (!prevX) { | |
485 | prevX = point.canvasx; | |
486 | prevY = point.canvasy; | |
9a730910 | 487 | } else { |
9317362d DV |
488 | ctx.beginPath(); |
489 | ctx.moveTo(prevX, prevY); | |
490 | prevX = point.canvasx; | |
491 | prevY = point.canvasy; | |
492 | ctx.lineTo(prevX, prevY); | |
493 | ctx.stroke(); | |
494 | } | |
495 | ||
496 | if (drawPoints || isIsolated) { | |
497 | ctx.beginPath(); | |
498 | ctx.fillStyle = color.toRGBString(); | |
499 | ctx.arc(point.canvasx, point.canvasy, pointSize, 0, 360, false); | |
500 | ctx.fill(); | |
9a730910 DV |
501 | } |
502 | } | |
6a1aa64f | 503 | } |
9317362d | 504 | } |
6a1aa64f DV |
505 | } |
506 | }; | |
507 | ||
508 | var makeErrorBars = function(ctx) { | |
509 | for (var i = 0; i < setCount; i++) { | |
510 | var setName = setNames[i]; | |
511 | var color = colorScheme[i % colorCount]; | |
512 | var strokeX = this.options.strokeColorTransform; | |
513 | ||
514 | // setup graphics context | |
515 | context.save(); | |
516 | context.strokeStyle = color.toRGBString(); | |
517 | context.lineWidth = this.options.strokeWidth; | |
518 | var prevX = -1; | |
519 | var prevYs = [-1, -1]; | |
520 | var count = 0; | |
521 | var yscale = this.layout.yscale; | |
05c9d0c4 DV |
522 | // should be same color as the lines |
523 | var err_color = color.colorWithAlpha(0.15); | |
524 | ctx.fillStyle = err_color.toRGBString(); | |
525 | ctx.beginPath(); | |
526 | for (var j = 0; j < this.layout.points.length; j++) { | |
527 | var point = this.layout.points[j]; | |
6a1aa64f DV |
528 | count++; |
529 | if (point.name == setName) { | |
5011e7a1 DV |
530 | if (!point.y || isNaN(point.y)) { |
531 | prevX = -1; | |
532 | return; | |
533 | } | |
6a1aa64f DV |
534 | var newYs = [ point.y - point.errorPlus * yscale, |
535 | point.y + point.errorMinus * yscale ]; | |
536 | newYs[0] = this.area.h * newYs[0] + this.area.y; | |
537 | newYs[1] = this.area.h * newYs[1] + this.area.y; | |
538 | if (prevX >= 0) { | |
05c9d0c4 DV |
539 | ctx.moveTo(prevX, prevYs[0]); |
540 | ctx.lineTo(point.canvasx, newYs[0]); | |
541 | ctx.lineTo(point.canvasx, newYs[1]); | |
542 | ctx.lineTo(prevX, prevYs[1]); | |
543 | ctx.closePath(); | |
6a1aa64f DV |
544 | } |
545 | prevYs[0] = newYs[0]; | |
546 | prevYs[1] = newYs[1]; | |
547 | prevX = point.canvasx; | |
548 | } | |
05c9d0c4 | 549 | } |
6a1aa64f DV |
550 | ctx.fill(); |
551 | } | |
552 | }; | |
553 | ||
554 | if (errorBars) | |
555 | bind(makeErrorBars, this)(context); | |
556 | bind(makePath, this)(context); | |
557 | context.restore(); | |
558 | }; |