From 0a31bb579b51b1ee4487f2957edf2227a63611d8 Mon Sep 17 00:00:00 2001
From: Sainath Adapa <adapasainath@gmail.com>
Date: Mon, 16 Apr 2018 15:12:38 +0200
Subject: [PATCH] guide is set to colourbar for continuous/gradient scales
 Fixes #26

---
 R/theme_scales.R | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/R/theme_scales.R b/R/theme_scales.R
index 857a755..b5e26d1 100644
--- a/R/theme_scales.R
+++ b/R/theme_scales.R
@@ -3,16 +3,41 @@ theme_scales <- function(palette) {
   
   colours <- palette$swatch[-1]
   
-  new_scale_functions <- list(
-    scale_colour_discrete   = function(...) discrete_scale(  'colour', 'ggthemr', discrete_colours(colours), ...),
-    scale_fill_discrete     = function(...) discrete_scale(  'fill',   'ggthemr', discrete_colours(colours), ...),
-    scale_colour_continuous = function(...) continuous_scale('colour', 'ggthemr', seq_gradient_pal(palette$gradient[['low']], palette$gradient[['high']]), ...),
-    scale_fill_continuous   = function(...) continuous_scale('fill',   'ggthemr', seq_gradient_pal(palette$gradient[['low']], palette$gradient[['high']]), ...),
-    scale_colour_gradient   = function(...) continuous_scale('colour', 'ggthemr', seq_gradient_pal(palette$gradient[['low']], palette$gradient[['high']]), ...),
-    scale_fill_gradient     = function(...) continuous_scale('fill',   'ggthemr', seq_gradient_pal(palette$gradient[['low']], palette$gradient[['high']]), ...)
-  )
+  scale_colour_discrete = function(...) discrete_scale('colour', 'ggthemr', discrete_colours(colours), ...)
+  
+  scale_fill_discrete = function(...) discrete_scale('fill', 'ggthemr', discrete_colours(colours), ...)
+  
+  scale_colour_continuous = function(...,
+                                     low = palette$gradient[['low']],
+                                     high = palette$gradient[['high']],
+                                     space = "Lab",
+                                     guide = "colourbar") {
+    continuous_scale('colour', 'ggthemr',
+                     seq_gradient_pal(low, high, space),
+                     guide = guide, ...)
+  }
   
-  new_scale_functions
+  scale_fill_continuous   = function(...,
+                                     low = palette$gradient[['low']],
+                                     high = palette$gradient[['high']],
+                                     space = "Lab",
+                                     guide = "colourbar") {
+    continuous_scale('fill', 'ggthemr',
+                     seq_gradient_pal(low, high, space),
+                     guide = guide, ...)
+  }
+  
+  list(
+    scale_colour_discrete   = scale_colour_discrete,
+    scale_color_discrete    = scale_colour_discrete,
+    scale_fill_discrete     = scale_fill_discrete,
+    scale_colour_continuous = scale_colour_continuous,
+    scale_color_continuous  = scale_colour_continuous,
+    scale_colour_gradient   = scale_colour_continuous,
+    scale_color_gradient    = scale_colour_continuous,
+    scale_fill_continuous   = scale_fill_continuous,
+    scale_fill_gradient     = scale_fill_continuous
+  )
 }