diff --git a/CHANGES.rst b/CHANGES.rst
index 3e600a3281..a4d257ceae 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -72,6 +72,12 @@ Cubeviz
Imviz
^^^^^
+- Fixes possible extreme lag when opening the Plot Options plugin. [#2326]
+
+- Fixes minor layout issues in the Plot Options plugin. [#2326]
+
+- Fixes compass updating in popout/inline mode. [#2326]
+
Mosviz
^^^^^^
diff --git a/jdaviz/configs/default/plugins/plot_options/plot_options.py b/jdaviz/configs/default/plugins/plot_options/plot_options.py
index f3fdc503cd..1ce938c4e6 100644
--- a/jdaviz/configs/default/plugins/plot_options/plot_options.py
+++ b/jdaviz/configs/default/plugins/plot_options/plot_options.py
@@ -249,6 +249,12 @@ class PlotOptions(PluginTemplateMixin):
show_viewer_labels = Bool(True).tag(sync=True)
def __init__(self, *args, **kwargs):
+ # track whether the stretch histogram needs an update (some entry has changed) if is_active
+ # becomes True, to address potential lag from a backlog of calls to
+ # _update_stretch_histogram if the browser throttles pings
+ # (https://github.com/spacetelescope/jdaviz/issues/2317)
+ self._stretch_histogram_needs_update = True
+
super().__init__(*args, **kwargs)
self.viewer = ViewerSelect(self, 'viewer_items', 'viewer_selected', 'multiselect')
self.layer = LayerSelect(self, 'layer_items', 'layer_selected', 'viewer_selected', 'multiselect') # noqa
@@ -494,26 +500,37 @@ def vue_set_value(self, data):
@observe('is_active', 'layer_selected', 'viewer_selected',
'stretch_hist_zoom_limits')
def _update_stretch_histogram(self, msg={}):
- # Import here to prevent circular import.
- from jdaviz.configs.imviz.plugins.viewers import ImvizImageView
- from jdaviz.configs.cubeviz.plugins.viewers import CubevizImageView
-
- if not self.stretch_function_sync.get('in_subscribed_states'): # pragma: no cover
- # no (image) viewer with stretch function options
- return
if not hasattr(self, 'viewer'): # pragma: no cover
# plugin hasn't been fully initialized yet
return
- if (not self.is_active
- or not self.viewer.selected
- or not self.layer.selected): # pragma: no cover
- # no need to make updates, updates will be redrawn when plugin is opened
- # NOTE: this won't update when the plugin is shown but not open in the tray
- return
- if not isinstance(msg, dict) and not self.stretch_hist_zoom_limits: # pragma: no cover
- # then this is from the limits callbacks and we don't want to waste resources
+
+ if not isinstance(msg, dict): # pragma: no cover
+ # then this is from the limits callbacks
# IMPORTANT: this assumes the only non-observe callback to this method comes
# from state callbacks from zoom limits.
+ if not self.stretch_hist_zoom_limits:
+ # there isn't anything to update, let's not waste resources
+ return
+ # override msg as an empty dict so that the rest of the logic doesn't have to check
+ # its type
+ msg = {}
+
+ if msg.get('name', None) == 'is_active' and not self._stretch_histogram_needs_update:
+ # this could be re-triggering if the browser is throttling pings on the js-side
+ # and since this is expensive, could result in laggy behavior
+ return
+ elif msg.get('name', None) != 'is_active' and not self.is_active:
+ # next time is_active becomes True, we need to update the histogram plot
+ self._stretch_histogram_needs_update = True
+ return
+
+ if not self.stretch_function_sync.get('in_subscribed_states'): # pragma: no cover
+ # no (image) viewer with stretch function options
+ return
+
+ if (not self.viewer.selected or not self.layer.selected): # pragma: no cover
+ # nothing to plot
+ self.stretch_histogram.clear_all_marks()
return
if self.multiselect and (len(self.viewer.selected) > 1
@@ -523,6 +540,11 @@ def _update_stretch_histogram(self, msg={}):
self.stretch_histogram.clear_all_marks()
return
+ # Import here to prevent circular import (and not at the top of the method so the import
+ # check is avoided, whenever possible).
+ from jdaviz.configs.imviz.plugins.viewers import ImvizImageView
+ from jdaviz.configs.cubeviz.plugins.viewers import CubevizImageView
+
if not isinstance(self.viewer.selected_obj, (ImvizImageView, CubevizImageView)):
# don't update histogram if selected viewer is not an image viewer:
return
@@ -552,6 +574,7 @@ def _update_stretch_histogram(self, msg={}):
comp = data.get_component(data.main_components[0])
+ # TODO: further optimization could be done by caching sub_data
if self.stretch_hist_zoom_limits:
if hasattr(viewer, '_get_zoom_limits'):
# Viewer limits. This takes account of Imviz linking.
@@ -598,6 +621,8 @@ def _update_stretch_histogram(self, msg={}):
# we'll force the traitlet to trigger a change
hist_mark.send_state('sample')
+ self._stretch_histogram_needs_update = False
+
@observe('stretch_vmin_value')
def _stretch_vmin_changed(self, msg=None):
self.stretch_histogram.marks['vmin'].x = [self.stretch_vmin_value, self.stretch_vmin_value]
diff --git a/jdaviz/configs/default/plugins/plot_options/plot_options.vue b/jdaviz/configs/default/plugins/plot_options/plot_options.vue
index ac80ffbb28..962f062ac8 100644
--- a/jdaviz/configs/default/plugins/plot_options/plot_options.vue
+++ b/jdaviz/configs/default/plugins/plot_options/plot_options.vue
@@ -348,28 +348,32 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
Image
diff --git a/jdaviz/configs/imviz/plugins/compass/compass.py b/jdaviz/configs/imviz/plugins/compass/compass.py
index 33c420cb05..31e00ccd19 100644
--- a/jdaviz/configs/imviz/plugins/compass/compass.py
+++ b/jdaviz/configs/imviz/plugins/compass/compass.py
@@ -65,9 +65,12 @@ def _compass_with_new_viewer(self, *args, **kwargs):
# mixin object not yet initialized
return
+ if not self.is_active:
+ return
+
# There can be only one!
for vid, viewer in self.app._viewer_store.items():
- if vid == self.viewer.selected_id and self.plugin_opened:
+ if vid == self.viewer.selected_id:
viewer.compass = self
viewer.on_limits_change() # Force redraw