Move inaxes method from Figure to FigureCanvas

lkjell · lkjell · commit bb5ada7f68f2 · 2018-03-06T02:22:58.000+01:00
diff --git a/doc/users/next_whats_new/2017-11-24_figure_inaxes.rst b/doc/users/next_whats_new/2017-11-24_figure_inaxes.rst
diff --git a/doc/users/next_whats_new/2017-11-24_figurecanvas_inaxes.rst b/doc/users/next_whats_new/2017-11-24_figurecanvas_inaxes.rst
@@ -0,0 +1,6 @@
+
+Add ``inaxes`` method to FigureCanvas
+-------------------------------------------------------------
+
+The `FigureCanvas` class has now an ``inaxes`` method to check whether a point is in an axes
+and returns the topmost axes, else None.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1497,7 +1497,7 @@ def __init__(self, name, canvas, x, y, guiEvent=None):
             return
 
         if self.canvas.mouse_grabber is None:
-            self.inaxes = self.canvas.figure.inaxes((x, y))
+            self.inaxes = self.canvas.inaxes((x, y))
         else:
             self.inaxes = self.canvas.mouse_grabber
 
@@ -1988,6 +1988,38 @@ def enter_notify_event(self, guiEvent=None, xy=None):
         event = LocationEvent('figure_enter_event', self, x, y, guiEvent)
         self.callbacks.process('figure_enter_event', event)
 
+    @cbook.deprecated("2.1")
+    def idle_event(self, guiEvent=None):
+        """Called when GUI is idle."""
+        s = 'idle_event'
+        event = IdleEvent(s, self, guiEvent=guiEvent)
+        self.callbacks.process(s, event)
+
+    def inaxes(self, xy):
+        """
+        Check if a point is in an axes.
+
+        Parameters
+        ----------
+        xy : tuple or list
+            (x,y) coordinates.
+            x position - pixels from left of canvas.
+            y position - pixels from bottom of canvas.
+
+        Returns
+        -------
+        axes: topmost axes containing the point, or None if no axes.
+
+        """
+        axes_list = [a for a in self.figure.get_axes() if a.patch.contains_point(xy)]
+
+        if axes_list:
+            axes = cbook._topmost_artist(axes_list)
+        else:
+            axes = None
+
+        return axes
+
     def grab_mouse(self, ax):
         """
         Set the child axes which are currently grabbing the mouse events.
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1532,31 +1532,6 @@ def get_axes(self):
         """
         return self.axes
 
-    def inaxes(self, xy):
-        """
-        Check if a point is in an axes.
-
-        Parameters
-        ----------
-        xy : tuple or list
-            (x,y) coordinates.
-            x position - pixels from left of canvas.
-            y position - pixels from bottom of canvas.
-
-        Returns
-        -------
-        axes: topmost axes containing the point, or None if no axes.
-
-        """
-        axes_list = [a for a in self.get_axes() if a.patch.contains_point(xy)]
-
-        if axes_list:
-            axes = cbook._topmost_artist(axes_list)
-        else:
-            axes = None
-
-        return axes
-
     @docstring.dedent_interpd
     def legend(self, *args, **kwargs):
         """
