Merge pull request #12955 from anntzer/cursor_demo

dstansby · web-flow · commit 6a071fd543d4 · 2018-12-15T12:38:08.000Z
Cleanup cursor_demo.
diff --git a/examples/misc/cursor_demo_sgskip.py b/examples/misc/cursor_demo_sgskip.py
@@ -3,19 +3,20 @@
 Cursor Demo
 ===========
 
-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.
+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.
+:doc:`/gallery/user_interfaces/wxcursor_demo_sgskip`.
 
-The mpldatacursor and mplcursors third-party packages can be used to achieve a
-similar effect.  See
+The mpldatacursor__ and mplcursors__ third-party packages can be used to
+achieve a similar effect.
 
-    https://github.com/joferkington/mpldatacursor
-    https://github.com/anntzer/mplcursors
+__ https://github.com/joferkington/mpldatacursor
+__ https://github.com/anntzer/mplcursors
 """
+
 import matplotlib.pyplot as plt
 import numpy as np
 
@@ -39,13 +40,13 @@ def mouse_move(self, event):
         self.ly.set_xdata(x)
 
         self.txt.set_text('x=%1.2f, y=%1.2f' % (x, y))
-        plt.draw()
+        self.ax.figure.canvas.draw()
 
 
 class SnaptoCursor(object):
     """
-    Like Cursor but the crosshair snaps to the nearest x,y point
-    For simplicity, I'm assuming x is sorted
+    Like Cursor but the crosshair snaps to the nearest x, y point.
+    For simplicity, this assumes that *x* is sorted.
     """
 
     def __init__(self, ax, x, y):
@@ -58,13 +59,11 @@ def __init__(self, ax, x, y):
         self.txt = ax.text(0.7, 0.9, '', transform=ax.transAxes)
 
     def mouse_move(self, event):
-
         if not event.inaxes:
             return
 
         x, y = event.xdata, event.ydata
-
-        indx = min(np.searchsorted(self.x, [x])[0], len(self.x) - 1)
+        indx = min(np.searchsorted(self.x, x), len(self.x) - 1)
         x = self.x[indx]
         y = self.y[indx]
         # update the line positions
@@ -73,16 +72,20 @@ def mouse_move(self, event):
 
         self.txt.set_text('x=%1.2f, y=%1.2f' % (x, y))
         print('x=%1.2f, y=%1.2f' % (x, y))
-        plt.draw()
+        self.ax.figure.canvas.draw()
+
 
 t = np.arange(0.0, 1.0, 0.01)
 s = np.sin(2 * 2 * np.pi * t)
-fig, ax = plt.subplots()
 
-# cursor = Cursor(ax)
-cursor = SnaptoCursor(ax, t, s)
-plt.connect('motion_notify_event', cursor.mouse_move)
+fig, ax = plt.subplots()
+ax.plot(t, s, 'o')
+cursor = Cursor(ax)
+fig.canvas.mpl_connect('motion_notify_event', cursor.mouse_move)
 
+fig, ax = plt.subplots()
 ax.plot(t, s, 'o')
-plt.axis([0, 1, -1, 1])
+snap_cursor = SnaptoCursor(ax, t, s)
+fig.canvas.mpl_connect('motion_notify_event', snap_cursor.mouse_move)
+
 plt.show()
diff --git a/examples/user_interfaces/wxcursor_demo_sgskip.py b/examples/user_interfaces/wxcursor_demo_sgskip.py
@@ -6,7 +6,6 @@
 Example to draw a cursor and report the data coords in wx.
 """
 
-
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
 from matplotlib.backends.backend_wx import NavigationToolbar2Wx
 from matplotlib.figure import Figure
@@ -63,6 +62,7 @@ def OnInit(self):
         frame.Show(True)
         return True
 
+
 if __name__ == '__main__':
     app = App(0)
     app.MainLoop()
