From 1f31e995110511ff7282f768ce3fca5cc19384f5 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Thu, 17 Mar 2022 13:46:42 -0400 Subject: [PATCH] generalize subset select component to handle spatial and spectral --- CHANGES.rst | 2 +- jdaviz/components/plugin_subset_select.vue | 8 +- .../plugins/moment_maps/moment_maps.vue | 1 + .../default/plugins/collapse/collapse.vue | 1 + .../plugins/model_fitting/model_fitting.py | 5 + .../plugins/model_fitting/model_fitting.vue | 1 + .../aper_phot_simple/aper_phot_simple.py | 18 +- .../aper_phot_simple/aper_phot_simple.vue | 31 ++- .../plugins/line_analysis/line_analysis.py | 26 ++- .../plugins/line_analysis/line_analysis.vue | 4 +- jdaviz/core/template_mixin.py | 205 +++++++++++++----- 11 files changed, 211 insertions(+), 91 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2c6b066593..b3cfe3cba0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -66,7 +66,7 @@ Other Changes and Additions - Redshifts imported with a custom line list are now ignored. Redshift must be set app-wide via viz.set_redshift or the line list plugin. [#1134] -- Subset selection dropdowns in plugins now show synced color indicators. [#1156] +- Subset selection dropdowns in plugins now show synced color indicators. [#1156, #1175] 2.3 (2022-03-01) ================ diff --git a/jdaviz/components/plugin_subset_select.vue b/jdaviz/components/plugin_subset_select.vue index 48a567ee18..f1569906f1 100644 --- a/jdaviz/components/plugin_subset_select.vue +++ b/jdaviz/components/plugin_subset_select.vue @@ -5,8 +5,8 @@ :items="items" v-model="selected" @change="$emit('update:selected', $event)" - :label="label ? label : 'Spectral Region'" - :hint="hint ? hint : 'Select spectral region.'" + :label="label ? label : 'Subset'" + :hint="hint ? hint : 'Select subset.'" :rules="rules ? rules : []" item-text="label" item-value="label" @@ -15,7 +15,7 @@