fix failures after rebase

jdaviz/app.py

@@ -31,7 +31,9 @@
 from glue_astronomy.translators.regions import roi_subset_state_to_region
 from glue_jupyter.app import JupyterApplication
 from glue_jupyter.bqplot.common.tools import TrueCircularROI
+from glue_jupyter.common.toolbar_vuetify import read_icon
 from glue_jupyter.state_traitlets_helpers import GlueState
+from ipypopout import PopoutButton
 from ipyvuetify import VuetifyTemplate
 from ipywidgets import widget_serialization
 from traitlets import Dict, Bool, Unicode, Any
@@ -503,7 +505,7 @@ def _change_reference_data(self, new_refdata_label, viewer_id=None):
             return
 
         if viewer_id is None:
-            viewer = self._jdaviz_helper.default_viewer
+            viewer = self._jdaviz_helper.default_viewer._obj
         else:
             viewer = self.get_viewer(viewer_id)
 
@@ -2308,7 +2310,7 @@ def _on_new_viewer(self, msg, vid=None, name=None, add_layers_to_viewer=False):
         )
 
         if add_layers_to_viewer:
-            ref_data = self._jdaviz_helper.default_viewer.state.reference_data
+            ref_data = self._jdaviz_helper.default_viewer._obj.state.reference_data
             new_viewer_item['reference_data_label'] = ref_data.label
 
         new_stack_item = self._create_stack_item(

jdaviz/configs/imviz/helper.py

@@ -433,7 +433,7 @@ def get_reference_image_data(app, viewer_id=None):
     Return the reference data in the first image viewer and its index
     """
     if viewer_id is None:
-        refdata = app._jdaviz_helper.default_viewer.state.reference_data
+        refdata = app._jdaviz_helper.default_viewer._obj.state.reference_data
     else:
         viewer = app.get_viewer_by_id(viewer_id)
         refdata = viewer.state.reference_data
@@ -530,7 +530,7 @@ def link_image_data(app, link_type='pixels', wcs_fallback_scheme=None, wcs_use_a
                 link_type = 'pixels'
 
     # default reference layer is the first-loaded image in default viewer:
-    default_reference_layer = app._jdaviz_helper.default_viewer.first_loaded_data
+    default_reference_layer = app._jdaviz_helper.default_viewer._obj.first_loaded_data
     if default_reference_layer is None:  # No data in viewer, just use first in collection
         default_reference_layer = app.data_collection[0]
 

jdaviz/configs/imviz/plugins/orientation/orientation.py

@@ -44,7 +44,7 @@ class Orientation(PluginTemplateMixin, ViewerSelectMixin):
     :ref:`public plugin API <plugin-apis>`:
 
     * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.show`
-    * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.open_in_tray`
+    * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.open_in_tray`
     * :meth:`~jdaviz.core.template_mixin.PluginTemplateMixin.close_in_tray`
     * ``link_type`` (`~jdaviz.core.template_mixin.SelectPluginComponent`)
     * ``wcs_use_affine``
@@ -145,8 +145,6 @@ def _on_link_updated(self, msg):
         self.linking_in_progress = True
         self.wcs_use_fallback = msg.wcs_use_fallback
         self.wcs_use_affine = msg.wcs_use_affine
-        self.orientation.only_wcs_layers = self.link_type.selected == 'WCS'
-        self.orientation._on_layers_changed()
 
     def _link_image_data(self):
         link_image_data(
@@ -373,7 +371,7 @@ def _change_reference_data(self, *args, **kwargs):
 
     def _on_refdata_change(self, msg={}):
         self.orientation.only_wcs_layers = msg.data.meta.get('_WCS_ONLY', False)
-        self.orientation._on_layers_changed()
+        self.orientation._update_layer_items()
 
         # don't select until viewer is available:
         if hasattr(self, 'viewer'):

jdaviz/configs/imviz/tests/test_linking.py

@@ -92,14 +92,8 @@ def test_wcslink_affine_with_extras(self):
         links = self.imviz.app.data_collection.external_links
         assert len(links) == 2
         assert isinstance(links[0], (AffineLink, OffsetLink))
-
         assert self.viewer.get_link_type('has_wcs_2[SCI,1]') == 'wcs'
 
-        # linking should not change axes limits, but should when resetting
-        assert_allclose(self.default_viewer_limits, orig_pixel_limits)
-        self.imviz.default_viewer.reset_limits()
-        assert_allclose(self.default_viewer_limits, (-1.5, 9.5, -1, 10))
-
         # Customize display on second image (last loaded).
         self.viewer.set_colormap('Viridis')
         self.viewer.stretch = 'sqrt'
@@ -300,4 +294,4 @@ def test_imviz_no_data(imviz_helper):
     assert len(links) == 0
 
     with pytest.raises(ValueError, match='No reference data for link look-up'):
-        imviz_helper.default_viewer.get_link_type('foo')
+        imviz_helper.default_viewer._obj.get_link_type('foo')

jdaviz/configs/imviz/tests/test_regions.py

@@ -3,7 +3,6 @@
 from astropy import units as u
 from astropy.coordinates import SkyCoord, Angle
 from astropy.utils.data import get_pkg_data_filename
-from numpy.testing import assert_allclose
 from photutils.aperture import CircularAperture, SkyCircularAperture
 from regions import (PixCoord, CircleSkyRegion, RectanglePixelRegion, CirclePixelRegion,
                      EllipsePixelRegion, PointSkyRegion, PolygonPixelRegion,

jdaviz/configs/imviz/tests/test_simple_aper_phot.py

@@ -138,7 +138,7 @@ def test_plugin_wcs_dithered(self):
 
         # Make sure it also works on a rectangle subset.
         # We also subtract off background from itself here.
-        self.imviz.default_viewer.apply_roi(RectangularROI(0, 9, 0, 9))
+        self.imviz.default_viewer._obj.apply_roi(RectangularROI(0, 9, 0, 9))
         phot_plugin.dataset_selected = 'has_wcs_1[SCI,1]'
         phot_plugin.aperture_selected = 'Subset 3'
         phot_plugin.background_selected = 'Subset 3'
@@ -340,7 +340,7 @@ def test_annulus_background(imviz_helper):
 
     # Mark an object of interest
     # CirclePixelRegion(center=PixCoord(x=150, y=25), radius=7)
-    imviz_helper.default_viewer.apply_roi(CircularROI(150, 25, 7))
+    imviz_helper.default_viewer._obj.apply_roi(CircularROI(150, 25, 7))
 
     # Load annulus (this used to be part of the plugin but no longer)
     annulus_1 = CircleAnnulusPixelRegion(
@@ -359,7 +359,7 @@ def test_annulus_background(imviz_helper):
 
     # Draw ellipse on another object
     # EllipsePixelRegion(center=PixCoord(x=20.5, y=37.5), width=41, height=15)
-    imviz_helper.default_viewer.apply_roi(EllipticalROI(20.5, 37.5, 41, 15))
+    imviz_helper.default_viewer._obj.apply_roi(EllipticalROI(20.5, 37.5, 41, 15))
 
     # Load annulus (this used to be part of the plugin but no longer)
     annulus_2 = CircleAnnulusPixelRegion(

jdaviz/configs/imviz/tests/test_wcs_utils.py

@@ -155,20 +155,6 @@ def test_non_wcs_layer_labels(self):
         assert self.imviz.app.state.layer_icons["fits_wcs[DATA]"] == "a"
         assert self.viewer.state.reference_data.label == base_wcs_layer_label
 
-        # Now we change the reference data.
-        for i in (3, 4):
-            data_label = self.imviz.app.data_collection[i].label
-
-            # Set it as reference data.
-            self.imviz.app._change_reference_data(data_label)
-            assert self.viewer.state.reference_data.label == data_label
-
-        # Change reference back to normal data.
-        self.imviz.app._change_reference_data(base_wcs_layer_label)
-        assert self.viewer.state.reference_data.label == base_wcs_layer_label
-        for i in (3, 4):
-            data_label = self.imviz.app.data_collection[i].label
-
 
 def test_get_rotated_nddata_from_label_no_wcs(imviz_helper):
     a = np.zeros((2, 2), dtype=np.int8)

jdaviz/core/user_api.py

@@ -120,16 +120,3 @@ def __init__(self, viewer, expose=[], readonly=[]):
 
     def __repr__(self):
         return f'<{self._obj.reference} API>'
-
-    def __getattr__(self, *args, **kwargs):
-        if super().__getattr__('_deprecation_msg'):
-            logging.warning(f"DeprecationWarning: {self._deprecation_msg}")
-            super().__setattr__('_deprecation_msg', None)
-        return super().__getattr__(*args, **kwargs)
-
-    def __setattr__(self, *args, **kwargs):
-        if hasattr(self, '_deprecation_msg') and self._deprecation_msg:
-            logging.warning(f"DeprecationWarning: {self._deprecation_msg}")
-            super().__setattr__('_deprecation_msg', None)
-        return super().__setattr__(*args, **kwargs)
-

jdaviz/tests/test_subsets.py

@@ -557,7 +557,7 @@ def test_recenter_linked_by_wcs(imviz_helper):
 
     # If handled correctly, it won't change much.
     # But if not, it move down by 7 pix or so (229.05, 145.92) and fails the test.
-    xy = imviz_helper.default_viewer._get_real_xy(
+    xy = imviz_helper.default_viewer._obj._get_real_xy(
         imviz_helper.app.data_collection[0], *subset_plugin.get_center())[:2]
     assert_allclose(xy, (229.067822, 152.371943))
 
@@ -573,7 +573,7 @@ def test_recenter_linked_by_wcs(imviz_helper):
     for _ in range(5):
         subset_plugin.vue_recenter_subset()
 
-    xy = imviz_helper.default_viewer._get_real_xy(
+    xy = imviz_helper.default_viewer._obj._get_real_xy(
         imviz_helper.app.data_collection[0], *subset_plugin.get_center("Subset 2"))[:2]
     assert_allclose(xy, (145.593022, 172.515541))