removed generator expression from mathtext2

jdh2358 · jdh2358 · commit d513850f840e · 2006-09-04T16:21:21.000Z
svn path=/trunk/matplotlib/; revision=2747
diff --git a/examples/poly_editor.py b/examples/poly_editor.py
@@ -4,7 +4,7 @@
 
 """
 from matplotlib.artist import Artist
-from matplotlib.patches import Polygon
+from matplotlib.patches import Polygon, CirclePolygon
 from matplotlib.numerix import sqrt, nonzero, equal, asarray, dot, Float
 from matplotlib.numerix.mlab import amin
 from matplotlib.mlab import dist_point_to_segment
@@ -31,26 +31,34 @@ class PolygonInteractor:
     showverts = True
     epsilon = 5  # max pixel distance to count as a vertex hit
 
-    def __init__(self, poly):
+    def __init__(self, ax, poly):
         if poly.figure is None:
             raise RuntimeError('You must first add the polygon to a figure or canvas before defining the interactor')
+        self.ax = ax
         canvas = poly.figure.canvas
         self.poly = poly
         self.poly.verts = list(self.poly.verts)
         x, y = zip(*self.poly.verts)
-        self.line = Line2D(x,y,marker='o', markerfacecolor='r')
+        self.line = Line2D(x,y,marker='o', markerfacecolor='r', animated=True)
         #self._update_line(poly)
         
         cid = self.poly.add_callback(self.poly_changed)
         self._ind = None # the active vert
 
+        canvas.mpl_connect('draw_event', self.draw_callback)
         canvas.mpl_connect('button_press_event', self.button_press_callback)
         canvas.mpl_connect('key_press_event', self.key_press_callback)        
         canvas.mpl_connect('button_release_event', self.button_release_callback)
         canvas.mpl_connect('motion_notify_event', self.motion_notify_callback)                
         self.canvas = canvas
         
 
+    def draw_callback(self, event):
+        self.background = self.canvas.copy_from_bbox(self.ax.bbox)
+        self.ax.draw_artist(self.poly)
+        self.ax.draw_artist(self.line)
+        self.canvas.blit(self.ax.bbox)
+        
     def poly_changed(self, poly):
         'this method is called whenever the polygon object is called'
         # only copy the artist props to the line (except visibility)
@@ -123,7 +131,12 @@ def motion_notify_callback(self, event):
         x,y = event.xdata, event.ydata
         self.poly.verts[self._ind] = x,y
         self.line.set_data(zip(*self.poly.verts))
-        self.canvas.draw_idle()
+
+        self.canvas.restore_region(self.background)
+        self.ax.draw_artist(self.poly)
+        self.ax.draw_artist(self.line)
+        self.canvas.blit(self.ax.bbox)
+
 
 
 from pylab import *
@@ -133,14 +146,14 @@ def motion_notify_callback(self, event):
 
 
 fig = figure()
-circ = Circle((.5,.5),.5)
+circ = CirclePolygon((.5,.5),.5, animated=True)
 
 
 
 
 ax = subplot(111)
 ax.add_patch(circ)
-p = PolygonInteractor( circ)
+p = PolygonInteractor( ax, circ)
 
 ax.add_line(p.line)
 ax.set_title('Click and drag a point to move it')
diff --git a/lib/matplotlib/mathtext2.py b/lib/matplotlib/mathtext2.py
@@ -475,8 +475,8 @@ def render(self, x, y):
         self.sup.render(supx, supy)
 
     def __repr__(self):
-        tmp = (repr(i) for i in [self.env, self.nuc, self.type,
-            self.sub, self.sup])
+        tmp = [repr(i) for i in [self.env, self.nuc, self.type,
+            self.sub, self.sup]]
         tmp = tuple(tmp)
         return "Scripted(env=%s,nuc=%s, type=%s, \
 sub=%s, sup=%s)"%tmp
@@ -850,4 +850,4 @@ def math_parse_s_ft2font1(s, dpi, fontsize, angle=0):
     texstring = _textclass(r"1_2^{4^5}32 5")
     parsed = parse_tex(texstring)
     #~ print bool(a)
-    #print is_scriptcommand('\\subscript')
+    #print is_scriptcommand('\\subscript')
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -792,8 +792,12 @@ def onselect(vmin, vmax):
           print vmin, vmax
       span = SpanSelector(ax, onselect, 'horizontal')
 
+      onmove_callback is an optional callback that will be called on mouse move
+      with the span range
+
     """
-    def __init__(self, ax, onselect, direction, minspan=None, useblit=False, rectprops=None):
+
+    def __init__(self, ax, onselect, direction, minspan=None, useblit=False, rectprops=None, onmove_callback=None):
         """
         Create a span selector in ax.  When a selection is made, clear
         the span and call onselect with
@@ -833,6 +837,7 @@ def __init__(self, ax, onselect, direction, minspan=None, useblit=False, rectpro
 
         self.rectprops = rectprops
         self.onselect = onselect
+        self.onmove_callback = onmove_callback
         self.useblit = useblit
         self.minspan = minspan
 
@@ -928,6 +933,17 @@ def onmove(self, event):
         else:
             self.rect.xy[1] = minv
             self.rect.set_height(maxv-minv)
+
+        if self.onmove_callback is not None:
+            vmin = self.pressv
+            if self.direction == 'horizontal':
+                vmax = event.xdata or self.prev[0]
+            else:
+                vmax = event.ydata or self.prev[1]
+
+            if vmin>vmax: vmin, vmax = vmax, vmin
+            self.onmove_callback(vmin, vmax)
+            
         self.update()
         return False
 
