fixed cursor demos

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

Author: jdh2358

INSTALL

@@ -123,14 +123,13 @@ PACKAGE MANAGERS: (rpms, apt, fink)
     packages at http://mentors.debian.net
 
 
-      * add these lines to your /etc/apt/sources.list: 
+    * add this lines to your /etc/apt/sources.list:
+      deb http://anakonda.altervista.org/debian packages/
+      deb-src http://anakonda.altervista.org/debian sources/
 
-      deb http://mentors.debian.net/debian unstable main contrib non-free
-      deb-src http://mentors.debian.net/debian unstable main contrib non-free
-
-      * then run:
-        # apt-get update
-        # apt-get install python-matplotlib python-matplotlib-doc
+    * then run:
+      # apt-get update
+      # apt-get install python-matplotlib python-matplotlib-doc
 
   OS X
 

TODO

@@ -539,4 +539,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 -- user events and nav event clashing on tkagg coords_demo/win32
 
 -- check signal connect and disconnect in interactive use with
-   multiple figure creation / deletion etc.
+   multiple figure creation / deletion etc.
+
+-- add xlim, ylim

examples/cursor_demo.py

@@ -1,5 +1,13 @@
 #!/usr/bin/env python
+"""
 
+This example shows how to use matplotlib to provide a data cursor.  It
+uses matplotlib to draw the cursor and may be a slow since this
+requires redrawing the figure with every mouse move.
+
+Faster cursoring is possible using native GUI drawing, as in
+wxcursor_demo.py
+"""
 from matplotlib.matlab import *
 
 
@@ -13,27 +21,19 @@ def __init__(self, canvas, ax):
         # text location in axes coords
         self.txt = ax.text( 0.7, 0.9, '', transform=ax.transAxes)
 
-    def mouse_move(self, widget, event):
-        height = self.ax.figure.bbox.height()
-        x, y = event.x, height-event.y
-
-        if self.ax.in_axes(x, y):
-            # transData transforms data coords to display coords.  Use
-            # the inverse method to transform back to data coords then
-            # update the line
+    def mouse_move(self, event):
+        if not event.inaxes: return 
+        ax = event.inaxes
+        minx, maxx = ax.get_xlim()
+        miny, maxy = ax.get_ylim()
 
-            # the cursor position
-            x, y =  ax.transData.inverse_xy_tup( (x,y) )            
-            # the view limits
-            minx, maxx = ax.viewLim.intervalx().get_bounds()
-            miny, maxy = ax.viewLim.intervaly().get_bounds()
+        x, y = event.xdata, event.ydata
+        # update the line positions
+        self.lx.set_data( (minx, maxx), (y, y) )
+        self.ly.set_data( (x, x), (miny, maxy) )
 
-            # update the line positions
-            self.lx.set_data( (minx, maxx), (y, y) )
-            self.ly.set_data( (x, x), (miny, maxy) )
-
-            self.txt.set_text( 'x=%1.2f, y=%1.2f'%(x,y) )
-            self.canvas.draw()
+        self.txt.set_text( 'x=%1.2f, y=%1.2f'%(x,y) )
+        self.canvas.draw()
 
 
 class SnaptoCursor:
@@ -51,40 +51,34 @@ def __init__(self, canvas, ax, x, y):
         # text location in axes coords
         self.txt = ax.text( 0.7, 0.9, '', transform=ax.transAxes)
 
-    def mouse_move(self, widget, event):
-        height = self.ax.figure.bbox.height()
-        x, y = event.x, height-event.y
-
-        if self.ax.in_axes(x, y):
-            # transData transforms data coords to display coords.  Use
-            # the inverse method to transform back to data coords then
-            # update the line
-
-            # the cursor position
-            x, y =  ax.transData.inverse_xy_tup( (x,y) )            
-            # the view limits
-            minx, maxx = ax.viewLim.intervalx().get_bounds()
-            miny, maxy = ax.viewLim.intervaly().get_bounds()
-
-            indx = searchsorted(self.x, [x])[0]
-            x = self.x[indx]
-            y = self.y[indx]            
-            # update the line positions
-            self.lx.set_data( (minx, maxx), (y, y) )
-            self.ly.set_data( (x, x), (miny, maxy) )
-
-            self.txt.set_text( 'x=%1.2f, y=%1.2f'%(x,y) )
-            print 'x=%1.2f, y=%1.2f'%(x,y)
-            self.canvas.draw()
+    def mouse_move(self, event):
+
+        if not event.inaxes: return 
+        ax = event.inaxes
+        minx, maxx = ax.get_xlim()
+        miny, maxy = ax.get_ylim()
+
+        x, y = event.xdata, event.ydata
+
+        indx = searchsorted(self.x, [x])[0]
+        x = self.x[indx]
+        y = self.y[indx]            
+        # update the line positions
+        self.lx.set_data( (minx, maxx), (y, y) )
+        self.ly.set_data( (x, x), (miny, maxy) )
+
+        self.txt.set_text( 'x=%1.2f, y=%1.2f'%(x,y) )
+        print 'x=%1.2f, y=%1.2f'%(x,y)
+        self.canvas.draw()
 
 t = arange(0.0, 1.0, 0.01)
 s = sin(2*2*pi*t)
 ax = subplot(111)
 
 canvas = get_current_fig_manager().canvas
