Merge pull request #455 from squirrelo/viridis-colormap

Viridis colormap
biocore · Apr 16, 2016 · b46c8df · b46c8df
2 parents 182a9d5 + c98674c
commit b46c8df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/emperor/support_files/js/color-view-controller.js b/emperor/support_files/js/color-view-controller.js
@@ -225,15 +225,15 @@ define([
   'discrete-coloring', 'OrRd', 'PuBu', 'BuPu', 'Oranges', 'BuGn', 'YlOrBr',
   'YlGn', 'Reds', 'RdPu', 'Greens', 'YlGnBu', 'Purples', 'GnBu', 'Greys',
   'YlOrRd', 'PuRd', 'Blues', 'PuBuGn', 'Spectral', 'RdYlGn', 'RdBu', 'PiYG',
-  'PRGn', 'RdYlBu', 'BrBG', 'RdGy', 'PuOr'];
+  'PRGn', 'RdYlBu', 'BrBG', 'RdGy', 'PuOr', 'Viridis'];
   ColorViewController.ColormapNames = ['Classic QIIME Colors',
   'Discrete Coloring (Colorbrewer)', 'Orange-Red', 'Purple-Blue',
   'Blue-Purple', 'Oranges', 'Blue-Green', 'Yellow-Orange-Brown',
   'Yellow-Green', 'Reds', 'Red-Purple', 'Greens', 'Yellow-Green-Blue',
   'Purples', 'Green-Blue', 'Greys', 'Yellow-Orange-Red', 'Purple-Red', 'Blues',
   'Purple-Blue-Green', 'Spectral', 'Red-Yellow-Green', 'Red-Blue',
   'Pink-Yellow-Green', 'Pink-Red-Green', 'Red-Yellow-Blue', 'Brown-Blue-Green',
-  'Red-Grey', 'Purple-Orange'];
+  'Red-Grey', 'Purple-Orange', 'Viridis'];
   ColorViewController._colorbrewerDiscrete = ["#8dd3c7", "#ffffb3", "#bebada",
   "#fb8072", "#80b1d3", "#fdb462", "#b3de69", "#fccde5", "#d9d9d9", "#bc80bd",
   "#ccebc5", "#ffed6f", /*first list ends here*/ "#a6cee3", "#1f78b4",