Clean up of continuous colour scale code

Author: hadley

NEWS

@@ -30,4 +30,6 @@ ggplot2 0.8.5 (2009-XX-XX) ----------------------------------------
   added - this could cause problems if you layer modified the plot.
   (Implements #28)
 * scale_shape_discrete and scale_size_continuous added to scales to match 
-  naming convention of all other scales (Fixes #47)
+  naming convention of all other scales (Fixes #47)
+* scale_colour_gradient, scale_colour_gradient2 & scale_colour_gradientn now
+  have formatter argument to match scale_continuous

R/scale-continuous-colour.r

@@ -1,12 +1,9 @@
 ScaleGradient <- proto(ScaleContinuous, expr={
   aliases <- c("scale_colour_continuous", "scale_fill_continuous", "scale_color_continuous", "scale_color_gradient")
 
-  new <- function(., name=NULL, low="#3B4FB8", high="#B71B1A", space="rgb", breaks = NULL, labels = NULL, limits=NULL, trans="identity", legend = TRUE, ..., variable) {
-    if (is.character(trans)) trans <- Trans$find(trans)
-    
-    b_and_l <- check_breaks_and_labels(breaks, labels)
-    
-    .$proto(name=name, low=low, high=high, space=space, .input=variable, .output=variable, .tr = trans, limits=limits, breaks = b_and_l$breaks, .labels = b_and_l$labels, legend = legend, ...)
+  new <- function(., name = NULL, low = "#3B4FB8", high = "#B71B1A", space = "rgb", ...) {
+
+    .super$new(., name = name, low = low, high = high, space = space, ...)
   }
 
   map <- function(., x) {
@@ -19,9 +16,6 @@ ScaleGradient <- proto(ScaleContinuous, expr={
     nice_ramp(ramp, x)
   }
 
-  labels <- function(.) {
-    nulldefault(.$.labels, .$.tr$label(.$input_breaks()))
-  }
   output_breaks <- function(.) {
     .$map(.$input_breaks()) 
   }
@@ -93,12 +87,9 @@ ScaleGradient <- proto(ScaleContinuous, expr={
 })
 
 ScaleGradient2 <- proto(ScaleContinuous, expr={  
-  new <- function(., name=NULL, low=muted("red"), mid="white", high=muted("blue"), midpoint=0, space="rgb", breaks = NULL, labels = NULL, limits=NULL, trans="identity", legend = TRUE, ..., variable) {
-    if (is.character(trans)) trans <- Trans$find(trans)
-    
-    b_and_l <- check_breaks_and_labels(breaks, labels)
-    
-    .$proto(name=name, low=low, mid=mid, high=high, midpoint=midpoint, space=space, ..., .input=variable, .output=variable, .tr=trans, limits=limits, breaks = b_and_l$breaks, .labels = b_and_l$labels, legend = legend)
+  new <- function(., name = NULL, low = muted("red"), mid = "white", high = muted("blue"), midpoint = 0, space = "rgb", ...) {
+    .super$new(., name = name, low = low, mid = mid, high = high,
+      midpoint = midpoint, space = space, ...)
   }
 
   aliases <- c("scale_color_gradient2")
@@ -122,9 +113,6 @@ ScaleGradient2 <- proto(ScaleContinuous, expr={
   desc <- "Smooth gradient between three colours (high, low and midpoints)"
 
   output_breaks <- function(.) .$map(.$input_breaks())
-  labels <- function(.) {
-    nulldefault(.$.labels, .$.tr$label(.$input_breaks()))
-  }
 
   icon <- function(.) {
     g <- scale_fill_gradient2()
@@ -191,19 +179,12 @@ ScaleGradient2 <- proto(ScaleContinuous, expr={
 
 
 ScaleGradientn <- proto(ScaleContinuous, expr={  
-  new <- function(., name=NULL, colours, values = NULL, rescale = TRUE, space="rgb", breaks = NULL, labels = NULL, limits = NULL, trans="identity", legend = TRUE,  ..., variable) {
-    if (is.character(trans)) trans <- Trans$find(trans)
-    if (!is.null(values)) limits <- range(values)
+  new <- function(., name=NULL, colours, values = NULL, rescale = TRUE, space="rgb", ...) {
 
-    b_and_l <- check_breaks_and_labels(breaks, labels)
-    
-    .$proto(
+    .super$new(., 
       name = name, 
       colours = colours, values = values, rescale = rescale, 
       space = space,  ..., 
-      .input = variable, .output = variable, .tr = trans, 
-      limits = limits, breaks = b_and_l$breaks, .labels = b_and_l$labels,
-      legend = legend
     )
   }
 
@@ -225,9 +206,6 @@ ScaleGradientn <- proto(ScaleContinuous, expr={
   desc <- "Smooth gradient between n colours"
 
   output_breaks <- function(.) .$map(.$input_breaks())
-  labels <- function(.) {
-    nulldefault(.$.labels, .$.tr$label(.$input_breaks()))
-  }
 
   icon <- function(.) {
     g <- scale_fill_gradientn(colours = rainbow(7))