diff --git a/CHANGES.rst b/CHANGES.rst index 049821ed..1fb83a79 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,8 @@ 1.1.0 (unreleased) ------------------ +* Update jdaviz requirement to 4.1 to include upstream improvements, including plugin descriptions and redesigned data menu [#158] + 1.0.0 (12-02-2024) ------------------ diff --git a/lcviz/helper.py b/lcviz/helper.py index 9e41ca94..fd2b77ce 100644 --- a/lcviz/helper.py +++ b/lcviz/helper.py @@ -104,7 +104,7 @@ class LCviz(ConfigHelper): 'context': {'notebook': {'max_height': '600px'}}}, 'toolbar': ['g-data-tools', 'g-subset-tools', 'g-viewer-creator', 'lcviz-coords-info'], 'tray': ['lcviz-metadata-viewer', 'flux-column', - 'lcviz-plot-options', 'lcviz-subset-plugin', + 'lcviz-plot-options', 'lcviz-subset-tools', 'lcviz-markers', 'time-selector', 'stitch', 'flatten', 'frequency-analysis', 'ephemeris', 'binning', 'lcviz-export'], diff --git a/lcviz/plugins/__init__.py b/lcviz/plugins/__init__.py index bdde8f10..85245d92 100644 --- a/lcviz/plugins/__init__.py +++ b/lcviz/plugins/__init__.py @@ -12,4 +12,4 @@ from .metadata_viewer.metadata_viewer import * # noqa from .plot_options.plot_options import * # noqa from .stitch.stitch import * # noqa -from .subset_plugin.subset_plugin import * # noqa +from .subset_tools.subset_tools import * # noqa diff --git a/lcviz/plugins/binning/binning.py b/lcviz/plugins/binning/binning.py index afa1ee35..d869e3c2 100644 --- a/lcviz/plugins/binning/binning.py +++ b/lcviz/plugins/binning/binning.py @@ -55,6 +55,7 @@ class Binning(PluginTemplateMixin, FluxColumnSelectMixin, DatasetSelectMixin, def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + self._plugin_description = 'Bin input light curve.' self._set_results_viewer() diff --git a/lcviz/plugins/binning/binning.vue b/lcviz/plugins/binning/binning.vue index 31935263..e2e13a77 100644 --- a/lcviz/plugins/binning/binning.vue +++ b/lcviz/plugins/binning/binning.vue @@ -3,7 +3,7 @@ :config="config" plugin_key="Binning" :api_hints_enabled.sync="api_hints_enabled" - description='Bin in time or phase-space.' + :description="docs_description || 'Bin input light curve in time or phase-space.'" :link="'https://lcviz.readthedocs.io/en/'+vdocs+'/plugins.html#binning'" :uses_active_status="uses_active_status" @plugin-ping="plugin_ping($event)" diff --git a/lcviz/plugins/ephemeris/ephemeris.py b/lcviz/plugins/ephemeris/ephemeris.py index 69e4c9c3..d4e735c8 100644 --- a/lcviz/plugins/ephemeris/ephemeris.py +++ b/lcviz/plugins/ephemeris/ephemeris.py @@ -122,6 +122,7 @@ class Ephemeris(PluginTemplateMixin, DatasetSelectMixin): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + self._plugin_description = 'Ephemerides for phase-folding.' self._default_initialized = False self._ignore_ephem_change = False diff --git a/lcviz/plugins/ephemeris/ephemeris.vue b/lcviz/plugins/ephemeris/ephemeris.vue index 83b22c84..7069bfb5 100644 --- a/lcviz/plugins/ephemeris/ephemeris.vue +++ b/lcviz/plugins/ephemeris/ephemeris.vue @@ -3,7 +3,7 @@ :config="config" plugin_key="Ephemeris" :api_hints_enabled.sync="api_hints_enabled" - description='Find and refine ephemerides for phase-folding.' + :description="docs_description || 'Find and refine ephemerides for phase-folding.'" :link="'https://lcviz.readthedocs.io/en/'+vdocs+'/plugins.html#ephemeris'" :popout_button="popout_button"> @@ -120,18 +120,14 @@ hint="Select the light curve as input." /> - - - +
@@ -267,13 +263,21 @@ > diff --git a/lcviz/plugins/frequency_analysis/frequency_analysis.py b/lcviz/plugins/frequency_analysis/frequency_analysis.py index c90c814a..b2603b49 100644 --- a/lcviz/plugins/frequency_analysis/frequency_analysis.py +++ b/lcviz/plugins/frequency_analysis/frequency_analysis.py @@ -57,7 +57,7 @@ class FrequencyAnalysis(PluginTemplateMixin, DatasetSelectMixin, PlotMixin): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - + self._plugin_description = 'Frequency/period analysis.' self._ignore_auto_update = False # do not support data only in phase-space diff --git a/lcviz/plugins/frequency_analysis/frequency_analysis.vue b/lcviz/plugins/frequency_analysis/frequency_analysis.vue index 0f812abc..2bcf9d95 100644 --- a/lcviz/plugins/frequency_analysis/frequency_analysis.vue +++ b/lcviz/plugins/frequency_analysis/frequency_analysis.vue @@ -3,7 +3,7 @@ :config="config" plugin_key="Frequency Analysis" :api_hints_enabled.sync="api_hints_enabled" - description='Frequency/period analysis.' + :description="docs_description" :link="'https://lcviz.readthedocs.io/en/'+vdocs+'/plugins.html#frequency_analysis'" :popout_button="popout_button"> @@ -17,31 +17,23 @@ hint="Select the light curve as input." /> - - - + - - - +
-
- diff --git a/lcviz/plugins/subset_plugin/__init__.py b/lcviz/plugins/subset_plugin/__init__.py deleted file mode 100644 index d65cc587..00000000 --- a/lcviz/plugins/subset_plugin/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .subset_plugin import * # noqa diff --git a/lcviz/plugins/subset_tools/__init__.py b/lcviz/plugins/subset_tools/__init__.py new file mode 100644 index 00000000..692dd503 --- /dev/null +++ b/lcviz/plugins/subset_tools/__init__.py @@ -0,0 +1 @@ +from .subset_tools import * # noqa diff --git a/lcviz/plugins/subset_plugin/subset_plugin.py b/lcviz/plugins/subset_tools/subset_tools.py similarity index 75% rename from lcviz/plugins/subset_plugin/subset_plugin.py rename to lcviz/plugins/subset_tools/subset_tools.py index c2c2a7ee..0b15fde3 100644 --- a/lcviz/plugins/subset_plugin/subset_plugin.py +++ b/lcviz/plugins/subset_tools/subset_tools.py @@ -1,13 +1,13 @@ from traitlets import observe -from jdaviz.configs.default.plugins import SubsetPlugin +from jdaviz.configs.default.plugins import SubsetTools from jdaviz.core.registries import tray_registry -__all__ = ['SubsetPlugin'] +__all__ = ['SubsetTools'] -@tray_registry('lcviz-subset-plugin', label="Subset Tools") -class SubsetPlugin(SubsetPlugin): +@tray_registry('lcviz-subset-tools', label="Subset Tools") +class SubsetTools(SubsetTools): """ See the :ref:`Subset Plugin Documentation ` for more details. @@ -22,6 +22,8 @@ def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.can_freeze = True + self._plugin_description = 'Tools for selecting and interacting with subsets.' + @observe('vdocs') def _update_docs_link(self, *args): self.docs_link = f"https://lcviz.readthedocs.io/en/{self.vdocs}/plugins.html#subset-tools" # noqa diff --git a/lcviz/plugins/time_selector/time_selector.py b/lcviz/plugins/time_selector/time_selector.py index 2677155e..05db7529 100644 --- a/lcviz/plugins/time_selector/time_selector.py +++ b/lcviz/plugins/time_selector/time_selector.py @@ -40,6 +40,7 @@ def __init__(self, *args, **kwargs): """ super().__init__(*args, **kwargs) self.plugin_key = "Time Selector" + self._plugin_description = 'Select active time across all viewers.' self.docs_description = "Select time to sync across all viewers (as an indicator in all time/phase viewers or to select the active slice in any image/cube viewers). The slice can also be changed interactively in any time viewer by activating the slice tool." # noqa self.value_label = 'Time' self.value_unit = 'd' diff --git a/pyproject.toml b/pyproject.toml index 68999f54..cd822f5a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ dependencies = [ "astropy>=5.2", # NOTE: if/when we stop pinning a minor version of jdaviz, add jdaviz # to devdeps in tox.ini - "jdaviz>=4.0,<4.1", + "jdaviz>=4.1,<4.2", "lightkurve>=2.5.0", # NOTE: glue-jupyter is also pinned by jdaviz. "glue-jupyter>=0.22.2",