make sure all libraries have a diverging type

mkborregaard · Feb 28, 2017 · 5175ee8 · 5175ee8
1 parent b04b815
commit 5175ee8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/color_gradients.jl b/src/color_gradients.jl
@@ -65,7 +65,7 @@ const _rainbowColors = [colorant"purple", colorant"blue", colorant"green", color
 const _testColors = [colorant"darkblue", colorant"blueviolet",  colorant"darkcyan",colorant"green",
                      darken(colorant"yellow",0.3), colorant"orange", darken(colorant"red",0.2)]
 
-const misc = ColorLibrary(Dict(:default => :heat), Dict(
+const misc = ColorLibrary(Dict(:default => :sequential, :sequential => :heat, :diverging => :bluesreds), Dict(
     :blues        => [colorant"lightblue", colorant"darkblue"],
     :reds         => [colorant"lightpink", colorant"darkred"],
     :greens       => [colorant"lightgreen", colorant"darkgreen"],

diff --git a/src/gradients/colorbrewer.jl b/src/gradients/colorbrewer.jl
@@ -132,18 +132,6 @@ register_gradient_colors(:RdGy, [
     RGB(77/255, 77/255, 77/255),
     RGB(26/255, 26/255, 26/255)], :colorbrewer)
 
-register_gradient_colors(:PuOr, [
-    RGB(127/255, 59/255, 8/255),
-    RGB(179/255, 88/255, 6/255),
-    RGB(224/255, 130/255, 20/255),
-    RGB(253/255, 184/255, 99/255),
-    RGB(254/255, 224/255, 182/255),
-    RGB(247/255, 247/255, 247/255),
-    RGB(216/255, 218/255, 235/255),
-    RGB(178/255, 171/255, 210/255),
-    RGB(128/255, 115/255, 172/255),
-    RGB(84/255, 39/255, 136/255),
-    RGB(45/255, 0/255, 75/255)], :colorbrewer)
 
 # These are commented out as they constitute non-continuous gradients, and are thus used differently by Plots
 # register_gradient_colors(:Set2, [

diff --git a/src/gradients/matplotlib.jl b/src/gradients/matplotlib.jl
@@ -21,7 +21,7 @@
 
 # note: to use the full arrays, just take out the second param (n) from the sample_evenly calls
 
-register_color_library(:Plots, ColorLibrary(Dict(:default => :sequential, :sequential => :inferno)))
+register_color_library(:Plots, ColorLibrary(Dict(:default => :sequential, :sequential => :inferno, :diverging => :PuOr)))
 
 register_gradient_colors(:magma, sample_evenly([
     RGB(0.001462, 0.000466, 0.013866),
@@ -1060,6 +1060,20 @@ register_gradient_colors(:viridis, sample_evenly([
 ], 30), :Plots)
 
 
+
+register_gradient_colors(:PuOr, [
+    RGB(127/255, 59/255, 8/255),
+    RGB(179/255, 88/255, 6/255),
+    RGB(224/255, 130/255, 20/255),
+    RGB(253/255, 184/255, 99/255),
+    RGB(254/255, 224/255, 182/255),
+    RGB(247/255, 247/255, 247/255),
+    RGB(216/255, 218/255, 235/255),
+    RGB(178/255, 171/255, 210/255),
+    RGB(128/255, 115/255, 172/255),
+    RGB(84/255, 39/255, 136/255),
+    RGB(45/255, 0/255, 75/255)], :Plots)
+
 # end of Plots colormaps
 # ----------------------------------------------------------------------
 # ----------------------------------------------------------------------