fixed wxapp init bug

svn path=/trunk/matplotlib/; revision=1158

Author: jdh2358

API_CHANGES

@@ -17,7 +17,7 @@ API CHANGES in matplotlib-0.72
   pylab figure now defaults to num=None, which creates a new figure
   with a guaranteed unique number 
 
-  contour method syntax changed - now it is matlab compatible
+  contsour method syntax changed - now it is matlab compatible
 
     unchanged: contour(Z)
     old: contour(Z, x=Y, y=Y)

CHANGELOG

@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2005-04-11 fixed wxapp init bug
+
 2005-04-02 updated backend_ps.draw_lines, draw_markers for use with the
            new API - DSD
 

TODO

@@ -691,10 +691,16 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- DONE hide lazy values make dpi and friends setters
 
--- add a get description to axes which returns the args and kwargs to construct it 
+-- add a get description to axes which returns the args and kwargs to
+   construct it
 
 -- restore __all__ to pylab and add ArtistInspector
 
-
 -- create set_window_title in the figure manager interface expose this
-   in the figure command
+   in the figure command
+
+-- multiple tick marks
+
+-- colorbar not updating in CVS
+
+-- tkagg figure not launching new figure until plot is called?

examples/legend_demo.py

@@ -37,8 +37,8 @@
 # see text.Text, lines.Line2D, and patches.Rectangle for more info on
 # the settable properties of lines, text, and rectangles
 frame.set_facecolor(0.80)     # set the frame face color to light gray
-set(ltext, 'fontsize', 'small')    # the legend text fontsize
-set(llines, 'linewidth', 1.5) # the legend linewidth
+set(ltext, fontsize='small')    # the legend text fontsize
+set(llines, linewidth=1.5) # the legend linewidth
 #leg.draw_frame(False)         # don't draw the legend frame
 #savefig('legend_demo')
 show()

examples/mri_demo.py

@@ -3,7 +3,7 @@
 
 # data are 256x256 16 bit integers
 dfile = 'data/s1045.ima'
-im = fromstring(file(dfile, 'rb').read(), Int16).astype(Float)
+im = fromstring(file(dfile, 'rb').read(), UInt16).astype(Float)
 im.shape = 256, 256
 
 #imshow(im, ColormapJet(256))

examples/mri_with_eeg.py

@@ -15,7 +15,7 @@
 if 1:   # load the data
     # data are 256x256 16 bit integers
     dfile = 'data/s1045.ima'
-    im = fromstring(file(dfile, 'rb').read(), Int16).astype(Float)
+    im = fromstring(file(dfile, 'rb').read(), UInt16).astype(Float)
     im.shape = 256, 256
 
 if 1: # plot the MRI in pcolor

examples/poly_editor.py

@@ -3,6 +3,7 @@
 matplotlib event handling to interact with objects on the canvas
 
 """
+from matplotlib.artist import Artist
 from matplotlib.patches import Polygon
 from matplotlib.numerix import sqrt, nonzero, equal, asarray, dot, Float
 from matplotlib.numerix.mlab import amin
@@ -11,9 +12,9 @@
 
 
 
-class EditablePolygon(Polygon):
+class PolygonInteractor:
     """
-    An editable polygon.
+    An polygon editor.
 
     Key-bindings
 
@@ -29,105 +30,120 @@ class EditablePolygon(Polygon):
 
     showverts = True
     epsilon = 5  # max pixel distance to count as a vertex hit
-    def __init__(self, *args, **kwargs):
-        Polygon.__init__(self, *args, **kwargs)        
-        self.line = Line2D([],[],marker='o', markerfacecolor='r')
-        self._ind = None # the active vert
 
-        self.xy = list(self.xy)  # make sure it is editable
-        
-    def set_figure(self, fig):
-        Polygon.set_figure(self, fig)
-        self.line.set_figure(fig)
-        self.figure.canvas.mpl_connect('button_press_event', self.button_press_callback)
-        self.figure.canvas.mpl_connect('key_press_event', self.key_press_callback)        
-        self.figure.canvas.mpl_connect('button_release_event', self.button_release_callback)
-        self.figure.canvas.mpl_connect('motion_notify_event', self.motion_notify_callback)                
-        
+    def __init__(self, poly):
+        if poly.figure is None:
+            raise RuntimeError('You must first add the polygon to a figure or canvas before defining the interactor')
+        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._update_line(poly)
 