-#cursor = Cursor(canvas, ax)
-cursor = SnaptoCursor(canvas, ax, t, s) 
-canvas.connect('motion_notify_event', cursor.mouse_move)
+cursor = Cursor(canvas, ax)
+#cursor = SnaptoCursor(canvas, ax, t, s) 
+canvas.mpl_connect('motion_notify_event', cursor.mouse_move)
 
 ax.plot(t, s, 'o')
 axis([0,1,-1,1])

examples/pythonic_matplotlib.py

@@ -52,7 +52,7 @@
 
 fig = figure(1)
 
-ax1 = subplot(211)
+ax1 = fig.add_subplot(211)
 ax1.plot(t, sin(2*pi*t))
 ax1.grid(True)
 ax1.set_ylim( (-2,2) )
@@ -63,7 +63,7 @@
     label.set_color('r')
 
 
-ax2 = subplot(212)
+ax2 = fig.add_subplot(212)
 ax2.plot(t, sin(2*2*pi*t))
 ax2.grid(True)
 ax2.set_ylim( (-2,2) )

examples/wxcursor_demo.py

@@ -44,6 +44,8 @@ def __init__(self):
 
         self.add_toolbar()  # comment this out for no toolbar
 
+        EVT_PAINT(self, self.OnPaint)
+
 
     def mouse_move(self, event):
         self.draw_cursor(event)
@@ -58,22 +60,19 @@ def add_toolbar(self):
         # update the axes menu on the toolbar
         self.toolbar.update()  
 
-        
     def OnPaint(self, event):
+        self.erase_cursor()
         try: del self.lastInfo
         except AttributeError: pass
         self.canvas.draw()
+        event.Skip()
 
     def draw_cursor(self, event):
         'event is a MplEvent.  Draw a cursor over the axes'
-
         if event.inaxes is None:
-            try: lastline1, lastline2, lastax, lastdc = self.lastInfo
+            self.erase_cursor()
+            try: del self.lastInfo
             except AttributeError: pass
-            else:
-                lastdc.DrawLine(*lastline1) # erase old
-                lastdc.DrawLine(*lastline2) # erase old
-                del self.lastInfo
             return
         canvas = self.canvas
         figheight = canvas.figure.bbox.height()
@@ -97,12 +96,7 @@ def draw_cursor(self, event):
 
         x, y, left, right, bottom, top = [int(val) for val in x, y, left, right, bottom, top]
 
-        try: lastline1, lastline2, lastax, lastdc = self.lastInfo
-        except AttributeError: pass
-        else:
-            lastdc.DrawLine(*lastline1) # erase old
-            lastdc.DrawLine(*lastline2) # erase old            
-
+        self.erase_cursor()
         line1 = (x, bottom, x, top)
         line2 = (left, y, right, y)
         self.lastInfo = line1, line2, ax, dc
@@ -113,7 +107,13 @@ def draw_cursor(self, event):
         time, price = event.xdata, event.ydata
         self.statusBar.SetStatusText("Time=%f  Price=%f"% (time, price), 0)
 
-
+    def erase_cursor(self):
+        try: lastline1, lastline2, lastax, lastdc = self.lastInfo
+        except AttributeError: pass
+        else:
+            lastdc.DrawLine(*lastline1) # erase old
+            lastdc.DrawLine(*lastline2) # erase old            
+        
 class App(wxApp):
 
     def OnInit(self):