Add tests to check .rectangles and .lines fallback

chahak13 · chahak13 · commit ba30bdfafe7d · 2022-12-17T09:35:53.000+05:30
diff --git a/doc/api/next_api_changes/deprecations/24474_CM.rst b/doc/api/next_api_changes/deprecations/24474_CM.rst
@@ -1,3 +1,3 @@
-``CheckButtons``
-~~~~~~~~~~~~~~~~~~~~~~~~~
+``CheckButtons.rectangles`` and ``CheckButtons.lines``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ``CheckButtons.rectangles`` and ``CheckButtons.lines`` are deprecated.  (``CheckButtons`` now draws itself using `~.Axes.scatter`.)
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -7,6 +7,8 @@
 import matplotlib.colors as mcolors
 import matplotlib.widgets as widgets
 import matplotlib.pyplot as plt
+from matplotlib.patches import Rectangle
+from matplotlib.lines import Line2D
 from matplotlib.testing.decorators import check_figures_equal, image_comparison
 from matplotlib.testing.widgets import (click_and_drag, do_event, get_ax,
                                         mock_event, noop)
@@ -1009,8 +1011,7 @@ def test_check_radio_buttons_image():
     cb = widgets.CheckButtons(rax2, ('Check 1', 'Check 2', 'Check 3'),
                               (False, True, True))
     with pytest.warns(DeprecationWarning):
-        # Trigger old-style Rectangle check boxes
-        cb.rectangles
+        cb.rectangles  # Trigger old-style Rectangle check boxes
 
 
 @check_figures_equal(extensions=["png"])
@@ -1035,6 +1036,55 @@ def test_check_buttons(fig_test, fig_ref):
     ax.text(.25, 1/3, "coffee", transform=ax.transAxes, va="center")
 
 
+@check_figures_equal(extensions=["png"])
+def test_check_buttons_rectangles(fig_test, fig_ref):
+    # Test should be removed once .rectangles is removed
+    cb = widgets.CheckButtons(fig_test.subplots(), ["", ""],
+                              [False, False])
+    with pytest.warns(DeprecationWarning):
+        cb.rectangles
+    ax = fig_ref.add_subplot(xticks=[], yticks=[])
+    ys = [2/3, 1/3]
+    dy = 1/3
+    w, h = dy / 2, dy / 2
+    rectangles = [
+        Rectangle(xy=(0.05, ys[i] - h / 2), width=w, height=h,
+                  edgecolor="black",
+                  facecolor="none",
+                  transform=ax.transAxes
+                  )
+        for i, y in enumerate(ys)
+    ]
+    for rectangle in rectangles:
+        ax.add_patch(rectangle)
+
+
+@check_figures_equal(extensions=["png"])
+def test_check_buttons_lines(fig_test, fig_ref):
+    # Test should be removed once .lines is removed
+    cb = widgets.CheckButtons(fig_test.subplots(), ["", ""], [True, True])
+    with pytest.warns(DeprecationWarning):
+        cb.lines
+    for rectangle in cb._rectangles:
+        rectangle.set_visible(False)
+    ax = fig_ref.add_subplot(xticks=[], yticks=[])
+    ys = [2/3, 1/3]
+    dy = 1/3
+    w, h = dy / 2, dy / 2
+    lineparams = {'color': 'k', 'linewidth': 1.25,
+                    'transform': ax.transAxes,
+                    'solid_capstyle': 'butt'}
+    for i, y in enumerate(ys):
+        x, y = 0.05, y - h / 2
+        l1 = Line2D([x, x + w], [y + h, y], **lineparams)
+        l2 = Line2D([x, x + w], [y, y + h], **lineparams)
+
+        l1.set_visible(True)
+        l2.set_visible(True)
+        ax.add_line(l1)
+        ax.add_line(l2)
+
+
 def test_slider_slidermin_slidermax_invalid():
     fig, ax = plt.subplots()
     # test min/max with floats
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1012,13 +1012,11 @@ def __init__(self, ax, labels, actives=None):
 
         self._squares = ax.scatter(
             [0.15] * len(ys), ys, marker='s', s=text_size**2,
-            c=["none" for _ in range(len(ys))],
-            linewidth=1, transform=ax.transAxes, edgecolor="k"
+            c="none", linewidth=1, transform=ax.transAxes, edgecolor="k"
         )
-        mask = [not x for x in actives]
         self._crosses = ax.scatter(
             [0.15] * len(ys), ys, marker='x', linewidth=1, s=text_size**2,
-            c=["k" if actives[i] else "none" for i in range(len(ys))],
+            c=["k" if active else "none" for active in actives],
             transform=ax.transAxes
         )
 
@@ -1030,22 +1028,19 @@ def _clicked(self, event):
         if self.ignore(event) or event.button != 1 or event.inaxes != self.ax:
             return
         pclicked = self.ax.transAxes.inverted().transform((event.x, event.y))
-        _, square_inds = self._squares.contains(event)
-        coords = self._squares.get_offset_transform().transform(
-            self._squares.get_offsets()
-        )
         distances = {}
         if hasattr(self, "_rectangles"):
             for i, (p, t) in enumerate(zip(self._rectangles, self.labels)):
+                x0, y0 = p.get_xy()
                 if (t.get_window_extent().contains(event.x, event.y)
-                        or (
-                            p.get_x() <= pclicked[0] <= p.get_x()
-                                                    + p.get_width()
-                            and p.get_y() <= pclicked[1] <= p.get_y()
-                                                    + p.get_height()
-                            )):
+                        or (x0 <= pclicked[0] <= x0 + p.get_width()
+                            and y0 <= pclicked[1] <= y0 + p.get_height())):
                     distances[i] = np.linalg.norm(pclicked - p.get_center())
         else:
+            _, square_inds = self._squares.contains(event)
+            coords = self._squares.get_offset_transform().transform(
+                self._squares.get_offsets()
+            )
             for i, t in enumerate(self.labels):
                 if (i in square_inds["ind"]
                         or t.get_window_extent().contains(event.x, event.y)):
@@ -1074,12 +1069,12 @@ def set_active(self, index):
             raise ValueError(f'Invalid CheckButton index: {index}')
 
         cross_facecolors = self._crosses.get_facecolor()
-        cross_facecolors[index] = (
-            colors.to_rgba("black")
+        cross_facecolors[index] = colors.to_rgba(
+            "black"
             if colors.same_color(
-                cross_facecolors[index], colors.to_rgba("none")
+                    cross_facecolors[index], colors.to_rgba("none")
             )
-            else colors.to_rgba("none")
+            else "none"
         )
         self._crosses.set_facecolor(cross_facecolors)
 
@@ -1098,9 +1093,8 @@ def get_status(self):
         """
         Return a tuple of the status (True/False) of all of the check buttons.
         """
-        return [False if colors.same_color(
-            self._crosses.get_facecolors()[i], colors.to_rgba("none"))
-                else True for i in range(len(self.labels))]
+        return [not colors.same_color(color, colors.to_rgba("none"))
+                for color in self._crosses.get_facecolors()]
 
     def on_clicked(self, func):
         """
@@ -1124,7 +1118,7 @@ def rectangles(self):
             rectangles = self._rectangles = [
                 Rectangle(xy=(0.05, ys[i] - h / 2), width=w, height=h,
                           edgecolor="black",
-                          facecolor=self._squares.get_facecolor()[i],
+                          facecolor="none",
                           transform=self.ax.transAxes
                           )
                 for i, y in enumerate(ys)
