Output from stats now correctly transformed by scales

Author: hadley

NEWS

@@ -1,6 +1,7 @@
 ggplot2 0.8  (2008-XX)
 ----------------------------------------
 
+* scale_x_log10, scale_y_sqrt etc now correctly transform output from statistics as well as raw data
 * stat_contour now has arguments to control the position of the contours, rather than relying on the z scale
 * scale_z_* now removed because no longer used by anything
 * coord_cartesian now correctly clips instead of dropping points outside of its limits

R/layer.r

@@ -140,25 +140,30 @@ Layer <- proto(expr = {
   # of aesthetic mappings occur.  This allows the mapping of variables 
   # created by the statistic, for example, height in a histogram, levels
   # on a contour plot.
+  # 
+  # This also takes care of applying any scale transformations that might
+  # be necessary
   map_statistics <- function(., data, plot) {
     gg_apply(data, function(x) .$map_statistic(x, plot=plot))
   }
 
   map_statistic <- function(., data, plot) {
     if (is.null(data) || length(data) == 0 || nrow(data) == 0) return()
     aesthetics <- defaults(.$mapping, defaults(plot$mapping, .$stat$default_aes()))
-    
+
     match <- "\\.\\.([a-zA-z._]+)\\.\\."
     new <- aesthetics[grep(match, aesthetics)]
     new <- lapply(new, function(x) parse(text = sub(match, "\\1", x))[[1]])
+
+    # Add map stat output to aesthetics
+    stat_data <- as.data.frame(lapply(new, eval, data, baseenv()))
+    names(stat_data) <- names(new)
 
-    for(i in seq_along(new)) {
-      data[[names(new)[i]]] <- eval(new[[i]], data, baseenv())
-    }
-    
+    # Add any new scales, if needed
     plot$scales$add_defaults(data, new, plot$plot_env)
+    stat_data <- plot$scales$transform_df(stat_data)
 
-    data
+    cbind(data, stat_data)
   }
 
   reparameterise <- function(., data) {