[redistricter] push by brian.olson - tweaks on 2012-02-10 07:39 GMT

[redist...@googlecode.com]

Revision: 66273b5d64d9
Author: Brian Olson <brian...@gmail.com>
Date: Thu Feb 9 23:39:18 2012
Log: tweaks
http://code.google.com/p/redistricter/source/detail?r=66273b5d64d9

Modified:
/new_st_index_pyt.html
/plotlib.js
/runallstates.py
/tiger/shapefile.py

=======================================
--- /new_st_index_pyt.html Fri Mar 4 09:21:28 2011
+++ /new_st_index_pyt.html Thu Feb 9 23:39:18 2012
@@ -27,5 +27,6 @@
${racedata}
<div><a href="solution.zip">zipped csv block list for $statename</a></div>
</td></tr></table>
+<p><a rel="license"
href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative
Commons License" style="border-width:0"
src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png" /></a><br />This
work by <a xmlns:cc="http://creativecommons.org/ns#"
href="http://bdistricting.com/" property="cc:attributionName"
rel="cc:attributionURL">Brian Olson</a> is licensed under a <a
rel="license"
href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
Attribution-ShareAlike 3.0 Unported License</a>.</p>
${google_analytics}
</body></html>
=======================================
--- /plotlib.js Tue Nov 8 07:52:16 2011
+++ /plotlib.js Thu Feb 9 23:39:18 2012
@@ -121,6 +121,24 @@
lp.plot(canvas, xy, opt);
};

+function ScatterPlot() {};
+ScatterPlot.prototype = new PlotCommon;
+
+ScatterPlot.prototype.plot = function(canvas, xy, opt) {
+ this.setup(canvas, xy);
+ this.ctx.clearRect(0,0, canvas.width, canvas.height);
+ this.ctx.strokeStyle = '#000';
+ this.ctx.fillStyle = '#000';
+ for (var i = 0; i < xy.length; i += 2) {
+ this.ctx.fillRect(this.px(xy[i])-1, this.py(xy[i+1])-1, 3, 3);
+ }
+ this.axisLabels();
+}
+function scatterplot(canvas, xy, opt) {
+ var sp = new ScatterPlot();
+ sp.plot(canvas, xy, opt);
+};
+
function CalPlot() {};
CalPlot.prototype = new PlotCommon;

=======================================
--- /runallstates.py Sun Jun 5 20:12:11 2011
+++ /runallstates.py Thu Feb 9 23:39:18 2012
@@ -1387,6 +1387,9 @@
break
self.stu = stu
RunThread.lock.release()
+ if stu is None:
+ # don't busy spin trying to get state
+ time.sleep(2)

def run(self):
# See also runthread() above
=======================================
--- /tiger/shapefile.py Sun Apr 18 23:32:35 2010
+++ /tiger/shapefile.py Thu Feb 9 23:39:18 2012
@@ -331,6 +331,7 @@
print 'read %d records in %f seconds' % (
dbf.recordCount, (stop - start))
print dbf.getRow(100)
+ return dbf

def readShapefile(fname):
start = time.time()