Horizontal layer buttons

jdaviz/app.py

@@ -139,6 +139,7 @@ def to_unit(self, data, cid, values, original_units, target_units):
                      'plugin-subset-select': 'components/plugin_subset_select.vue',
                      'plugin-viewer-select': 'components/plugin_viewer_select.vue',
                      'plugin-layer-select': 'components/plugin_layer_select.vue',
+                     'plugin-layer-select-tabs': 'components/plugin_layer_select_tabs.vue',
                      'plugin-editable-select': 'components/plugin_editable_select.vue',
                      'plugin-add-results': 'components/plugin_add_results.vue',
                      'plugin-auto-label': 'components/plugin_auto_label.vue',

jdaviz/app.vue

@@ -451,4 +451,22 @@ a:active {
     font-weight: 500 !important;
 }
 
+.suppress-scrollbar {
+    overflow-y: scroll;
+    scrollbar-width: none; /* Firefox */
+    -ms-overflow-style: none;  /* Internet Explorer 10+ */
+}
+.suppress-scrollbar::-webkit-scrollbar { /* WebKit */
+    width: 0;
+    height: 0;
+}
+
+.layer-tab-selected {
+  background-color: rgba(0,0,0,0.1); 
+}
+
+.theme--dark .layer-tab-selected {
+  background-color: rgba(255,255,255,0.1); 
+}
+
 </style>

jdaviz/components/plugin_layer_select_tabs.vue

@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <span class="suppress-scrollbar" style="display: inline-block; white-space: nowrap; margin-left: -24px; width: calc(100% + 48px); overflow-x: scroll; overflow-y: hidden">
+      <span v-for="(item, index) in items" :class="selected.includes(item.label) ? 'layer-tab-selected' : ''" :style="'display: inline-block; padding: 12px; '+(selected.includes(item.label) ? 'border-top: 2px solid #c75109' : 'border-top: 2px solid transparent')">
+        <j-tooltip :tooltipcontent="tooltipContent(item)">
+          <v-btn
+            :rounded="item.is_subset"
+            @click="() => {if (!multiselect){$emit('update:selected', item.label)} else if(selected.indexOf(item.label) === -1) {$emit('update:selected', selected.concat(item.label))} else {$emit('update:selected', selected.filter(select => select != item.label))} }"
+            :style="'padding: 0px; margin-bottom: 4px; background: '+visibilityStyle(item)+', '+colorStyle(item)"
+            width="30px"
+            min-width="30px"
+            height="30px"
+          >
+            <span style="color: white; text-shadow: 0px 0px 3px black">
+              {{ item.icon }}
+            </span>
+          </v-btn>
+        </j-tooltip>
+      </span>
+    </span>
+ </div>
+</template>
+
+<script>
+module.exports = {
+  props: ['items', 'selected', 'multiselect', 'colormode'],
+  methods: {
+    tooltipContent(item) {
+      var tooltip = item.label
+      if (item.mixed_visibility) {
+        tooltip += '<br/>Visible: mixed'
+      } else if (!item.visible) {
+        tooltip += '<br/>Visible: false'
+      }
+      if (this.$props.colormode === 'Colormaps' && !item.is_subset) {
+        tooltip += '<br/>Color mode: colormap'
+      } else if (this.$props.colormode === 'mixed' && !item.is_subset) {
+        tooltip += '<br/>Color mode: mixed'
+      }
+      if (item.mixed_color && (this.$props.colormode !== 'Colormaps' || item.is_subset)) {
+        tooltip += '<br/>Color: mixed'
+      }
+      return tooltip
+    },
+    visibilityStyle(item) {
+      if (item.mixed_visibility){
+        return 'repeating-linear-gradient(30deg, rgba(0,0,0,0.3), rgba(0,0,0,0.3) 3px, transparent 3px, transparent 3px, transparent 10px)'
+      }
+      else if (item.visible) {
+        return 'repeating-linear-gradient(30deg, transparent, transparent 10px)'
+      } else {
+        return 'repeating-linear-gradient(30deg, rgba(0,0,0,0.8), rgba(0,0,0,0.8) 7px, transparent 7px, transparent 7px, transparent 10px)'
+      }
+    },
+    colorStyle(item) {
+      if (this.$props.colormode == 'Colormaps' && !item.is_subset) {
+        return 'repeating-linear-gradient( -45deg, gray, gray 20px)'
+      }
+      if (item.mixed_color) {
+        colors = item.all_colors_to_label
+        const strip_width = 42 / colors.length
+
+        var style = 'repeating-linear-gradient( -45deg, '
+        for ([ind, color] of colors.entries()) {
+          style += color + ' '+ind*strip_width+'px, ' + color + ' '+(ind+1)*strip_width+'px'
+          if (ind !== colors.length-1) {
+            style += ', '
+          }
+        }
+        style += ')'
+        return style
+      } 
+      return 'repeating-linear-gradient( -45deg, '+item.color+', '+item.color+' 20px)'
+
+    }
+  }
+};
+
+</script>

jdaviz/components/plugin_section_header.vue

@@ -15,7 +15,7 @@
     white-space: nowrap; 
     margin-left: -12px;
     margin-right: -12px;
-    margin-top: 40px;
+    margin-top: 36px;
     margin-bottom: 8px;
 }
 

jdaviz/configs/default/plugins/plot_options/plot_options.py

@@ -626,13 +626,8 @@ def apply_RGB_presets(self):
         # Switch back to this at the end
         initial_layer = self.layer_selected
 
-        # Filter out subset layers
-        image_layers = [layer for layer in self.layer.choices if "Subset" not in layer]
-        visible_layers = []
-        for layer in image_layers:
-            self.layer_selected = layer
-            if self.image_visible.value:
-                visible_layers.append(layer)
+        # Determine layers visible in selected viewer(s) - consider mixed to be visible
+        visible_layers = [layer['label'] for layer in self.layer.items if not layer['is_subset'] and (layer['visible'] or layer['mixed_visibility'])]  # noqa
 
         # Set opacity to something that seems sensible
         n_visible = len(visible_layers)
@@ -651,10 +646,10 @@ def apply_RGB_presets(self):
 
         for i in range(n_visible):
             self.layer_selected = visible_layers[i]
-            self.image_opacity_value = default_opacity
-            self.image_color_value = preset_colors[i]
-            self.stretch_function_value = "arcsinh"
-            self.stretch_preset_value = 99
+            self.image_opacity.unmix_state(default_opacity)
+            self.image_color.unmix_state(preset_colors[i])
+            self.stretch_function.unmix_state("arcsinh")
+            self.stretch_preset.unmix_state(99)
 
         self.layer_selected = initial_layer