Hide Matplotlib Axes checkbox

glue/viewers/image/qt/tests/test_data_viewer.py

@@ -5,6 +5,7 @@
 from collections import Counter
 
 import pytest
+from unittest.mock import MagicMock
 
 from astropy.wcs import WCS
 
@@ -740,6 +741,41 @@ def test_legend(self):
 
         assert to_hex(handles[1].get_facecolor()) == viewer_state.layers[1].color
 
+    def test_recalculate_wcs(self):
+
+        # Test to make sure we skip recalculating WCS when appropriate
+
+        mock = MagicMock(wraps=self.viewer.axes.reset_wcs)
+        self.viewer.axes.reset_wcs = mock
+
+        coords = self.hypercube_wcs.coords
+        coords.wcs.crpix = [1.2, 2, 2.25, 1.9]
+        coords.wcs.cdelt = np.array([-6.7, 6.7, 5.1, -4.6])
+        coords.wcs.crval = [0, -90, 10, 40]
+        coords.wcs.ctype = ["RA---SFL", "DEC--SFL", "VOPT", "ZOPT"]
+        coords.wcs.specsys = "LSRK"
+        self.viewer.add_data(self.hypercube_wcs)
+        self.viewer.state.x_att = self.hypercube_wcs.pixel_component_ids[0]
+        self.viewer.state.y_att = self.hypercube_wcs.pixel_component_ids[3]
+        self.viewer.state.slices = [0, 0, 0, 0]
+
+        mock.reset_mock()
+        self.viewer.state.slices = [0, 2, 3, 0]
+        mock.assert_called()
+
+        mock.reset_mock()
+        self.viewer.state.show_axes = False
+        self.viewer.state.slices = [0, 1, 0, 0]
+        mock.assert_not_called()
+
+        mock.reset_mock()
+        self.viewer.state.x_att = self.hypercube_wcs.pixel_component_ids[1]
+        mock.assert_called()
+
+        mock.reset_mock()
+        self.viewer.state.slices = [1, 1, 0, 0]
+        mock.assert_not_called()
+
 
 class TestSessions(object):
 

glue/viewers/image/qt/tests/test_python_export.py

@@ -7,6 +7,8 @@
 from glue.viewers.image.qt import ImageViewer
 from glue.viewers.matplotlib.qt.tests.test_python_export import BaseTestExportPython
 
+from astropy.wcs import WCS
+
 
 class TestExportPython(BaseTestExportPython):
 
@@ -85,3 +87,16 @@ def test_subset_transposed(self, tmpdir):
         self.viewer.state.y_att = self.data.pixel_component_ids[1]
         self.data_collection.new_subset_group('mysubset', self.data.id['cube'] > 0.5)
         self.assert_same(tmpdir)
+
+    def test_hide_axes(self, tmpdir):
+        self.viewer.state.aspect = 'auto'
+        self.viewer.state.x_min = -5
+        self.viewer.state.y_min = -3
+        self.viewer.state.x_max = 30
+        self.viewer.state.y_max = 55
+        super().test_hide_axes(tmpdir)
+
+    def test_wcs_image(self, tmpdir):
+        coords = WCS(naxis=3)
+        wcs_data = Data(self.data.data)
+        self.assert_same(tmpdir)

glue/viewers/image/viewer.py

@@ -68,6 +68,13 @@ def update_y_ticklabel(self, *event):
         self.axes.coords[axis].set_ticklabel(size=self.state.y_ticklabel_size)
         self.redraw()
 
+    def update_axes_visibility(self, *event):
+        if self.state.show_axes:
+            self._set_wcs()
+        else:
+            self._changing_slice_requires_wcs_update = False
+        super(MatplotlibImageMixin, self).update_axes_visibility(event)
+
     def _update_axes(self, *args):
 
         if self.state.x_att_world is not None:
@@ -132,7 +139,7 @@ def _set_wcs(self, event=None, relim=True):
                 y_dep.remove(ix)
             if iy in y_dep:
                 y_dep.remove(iy)
-            self._changing_slice_requires_wcs_update = bool(x_dep or y_dep)
+            self._changing_slice_requires_wcs_update = bool(x_dep or y_dep) and self.state.show_axes
 
         self._wcs_set = True
 
@@ -219,7 +226,7 @@ def _script_header(self):
         ref_coords = self.state.reference_data.coords
 
         if hasattr(ref_coords, 'wcs'):
-            script += "ax.reset_wcs(slices={0}, wcs=ref_data.coords.wcs)\n".format(self.state.wcsaxes_slice)
+            script += "ax.reset_wcs(slices={0}, wcs=ref_data.coords)\n".format(self.state.wcsaxes_slice)
         elif hasattr(ref_coords, 'wcsaxes_dict'):
             raise NotImplementedError()
         else:

glue/viewers/matplotlib/mpl_axes.py

@@ -5,6 +5,8 @@
 
 __all__ = ['update_appearance_from_settings', 'init_mpl']
 
+DEFAULT_MARGIN = [1, 0.25, 0.50, 0.25]
+
 
 def set_background_color(axes, color):
     axes.figure.set_facecolor(color)
@@ -59,7 +61,7 @@ def init_mpl(figure=None, axes=None, wcs=False, axes_factory=None):
             else:
                 _axes = axes_factory(_figure)
 
-    freeze_margins(_axes, margins=[1, 0.25, 0.50, 0.25])
+    freeze_margins(_axes, margins=DEFAULT_MARGIN)
 
     update_appearance_from_settings(_axes)