consolidate cubeviz/imviz logic

jdaviz/configs/cubeviz/helper.py

@@ -2,7 +2,6 @@
 from astropy.io import fits
 from astropy.io import registry as io_registry
 from astropy.utils.decorators import deprecated
-from glue.core import BaseData
 from specutils import Spectrum1D
 from specutils.io.registers import _astropy_has_priorities
 
@@ -181,10 +180,6 @@ def get_aperture_photometry_results(self):
         return self.plugins['Aperture Photometry']._obj.export_table()
 
 
-def layer_is_cube_image_data(layer):
-    return isinstance(layer, BaseData) and layer.ndim in (2, 3)
-
-
 # TODO: We can remove this when specutils supports it, i.e.,
 #       https://github.com/astropy/specutils/issues/592 and
 #       https://github.com/astropy/specutils/pull/1009

jdaviz/configs/cubeviz/plugins/viewers.py

@@ -9,7 +9,6 @@
 
 from jdaviz.core.registries import viewer_registry
 from jdaviz.core.marks import SliceIndicatorMarks, ShadowSpatialSpectral
-from jdaviz.configs.cubeviz.helper import layer_is_cube_image_data
 from jdaviz.configs.default.plugins.viewers import JdavizViewerMixin
 from jdaviz.configs.specviz.plugins.viewers import SpecvizProfileView
 from jdaviz.core.events import AddDataMessage, RemoveDataMessage, GlobalDisplayUnitChanged

jdaviz/configs/imviz/helper.py

@@ -398,8 +398,12 @@ def layer_is_2d(layer):
     return isinstance(layer, BaseData) and layer.ndim == 2
 
 
+def layer_is_2d_or_3d(layer):
+    return isinstance(layer, BaseData) and layer.ndim in (2, 3)
+
+
 def layer_is_image_data(layer):
-    return layer_is_2d(layer) and not layer.meta.get(_wcs_only_label, False)
+    return layer_is_2d_or_3d(layer) and not layer.meta.get(_wcs_only_label, False)
 
 
 def layer_is_wcs_only(layer):