Set rectangles and lines property for backcompat

Author: chahak13

doc/api/prev_api_changes/api_changes_2.1.0.rst

@@ -422,8 +422,8 @@ The ``shading`` kwarg to `~matplotlib.axes.Axes.pcolor` has been
 removed.  Set ``edgecolors`` appropriately instead.
 
 
-Functions removed from the `.lines` module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Functions removed from the ``lines`` module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The :mod:`matplotlib.lines` module no longer imports the
 ``pts_to_prestep``, ``pts_to_midstep`` and ``pts_to_poststep``

lib/matplotlib/tests/test_widgets.py

@@ -1006,8 +1006,13 @@ def test_check_radio_buttons_image():
     rb = widgets.RadioButtons(rax1, ('Radio 1', 'Radio 2', 'Radio 3'))
     with pytest.warns(DeprecationWarning):
         rb.circles  # Trigger the old-style elliptic radiobuttons.
-    widgets.CheckButtons(rax2, ('Check 1', 'Check 2', 'Check 3'),
-                         (False, True, True))
+    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
+    with pytest.warns(DeprecationWarning):
+        cb.lines
 
 
 @check_figures_equal(extensions=["png"])
@@ -1020,6 +1025,18 @@ def test_radio_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(fig_test, fig_ref):
+    widgets.CheckButtons(fig_test.subplots(), ["tea", "coffee"], [True, True])
+    ax = fig_ref.add_subplot(xticks=[], yticks=[])
+    ax.scatter([.15, .15], [2/3, 1/3], marker='s', transform=ax.transAxes,
+               s=(plt.rcParams["font.size"] / 2) ** 2, c=["none", "none"])
+    ax.scatter([.15, .15], [2/3, 1/3], marker='x', transform=ax.transAxes,
+               s=(plt.rcParams["font.size"] / 2) ** 2, c=["k", "k"])
+    ax.text(.25, 2/3, "tea", transform=ax.transAxes, va="center")
+    ax.text(.25, 1/3, "coffee", transform=ax.transAxes, va="center")
+
+
 def test_slider_slidermin_slidermax_invalid():
     fig, ax = plt.subplots()
     # test min/max with floats

lib/matplotlib/widgets.py

@@ -1011,7 +1011,8 @@ def __init__(self, ax, labels, actives=None):
             for y, label in zip(ys, labels)]
 
         self._squares = ax.scatter(
-            [0.15] * len(ys), ys, marker='s', c="none", s=text_size**2,
+            [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"
         )
         mask = [not x for x in actives]
@@ -1038,8 +1039,9 @@ def _clicked(self, event):
             for i, (p, t) in enumerate(zip(self._rectangles, self.labels)):
                 if (t.get_window_extent().contains(event.x, event.y)
                         or (
-                            p.get_x() < event.x < p.get_x() + p.get_width()
-                            and p.get_y() < event.y < p.get_y()
+                            p.get_x() <= pclicked[0] <= p.get_x()
+                                                    + p.get_width()
+                            and p.get_y() <= pclicked[1] <= p.get_y()
                                                     + p.get_height()
                             )):
                     distances[i] = np.linalg.norm(pclicked - p.get_center())
@@ -1081,11 +1083,10 @@ def set_active(self, index):
         )
         self._crosses.set_facecolor(cross_facecolors)
 
-        if hasattr(self, "_rectangles"):
-            for i, p in enumerate(self._rectangles):
-                p.set_facecolor("k" if colors.same_color(
-                    p.get_facecolor(), colors.to_rgba("none"))
-                                else "none")
+        if hasattr(self, "_lines"):
+            l1, l2 = self._lines[index]
+            l1.set_visible(not l1.get_visible())
+            l2.set_visible(not l2.get_visible())
 
         if self.drawon:
             self.ax.figure.canvas.draw()
@@ -1113,24 +1114,51 @@ def disconnect(self, cid):
         """Remove the observer with connection id *cid*."""
         self._observers.disconnect(cid)
 
+    @_api.deprecated("3.7")
     @property
     def rectangles(self):
-        if not hasattr(self, "rectangles"):
+        if not hasattr(self, "_rectangles"):
+            ys = np.linspace(1, 0, len(self.labels)+2)[1:-1]
             dy = 1. / (len(self.labels) + 1)
             w, h = dy / 2, dy / 2
             rectangles = self._rectangles = [
-                Rectangle(xy=self._squares.get_offsets()[i], width=w, height=h,
+                Rectangle(xy=(0.05, ys[i] - h / 2), width=w, height=h,
                           edgecolor="black",
                           facecolor=self._squares.get_facecolor()[i],
                           transform=self.ax.transAxes
                           )
-                for i in range(len(self.labels))
+                for i, y in enumerate(ys)
             ]
             self._squares.set_visible(False)
             for rectangle in rectangles:
                 self.ax.add_patch(rectangle)
         return self._rectangles
 
+    @_api.deprecated("3.7")
+    @property
+    def lines(self):
+        if not hasattr(self, "_lines"):
+            ys = np.linspace(1, 0, len(self.labels)+2)[1:-1]
+            self._crosses.set_visible(False)
+            dy = 1. / (len(self.labels) + 1)
+            w, h = dy / 2, dy / 2
+            self._lines = []
+            current_status = self.get_status()
+            lineparams = {'color': 'k', 'linewidth': 1.25,
+                          'transform': self.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(current_status[i])
+                l2.set_visible(current_status[i])
+                self._lines.append((l1, l2))
+                self.ax.add_patch(l1)
+                self.ax.add_patch(l2)
+        return self._lines
+
 
 class TextBox(AxesWidget):
     """