Cubeviz slider performance improvements (#1550)

* Set wavelength directly rather than msg

* Remove unneeded message

* Retrieve x slices from viewer marks rather than data

Co-authored-by: Kyle Conroy <[email protected]>

* Codestyle

* Add Changelog

* Strip metric from changelog

Co-authored-by: P. L. Lim <[email protected]>

* Remove SlideSelectWavelengthMessage

* Remove straggler property

Co-authored-by: Kyle Conroy <[email protected]>
Co-authored-by: P. L. Lim <[email protected]>

Author: 3 people

CHANGES.rst

@@ -60,6 +60,8 @@ Cubeviz
 - Fixed ``viewer.jdaviz_helper`` returning Specviz helper instead of Cubeviz helper after Specviz
   helper is called via ``Cubeviz.specviz``. Now ``viewer.jdaviz_helper`` always returns the Cubeviz helper. [#1546]
 
+- Increased spectral slider performance considerably. [#1550]
+
 Imviz
 ^^^^^
 

jdaviz/configs/cubeviz/helper.py

@@ -5,7 +5,6 @@
 from jdaviz.configs.default.plugins.line_lists.line_list_mixin import LineListMixin
 from jdaviz.configs.specviz import Specviz
 from jdaviz.core.events import (AddDataMessage,
-                                SliceSelectWavelengthMessage,
                                 SliceSelectSliceMessage)
 
 __all__ = ['Cubeviz', 'CubeViz']
@@ -17,8 +16,6 @@ class Cubeviz(ConfigHelper, LineListMixin):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.app.hub.subscribe(self, SliceSelectWavelengthMessage,
-                               handler=self.select_wavelength)
         self.app.hub.subscribe(self, AddDataMessage,
                                handler=self._set_spectrum_x_axis)
 
@@ -80,12 +77,12 @@ def select_wavelength(self, wavelength):
             Wavelength to select in units of the x-axis of the spectrum.  The nearest slice will
             be selected.
         """
-        if isinstance(wavelength, SliceSelectWavelengthMessage):
-            # SliceSelectWavelengthMessage is broadcasted by the spectrum-viewer slice tool
-            wavelength = float(wavelength.wavelength)
         if not isinstance(wavelength, (int, float)):
             raise TypeError("wavelength must be a float or int")
-        x_all = self.app.get_viewer('spectrum-viewer').data()[0].spectral_axis.value
+        # Retrieve the x slices from the spectrum viewer's marks
+        x_all = [m for m in self.app.get_viewer('spectrum-viewer').figure.marks
+                 if m.__class__.__name__ in ['Lines', 'LinesGL']
+                 ][0].x
         index = np.argmin(abs(x_all - wavelength))
         return self.select_slice(int(index))
 

jdaviz/configs/cubeviz/plugins/tools.py

@@ -6,7 +6,7 @@
 from glue.core.roi import RectangularROI
 from glue.core.edit_subset_mode import NewMode
 
-from jdaviz.core.events import SliceSelectWavelengthMessage, SliceToolStateMessage
+from jdaviz.core.events import SliceToolStateMessage
 
 __all__ = []
 
@@ -41,8 +41,7 @@ def on_mouse_event(self, data):
             # throttle to 200ms
             return
 
-        msg = SliceSelectWavelengthMessage(wavelength=data['domain']['x'], sender=self)
-        self.viewer.session.hub.broadcast(msg)
+        self.viewer.jdaviz_helper.select_wavelength(data['domain']['x'])
 
         self._time_last = time.time()
 

jdaviz/core/events.py

@@ -3,7 +3,7 @@
 __all__ = ['NewViewerMessage', 'ViewerAddedMessage', 'ViewerRemovedMessage', 'LoadDataMessage',
            'AddDataMessage', 'SnackbarMessage', 'RemoveDataMessage',
            'AddLineListMessage', 'RowLockMessage',
-           'SliceSelectWavelengthMessage', 'SliceSelectSliceMessage',
+           'SliceSelectSliceMessage',
            'SliceToolStateMessage',
            'TableClickMessage']
 
@@ -256,17 +256,6 @@ def shared_image(self):
         return self._shared_image
 
 
-class SliceSelectWavelengthMessage(Message):
-    '''Message generated by the select slice plot plugin which is processed by the cubeviz helper'''
-    def __init__(self, wavelength=None, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._wavelength = wavelength
-
-    @property
-    def wavelength(self):
-        return self._wavelength
-
-
 class SliceSelectSliceMessage(Message):
     '''Message generated by the cubeviz helper and processed by the slice plugin to sync
     slice selection across all viewers'''