Preset palettes (#2494)

* Add swatches to color picker * Update swatch colors * Fix code style * Update CHANGES and docs * Move change log to section 3.8
spacetelescope · Oct 6, 2023 · 9f0b7a4 · 9f0b7a4
1 parent 9dfab3a
commit 9f0b7a4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -67,6 +67,8 @@ Other Changes and Additions
   displayed to alert users that data points are being filtered because of non-finite uncertainties (when
   flux is finite). [#2437]
 
+- Add swatches to color picker. [#2494]
+
 3.7.1 (unreleased)
 ==================
 

diff --git a/docs/specviz/displaying.rst b/docs/specviz/displaying.rst
@@ -203,9 +203,9 @@ Layer
 -----
 
 The top section of the :guilabel:`Layer` tab contains options to change the color
-of the spectrum (click the |icon-color-square| icon to see a color change menu),
-change visibility of the spectrum (|icon-eye| icon), and a dropdown box to select
-which layer will have its settings changed.
+of the spectrum (click the |icon-color-square| icon to see a color change menu
+and a default color palette), change visibility of the spectrum (|icon-eye| icon),
+and a dropdown box to select which layer will have its settings changed.
 
 Line Width
 ----------

diff --git a/jdaviz/configs/default/plugins/plot_options/plot_options.py b/jdaviz/configs/default/plugins/plot_options/plot_options.py
@@ -265,11 +265,21 @@ class PlotOptions(PluginTemplateMixin):
 
     show_viewer_labels = Bool(True).tag(sync=True)
 
+    swatches_palette = List().tag(sync=True)
+
     def __init__(self, *args, **kwargs):
         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
 
+        self.swatches_palette = [
+            ['#FF0000', '#AA0000', '#550000'],
+            ['#FFD300', '#AAAA00', '#555500'],
+            ['#4CFF00', '#00AA00', '#005500'],
+            ['#00FF8E', '#00AAAA', '#005555'],
+            ['#0089FF', '#5200FF', '#000055']
+        ]
+
         def is_profile(state):
             return isinstance(state, (ProfileViewerState, ProfileLayerState))
 

diff --git a/jdaviz/configs/default/plugins/plot_options/plot_options.vue b/jdaviz/configs/default/plugins/plot_options/plot_options.vue
@@ -444,7 +444,10 @@
             </template>
             <div @click.stop="" style="text-align: end; background-color: white">
                 <v-color-picker :value="image_color_value"
-                                @update:color="throttledSetValue('image_color_value', $event.hexa)"></v-color-picker>
+                                :swatches="swatches_palette"
+                                show-swatches
+                                @update:color="throttledSetValue('image_color_value', $event.hexa)"
+                                ></v-color-picker>
             </div>
           </v-menu>
         </div>