Merge remote-tracking branch 'pelson/lasso' into nxutils_backward

mdboom · mdboom · commit 243f4ff2a289 · 2012-03-09T15:13:46.000-05:00
Conflicts:
	examples/event_handling/lasso_demo.py
diff --git a/examples/event_handling/lasso_demo.py b/examples/event_handling/lasso_demo.py
@@ -4,29 +4,28 @@
 selected points
 
 This is currently a proof-of-concept implementation (though it is
-usable as is).  There will be some refinement of the API and the
-inside polygon detection routine.
+usable as is).  There will be some refinement of the API.
 """
 from matplotlib.widgets import Lasso
 from matplotlib.colors import colorConverter
 from matplotlib.collections import RegularPolyCollection
 from matplotlib import path
 
-from matplotlib.pyplot import figure, show
+import matplotlib.pyplot as plt
 from numpy import nonzero
 from numpy.random import rand
 
-class Datum:
+class Datum(object):
     colorin = colorConverter.to_rgba('red')
-    colorout = colorConverter.to_rgba('green')
+    colorout = colorConverter.to_rgba('blue')
     def __init__(self, x, y, include=False):
         self.x = x
         self.y = y
         if include: self.color = self.colorin
         else: self.color = self.colorout
 
 
-class LassoManager:
+class LassoManager(object):
     def __init__(self, ax, data):
         self.axes = ax
         self.canvas = ax.figure.canvas
@@ -46,22 +45,21 @@ def __init__(self, ax, data):
         ax.add_collection(self.collection)
 
         self.cid = self.canvas.mpl_connect('button_press_event', self.onpress)
-        self.ind = None
 
     def callback(self, verts):
         facecolors = self.collection.get_facecolors()
         p = path.Path(verts)
-        ind = nonzero(p.contains_points(self.xys))[0]
-        for i in range(self.Nxy):
-            if i in ind:
+        ind = p.contains_points(self.xys)
+        for i in range(len(self.xys)):
+            if ind[i]:
                 facecolors[i] = Datum.colorin
             else:
                 facecolors[i] = Datum.colorout
 
         self.canvas.draw_idle()
         self.canvas.widgetlock.release(self.lasso)
         del self.lasso
-        self.ind = ind
+
     def onpress(self, event):
         if self.canvas.widgetlock.locked(): return
         if event.inaxes is None: return
@@ -73,8 +71,7 @@ def onpress(self, event):
 
     data = [Datum(*xy) for xy in rand(100, 2)]
 
-    fig = figure()
-    ax = fig.add_subplot(111, xlim=(0,1), ylim=(0,1), autoscale_on=False)
+    ax = plt.axes(xlim=(0,1), ylim=(0,1), autoscale_on=False)
     lman = LassoManager(ax, data)
 
-    show()
+    plt.show()
