Merge pull request #7 from eslothower/task3

modified hover functions stub files & fixed style

Author: yanxinc

lib/matplotlib/artist.py

@@ -640,14 +640,23 @@ def set_hover(self, hover):
 
         Parameters
         ----------
-        hover : None or bool
+        hover : None or bool or callable or list
             This can be one of the following:
 
             - *None*: Hover is disabled for this artist (default).
 
             - A boolean: If *True* then hover will be enabled and the
               artist will fire a hover event if the mouse event is hovering over
               the artist.
+
+            - A function: If hover is callable, it is a user supplied
+              function which sets the hover message to be displayed.
+
+            - A list: If hover is a list of string literals, each string represents
+              an additional information assigned to each data point. These arbitrary
+              data labels will appear as a tooltip in the bottom right hand corner
+              of the screen when the cursor is detected to be hovering over a data
+              point that corresponds with one of the data labels.
         """
         self._hover = hover
 

lib/matplotlib/artist.pyi

@@ -78,8 +78,18 @@ class Artist:
     ]: ...
     def hoverable(self) -> bool: ...
     def hover(self, mouseevent: MouseEvent) -> None: ...
-    def set_hover(self, hover: None | bool) -> None: ...
-    def get_hover(self) -> None | bool: ...
+    def set_hover(
+        self,
+        hover: None
+        | bool
+        | list[str]
+        | Callable[[Artist, MouseEvent], tuple[bool, dict[Any, Any]]],
+    ) -> None: ...
+    def get_hover(
+        self,
+    ) -> None | bool | list[str] | Callable[
+        [Artist, MouseEvent], tuple[bool, dict[Any, Any]]
+    ]: ...
     def get_url(self) -> str | None: ...
     def set_url(self, url: str | None) -> None: ...
     def get_gid(self) -> str | None: ...

lib/matplotlib/backend_bases.py

@@ -3010,49 +3010,46 @@ def _mouse_event_to_message(event):
                 return s
         return ""
 
-    def mouse_move(self, event):
+    def _nonrect(self, x):
         from .patches import Rectangle
+        return not isinstance(x, Rectangle)
+
+    def _tooltip_list(self, event, hover):
+        import matplotlib.pyplot as plt
+        lines = plt.gca().get_lines()
+        num_of_points = 0
+        for line in lines:
+            num_of_points += 1
+        if num_of_points >= len(hover):
+            raise ValueError("""Number of data points
+            does not match up with number of labels""")
+        else:
+            mouse_x = event.xdata
+            mouse_y = event.ydata
+            for line in lines:
+                x_data = line.get_xdata()
+                y_data = line.get_ydata()
+                for i in range(len(x_data)):
+                    distance = ((event.xdata - x_data[i])**2
+                                + (event.ydata - y_data[i])**2)**0.5
+                    if distance < 0.05:
+                        return "Data Label: " + hover[i]
+
+    def mouse_move(self, event):
         self._update_cursor(event)
         self.set_message(self._mouse_event_to_message(event))
 
         if callable(getattr(self, 'set_hover_message', None)):
-            for a in self.canvas.figure.findobj(match=lambda x: not isinstance(x,
-                                                Rectangle), include_self=False):
-                inside = a.contains(event)
+            for a in self.canvas.figure.findobj(match=self._nonrect,
+                                                include_self=False):
+                inside, prop = a.contains(event)
                 if inside:
                     if a.hoverable():
                         hover = a.get_hover()
                         if callable(hover):
-                            newX, newY = hover(event)
-                            (self.set_hover_message("modified x = " + str(newX)
-                                                    + " modified y = " +
-                                                    str(newY) +
-                                                    "         Original coords: "
-                                                    ))
+                            self.set_hover_message(hover(event))
                         elif type(hover) == list:
-                            import matplotlib.pyplot as plt
-                            lines = plt.gca().get_lines()
-                            num_of_points = 0
-                            for line in lines:
-                                num_of_points += 1
-                            if num_of_points >= len(hover):
-                                raise ValueError("""Number of data points
-                                does not match up woth number of labels""")
-                            else:
-                                mouse_x = event.xdata
-                                mouse_y = event.ydata
-                                for line in lines:
-                                    x_data = line.get_xdata()
-                                    y_data = line.get_ydata()
-                                    for i in range(len(x_data)):
-                                        distance = ((event.xdata - x_data[i])**2
-                                                    + (event.ydata - y_data[i])**2)**0.5
-                                        if distance < 0.05:
-                                            (self.set_hover_message("Data Label: "
-                                                                    + hover[i] +
-                                                                    "         " +
-                                                                    "Original coords: "
-                                                                    ))
+                            self.set_hover_message(self._tooltip_list(event, hover))
                         else:
                             self.set_hover_message(self._mouse_event_to_message(event))
                 else:

lib/matplotlib/tests/test_toolkit.py

@@ -3,30 +3,21 @@
 from numpy.random import rand
 matplotlib.use('tkagg')
 
+fig, ax = plt.subplots()
 
-# Run this if it seems like your chanegs aren't being applied. If this does not
-# print something along the lines of:
-#   3.8.0.dev898+g0a062ed8bf.d20230506 /Users/eslothower/Desktop/matplotlib/lib/
-#   matplotlib/__init__.py
-# then this means you did not set up matplotlib for development:
-#   https://matplotlib.org/stable/devel/development_setup.html
-
-# print(matplotlib.__version__, matplotlib.__file__)
 
-# fig, ax = plt.subplots()
-# plt.ylabel('some numbers')
+def user_defined_function(event):
+    x, y = round(event.xdata * 10, 1), round(event.ydata + 3, 3)
+    return f'({x}, {y})'
 
 
-# def user_defined_function(event):
-#     return round(event.xdata * 10, 1), round(event.ydata + 3, 3)
+ax.plot(rand(100), 'o', hover=user_defined_function)
+plt.show()
 
-# ax.plot(rand(100), 'o', hover=user_defined_function)
-# plt.show()
 
 # Alternative test for testing out string literals as tooltips:
 
 fig, ax = plt.subplots()
-plt.ylabel('some numbers')
 
 ax.plot(rand(3), 'o', hover=['London', 'Paris', 'Barcelona'])
 plt.show()