Merge pull request #2922 from ericpre/tidy_up_range_widget

Fixes for matplotlib 3.5 and simplify maintenance of `RangeWidget`

conda_environment_dev.yml

@@ -3,12 +3,11 @@ channels:
 - conda-forge
 dependencies:
 # We pin freetype and matplotlib for the image comparison
-- freetype=2.9
-- matplotlib-base=3.1.3
+- freetype=2.10
+- matplotlib-base=3.5.1
 - cython
 - pytest
 - pytest-mpl
 - pytest-xdist
 - pytest-rerunfailures
 - pytest-instafail
-

hyperspy/_signals/signal1d.py

@@ -844,9 +844,9 @@ def integrate_in_range(self, signal_range='interactive',
             "instead.")
         deprecation_warning(msg)
 
-        if signal_range == 'interactive':
+        if signal_range == 'interactive':  # pragma: no cover
             self_copy = self.deepcopy()
-            ia = IntegrateArea(self_copy, signal_range)
+            ia = IntegrateArea(self_copy)
             ia.gui(display=display, toolkit=toolkit)
             integrated_signal1D = self_copy
         else:

hyperspy/drawing/_widgets/circle.py

@@ -106,15 +106,15 @@ def _set_patch(self):
         super(CircleWidget, self)._set_patch()
         xy = self._get_patch_xy()
         ro, ri = self.size
-        self.patch = [plt.Circle(
+        self._patch = [plt.Circle(
             xy, radius=ro,
             fill=False,
             lw=self.border_thickness,
             ec=self.color,
             alpha=self.alpha,
             picker=True,)]
         if ri > 0:
-            self.patch.append(
+            self._patch.append(
                 plt.Circle(
                     xy, radius=ri,
                     fill=False,
@@ -156,8 +156,8 @@ def _update_patch_size(self):
                 if len(self.patch) == 1:
                     # Need to remove the previous patch before using
                     # `_add_patch_to`
-                    self.ax.artists.remove(self.patch[0])
-                    self.patch = []
+                    self._patch[0].remove()
+                    self._patch = []
                     self._add_patch_to(self.ax)
                 self.patch[1].radius = ri
             self._update_resizers()

hyperspy/drawing/_widgets/horizontal_line.py

@@ -34,7 +34,7 @@ def _update_patch_position(self):
     def _set_patch(self):
         ax = self.ax
         kwargs = picker_kwargs(preferences.Plot.pick_tolerance)
-        self.patch = [ax.axhline(
+        self._patch = [ax.axhline(
             self._pos[0],
             color=self.color,
             alpha=self.alpha,

hyperspy/drawing/_widgets/label.py

@@ -93,7 +93,7 @@ def _set_patch(self):
         ax = self.ax
         trans = transforms.blended_transform_factory(
             ax.transData, ax.transAxes)
-        self.patch = [ax.text(
+        self._patch = [ax.text(
             self._pos[0],
             self._pos[1],
             self.string,

hyperspy/drawing/_widgets/line2d.py

@@ -268,7 +268,7 @@ def _set_patch(self):
         max_r = max(self.radius_move, self.radius_resize,
                     self.radius_rotate)
         kwargs = picker_kwargs(max_r)
-        self.patch = [plt.Line2D(
+        self._patch = [plt.Line2D(
             xy[:, 0], xy[:, 1],
             linestyle='-',
             lw=self.linewidth,
@@ -298,14 +298,14 @@ def _set_size_patch(self):
                 lw=self.linewidth,
                 c=self.color,
                 **kwargs)
-            self.patch.append(wi)
+            self._patch.append(wi)
             self._width_indicator_patches.append(wi)
 
     def _remove_size_patch(self):
         if not self._width_indicator_patches:
             return
         for patch in self._width_indicator_patches:
-            self.patch.remove(patch)
+            self._patch.remove(patch)
             patch.remove()
         self._width_indicator_patches = []