[redistricter] push by brian.olson - fix opt usage, add opt.vlines on 2012-02-12 18:19 GMT

[redist...@googlecode.com]

Revision: fb89b6e15fcb
Author: Brian Olson <brian...@gmail.com>
Date: Sun Feb 12 10:19:02 2012
Log: fix opt usage, add opt.vlines
http://code.google.com/p/redistricter/source/detail?r=fb89b6e15fcb

Modified:
/plotlib.js

=======================================
--- /plotlib.js Sat Feb 11 17:42:31 2012
+++ /plotlib.js Sun Feb 12 10:19:02 2012
@@ -31,10 +31,10 @@
}

PlotCommon.prototype.setup = function(canvas, xy, opt) {
- if (opt.data) {
- for (var di = 0, ds; ds = opt.data[di]; di++) {
- this.setupxy(ds.xy);
- }
+ if (opt && opt.data) {
+ for (var di = 0, ds; ds = opt.data[di]; di++) {
+ this.setupxy(ds.xy);
+ }
} else {
this.setupxy(xy);
}
@@ -111,7 +111,7 @@
// TODO: something smart about how if lasty is close to miny or maxy,
adjust text baselines so they don't clobber each other
this.ctx.fillText(new String(this.lasty), this.px(this.maxx),
this.py(this.lasty));
}
- if (opt.data) {
+ if (opt && opt.data) {
this.ctx.textAlign = 'left';
this.ctx.textBaseline = 'top';
var lx = this.px(this.maxx);
@@ -124,6 +124,17 @@
this.ctx.fillText(ds.name, lx, ly);
}
}
+ if (opt && opt.vlines) {
+ // draw vertical lines at various X values
+ this.ctx.strokeStyle = 'rgba(0,0,255,128)';
+ //this.ctx.strokeStyle = '#00f';
+ for (var vi = 0, vv; vv = opt.vlines[vi]; vi++) {
+ this.ctx.beginPath();
+ this.ctx.moveTo(this.px(vv), this.py(this.miny));
+ this.ctx.lineTo(this.px(vv), this.py(this.maxy));
+ this.ctx.stroke();
+ }
+ }
}

function LinePlot() {};
@@ -156,7 +167,7 @@
ScatterPlot.prototype.plot = function(canvas, xy, opt) {
this.setup(canvas, xy, opt);
this.ctx.clearRect(0,0, canvas.width, canvas.height);
- if (opt.data) {
+ if (opt && opt.data) {
for (var di = 0, ds; ds = opt.data[di]; di++) {
this.ctx.strokeStyle = ds.strokeStyle || '#000';
this.ctx.fillStyle = ds.fillStyle || '#000';