Rename nullGrob to zeroGrob

Author: hadley

NEWS

@@ -15,4 +15,5 @@ ggplot2 0.8.4  (2008-XX-XX)
 * stat_qq: now correctly groups results
 * facet_wrap: can now specify both ncol and nrow without getting an error
 * facet_wrap: now works with statistics that produce both x and y values (e.g. stat_qq)
-* geom_boxplot: alpha now affects fill colour of boxes only
+* geom_boxplot: alpha now affects fill colour of boxes only
+* nullGrob renamed to zeroGrob to avoid name conflict with grid

R/facet-grid-.r

@@ -180,9 +180,9 @@ FacetGrid <- proto(Facet, {
     col.labels <- add.names(rcolnames(gm))
 
     strip_h <- apply(col.labels, c(2,1), ggstrip, theme = theme)
-    if (nrow(strip_h) == 1 && ncol(strip_h) == 1) strip_h <- matrix(list(nullGrob()))
+    if (nrow(strip_h) == 1 && ncol(strip_h) == 1) strip_h <- matrix(list(zeroGrob()))
     strip_v <- apply(row.labels, c(1,2), ggstrip, horizontal=FALSE, theme=theme)
-    if (nrow(strip_v) == 1 && ncol(strip_v) == 1) strip_v <- matrix(list(nullGrob()))
+    if (nrow(strip_v) == 1 && ncol(strip_v) == 1) strip_v <- matrix(list(zeroGrob()))
 
     list(
       h = strip_h, 

R/geom-.r

@@ -20,7 +20,7 @@ Geom <- proto(TopLevel, expr={
 
   draw <- function(...) {}
   draw_groups <- function(., data, scales, coordinates, ...) {
-    if (empty(data)) return(nullGrob())
+    if (empty(data)) return(zeroGrob())
 
     groups <- split(data, factor(data$group))
     grobs <- lapply(groups, function(group) .$draw(group, scales, coordinates, ...))

R/geom-blank.r

@@ -14,7 +14,7 @@ GeomBlank <- proto(Geom, {
   }
 
   draw_legend <- function(., data, ...) {
-    nullGrob()
+    zeroGrob()
   }
 
 

R/geom-path-.r

@@ -7,7 +7,7 @@ GeomPath <- proto(Geom, {
     # Silently drop lines with less than two points, preserving order
     rows <- ave(seq_len(nrow(munched)), munched$group, FUN = length)
     munched <- munched[rows >= 2, ]
-    if (nrow(munched) < 2) return(nullGrob())
+    if (nrow(munched) < 2) return(zeroGrob())
 
     # Work out whether we should use lines or segments
     attr <- ddply(munched, .(group), function(df) {

R/geom-point-.r

@@ -3,7 +3,7 @@ GeomPoint <- proto(Geom, {
   draw <- function(., data, scales, coordinates, na.rm = FALSE, ...) {    
     data <- remove_missing(data, na.rm, 
       c("x", "y", "size", "shape"), name = "geom_point")
-    if (empty(data)) return(nullGrob())
+    if (empty(data)) return(zeroGrob())
 
     with(coordinates$transform(data, scales), 
       ggname(.$my_name(), pointsGrob(x, y, size=unit(size, "mm"), pch=shape, 

R/grob-grid.r

@@ -44,9 +44,9 @@ grobGrid <- function(name, nrow, ncol, grobs = NULL, widths = 1, heights = 1, cl
 
   # stopifnot(is.list(grobs))
   if (is.null(grobs)) {
-    grobs <- matrix(list(nullGrob()), nrow = nrow, ncol = ncol)
+    grobs <- matrix(list(zeroGrob()), nrow = nrow, ncol = ncol)
   } else {  
-    mat <- c(grobs, rep(list(nullGrob()), nrow * ncol - length(grobs)))
+    mat <- c(grobs, rep(list(zeroGrob()), nrow * ncol - length(grobs)))
     dim(mat) <- c(ncol, nrow)
     grobs <- t(mat)
   }

R/grob-null.r

@@ -1,19 +1,19 @@
-# Null grob
-# The null grob does nothing and has zero size.
+# Zero grob
+# The zero grob draws nothing and has zero size.
 # 
-# @alias widthDetails.nullGrob
-# @alias heightDetails.nullGrob
-# @alias grobWidth.nullGrob
-# @alias grobHeight.nullGrob
-# @alias drawDetails.nullGrob
+# @alias widthDetails.zeroGrob
+# @alias heightDetails.zeroGrob
+# @alias grobWidth.zeroGrob
+# @alias grobHeight.zeroGrob
+# @alias drawDetails.zeroGrob
 # @keyword internal
-nullGrob <- function() .nullGrob
+zeroGrob <- function() .zeroGrob
 
-.nullGrob <- grob(cl = "nullGrob", name = "NULL")
-widthDetails.nullGrob <-
-heightDetails.nullGrob <- 
-grobWidth.nullGrob <- 
-grobHeight.nullGrob <- function(x) unit(0, "cm")
+.zeroGrob <- grob(cl = "zeroGrob", name = "NULL")
+widthDetails.zeroGrob <-
+heightDetails.zeroGrob <- 
+grobWidth.zeroGrob <- 
+grobHeight.zeroGrob <- function(x) unit(0, "cm")
 
-drawDetails.nullGrob <- function(x, recording) {}
+drawDetails.zeroGrob <- function(x, recording) {}
 

R/guides-legend.r

@@ -16,7 +16,7 @@ guide_legends_box <- function(scales, layers, default_mapping, horizontal = FALS
   legs <- guide_legends(scales, layers, default_mapping, theme=theme)
 
   n <- length(legs)
-  if (n == 0) return(nullGrob())
+  if (n == 0) return(zeroGrob())
 
   if (!horizontal) {
     width <-   do.call("max", lapply(legs, widthDetails))
@@ -71,7 +71,7 @@ guide_legends <- function(scales, layers, default_mapping, theme) {
 
 build_legend <- function(name, mapping, layers, default_mapping, theme) {
   legend_data <- llply(layers, build_legend_data, mapping, default_mapping)
-  # if (length(legend_data) == 0) return(nullGrob())
+  # if (length(legend_data) == 0) return(zeroGrob())
   # browser()
 
   # Calculate sizes for keys - mainly for v. large points and lines

R/layer.r

@@ -233,7 +233,7 @@ Layer <- proto(expr = {
   }
 
   make_grob <- function(., data, scales, cs) {
-    if (empty(data)) return(nullGrob())
+    if (empty(data)) return(zeroGrob())
     data <- .$use_defaults(data)
 
     check_required_aesthetics(.$geom$required_aes, c(names(data), names(.$geom_params)), paste("geom_", .$geom$objname, sep=""))

R/plot-render.r

@@ -60,7 +60,7 @@ ggplotGrob <- function(plot, drop = plot$options$drop, keep = plot$options$keep,
   legend_box <- if (position != "none") {
     guide_legends_box(scales, plot$layers, plot$mapping, horiz, theme) 
   } else {
-    nullGrob()
+    zeroGrob()
   } 
 
   title <- theme_render(theme, "plot.title", plot$options$title)
@@ -78,7 +78,7 @@ ggplotGrob <- function(plot, drop = plot$options$drop, keep = plot$options$keep,
     panels = panels, legend_box = legend_box
   )
   if (!is.null(keep)) drop <- setdiff(names(grobs), keep)
-  if (!is.null(drop)) grobs[drop] <- rep(list(nullGrob()), length(drop))
+  if (!is.null(drop)) grobs[drop] <- rep(list(zeroGrob()), length(drop))
 
   # Calculate sizes ----------------------------------------------------------
   if (is.null(legend_box)) position <- "none"

R/theme-elements.r

@@ -8,7 +8,7 @@
 # @keywords dplot
 theme_blank <- function() {
   structure(
-    function(...) nullGrob(),
+    function(...) zeroGrob(),
     class = "theme",
     type = "any",
     call = match.call()

R/theme.r

@@ -84,7 +84,7 @@ theme_render <- function(theme, element, ..., name = NULL) {
   el <- theme[[element]]
   if (is.null(el)) {
     message("Theme element ", element, " missing")
-    return(nullGrob())
+    return(zeroGrob())
   }
 
   ggname(ps(element, name, sep = "."), el(...))

R/utilities-grid.r

@@ -38,7 +38,7 @@ grobColWidth <- function(mat) {
 # Build grob matrix
 # Build a matrix of grobs given a vector of grobs and the desired dimensions of the matrix
 # 
-# Any missing cells at the end will be filled in with nullGrobs.
+# Any missing cells at the end will be filled in with zeroGrobs.
 # 
 # @arguments vector of grobs
 # @arguments number of rows
@@ -50,7 +50,7 @@ grobMatrix <- function(vec, nrow, ncol, as.table = FALSE) {
     return(matrix(ncol = ncol, nrow = nrow))
   }
 
-  mat <- c(vec, rep(list(nullGrob()), nrow * ncol - length(vec)))
+  mat <- c(vec, rep(list(zeroGrob()), nrow * ncol - length(vec)))
   dim(mat) <- c(ncol, nrow)
   mat <- t(mat)
   if (!as.table) mat <- mat[rev(seq_len(nrow)), ]

R/utilities-layer.r

@@ -19,7 +19,7 @@ is.integeric <- function(x) all(floor(x) == x)
 # @value data.frame with group variable
 # @keyword internal
 add_group <- function(data) {
-  if (empty(data)) return(nullGrob())
+  if (empty(data)) return(zeroGrob())
 
   if (is.null(data$group)) {
     cat <- sapply(data[setdiff(names(data), "label")], plyr::is.discrete)