-    def set_transform(self, trans):
-        Polygon.set_transform(self, trans)
-        self.line.set_transform(trans)
-
-    def set_clip_on(self, b):
-        Polygon.set_clip_on(self, b)
-        self.line.set_clip_on(b)
-
-    def set_clip_box(self, b):
-        Polygon.set_clip_box(self, b)
-        self.line.set_clip_box(b)
+        cid = self.poly.add_callback(self.poly_changed)
+        self._ind = None # the active vert
 
+        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(self, renderer):
-        if not self._visible: return 
-        Polygon.draw(self, renderer)
-        if self.showverts:            
-            self.line.set_data(zip(*self.xy))
-            self.line.draw(renderer)
+    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)
+        vis = self.line.get_visible()
+        Artist.update_from(self.line, poly)
+        self.line.set_visible(vis)  # don't use the poly visibility state
+        
 
     def get_ind_under_point(self, event):
-        x, y = zip(*self.xy)
+        'get the index of the vertex under point if within epsilon tolerance'
+        x, y = zip(*self.poly.verts)
+        
         # display coords        
-        xt, yt = self._transform.numerix_x_y(x, y)
+        xt, yt = self.poly.get_transform().numerix_x_y(x, y)
         d = sqrt((xt-event.x)**2 + (yt-event.y)**2)
         indseq = nonzero(equal(d, amin(d)))
         ind = indseq[0]
+
         if d[ind]>=self.epsilon:
             ind = None
 
         return ind
 
     def button_press_callback(self, event):
+        'whenever a mouse button is pressed'
         if not self.showverts: return 
         if event.inaxes==None: return
+        if event.button != 1: return
         self._ind = self.get_ind_under_point(event)
-        
 
     def button_release_callback(self, event):
-        if not self.showverts: return 
+        'whenever a mouse button is released'
+        if not self.showverts: return
+        if event.button != 1: return
         self._ind = None
 
     def key_press_callback(self, event):
+        'whenever a key is pressed'
         if not event.inaxes: return
         if event.key=='t':
             self.showverts = not self.showverts
+            self.line.set_visible(self.showverts)
             if not self.showverts: self._ind = None
         elif event.key=='d':
             ind = self.get_ind_under_point(event)
             if ind is not None:
-                self.xy = [tup for i,tup in enumerate(self.xy) if i!=ind]
+                self.poly.verts = [tup for i,tup in enumerate(self.poly.verts) if i!=ind]
+                self.line.set_data(zip(*self.poly.verts))
         elif event.key=='i':            
-            xys = self._transform.seq_xy_tups(self.xy)
+            xys = self.poly.get_transform().seq_xy_tups(self.poly.verts)
             p = event.x, event.y # display coords
             for i in range(len(xys)-1):                
                 s0 = xys[i]
                 s1 = xys[i+1]
                 d = dist_point_to_segment(p, s0, s1)
                 if d<=self.epsilon:
-                    self.xy.insert(i+1, (event.xdata, event.ydata))
+                    self.poly.verts.insert(i+1, (event.xdata, event.ydata))
+                    self.line.set_data(zip(*self.poly.verts))
                     break
 
-                
-
-
-        self.figure.canvas.draw()
+            
+        self.canvas.draw()
 
     def motion_notify_callback(self, event):
+        'on mouse movement'
         if not self.showverts: return 
         if self._ind is None: return
         if event.inaxes is None: return
+        if event.button != 1: return
         x,y = event.xdata, event.ydata
-        self.xy[self._ind] = x,y
-        self.figure.canvas.draw_idle()
+        self.poly.verts[self._ind] = x,y
+        self.line.set_data(zip(*self.poly.verts))
+        self.canvas.draw_idle()
 
 
 from pylab import *
-verts = Circle((.5,.5),.5).get_verts()
-p = EditablePolygon(verts)
+
+
+
+
 
 fig = figure()
+circ = Circle((.5,.5),.5)
+
+
+
+
 ax = subplot(111)
-ax.add_patch(p)
-title('Click and drag a point to move it')
-axis([0,1,0,1])
+ax.add_patch(circ)
+p = PolygonInteractor( circ)
+
+ax.add_line(p.line)
+ax.set_title('Click and drag a point to move it')
+ax.set_xlim((0,1))
+ax.set_ylim((0,1))
 show()