use @with_spinner from upstream

this requires spacetelescope/jdaviz#2560
kecnry · Nov 10, 2023 · 8925e02 · 8925e02
1 parent 547ed27
commit 8925e02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/lcviz/plugins/binning/binning.py b/lcviz/plugins/binning/binning.py
@@ -9,7 +9,8 @@
 from jdaviz.core.registries import tray_registry
 from jdaviz.core.template_mixin import (PluginTemplateMixin,
                                         DatasetSelectMixin, AddResultsMixin,
-                                        skip_if_no_updates_since_last_active)
+                                        skip_if_no_updates_since_last_active,
+                                        with_spinner)
 from jdaviz.core.user_api import PluginUserApi
 
 from lcviz.events import EphemerisChangedMessage
@@ -50,7 +51,6 @@ class Binning(PluginTemplateMixin, DatasetSelectMixin, EphemerisSelectMixin, Add
 
     last_live_time = Float(0).tag(sync=True)
     previews_temp_disable = Bool(False).tag(sync=True)
-    spinner = Bool(False).tag(sync=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -213,8 +213,8 @@ def _on_ephemeris_update(self, msg):
 
         self._live_update()
 
+    @with_spinner()
     def bin(self, add_data=True):
-        self.spinner = True
         if self.n_bins == '' or self.n_bins <= 0:
             raise ValueError("n_bins must be a positive integer")
 
@@ -260,7 +260,6 @@ def bin(self, add_data=True):
                 # by resetting x_att, the preview marks may have dissappeared
                 self._live_update()
 
-        self.spinner = False
         return lc
 
     def vue_apply(self, event={}):

diff --git a/lcviz/plugins/flatten/flatten.py b/lcviz/plugins/flatten/flatten.py
@@ -8,7 +8,8 @@
 from jdaviz.core.registries import tray_registry
 from jdaviz.core.template_mixin import (PluginTemplateMixin,
                                         DatasetSelectMixin, AddResultsMixin,
-                                        skip_if_no_updates_since_last_active)
+                                        skip_if_no_updates_since_last_active,
+                                        with_spinner)
 from jdaviz.core.user_api import PluginUserApi
 
 from lcviz.marks import LivePreviewTrend, LivePreviewFlattened
@@ -60,7 +61,6 @@ class Flatten(PluginTemplateMixin, DatasetSelectMixin, AddResultsMixin):
 
     last_live_time = Float(0).tag(sync=True)
     previews_temp_disable = Bool(False).tag(sync=True)
-    spinner = Bool(False).tag(sync=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -121,6 +121,7 @@ def _set_default_results_label(self, event={}):
         else:
             self.results_label_default = f"{self.dataset_selected} (flattened)"
 
+    @with_spinner()
     def flatten(self, add_data=True):
         """
         Flatten the input light curve (``dataset``) using lightkurve.flatten.
@@ -138,7 +139,6 @@ def flatten(self, add_data=True):
         trend_lc : `~lightkurve.LightCurve`
             The trend used to flatten the light curve.
         """
-        self.spinner = True
         input_lc = self.dataset.selected_obj
         if input_lc is None:  # pragma: no cover
             raise ValueError("no input dataset selected")
@@ -161,7 +161,6 @@ def flatten(self, add_data=True):
             data = _data_with_reftime(self.app, output_lc)
             self.add_results.add_results_from_plugin(data)
 
-        self.spinner = False
         return output_lc, trend_lc
 
     def _clear_marks(self):