Use @ as accessor

Author: teunbrand

R/facet-.R

@@ -401,7 +401,7 @@ get_strip_labels <- function(plot = get_last_plot()) {
   plot   <- ggplot_build(plot)
   layout <- plot$layout$layout
   params <- plot$layout$facet_params
-  plot$plot$facet$format_strip_labels(layout, params)
+  plot$plot@facet$format_strip_labels(layout, params)
 }
 
 # A "special" value, currently not used but could be used to determine

R/guides-.R

@@ -832,7 +832,7 @@ get_guide_data <- function(plot = get_last_plot(), aesthetic, panel = 1L) {
 
   if (!aesthetic %in% c("x", "y", "x.sec", "y.sec", "theta", "r")) {
     # Non position guides: check if aesthetic in colnames of key
-    keys <- lapply(plot$plot$guides$params, `[[`, "key")
+    keys <- lapply(plot$plot@guides$params, `[[`, "key")
     keep <- vapply(keys, function(x) any(colnames(x) %in% aesthetic), logical(1))
     keys <- switch(sum(keep) + 1, NULL, keys[[which(keep)]], keys[keep])
     return(keys)

R/labels.R

@@ -12,7 +12,7 @@
 #' update_labels(p, list(colour = "Fail silently"))
 update_labels <- function(p, labels) {
   p <- plot_clone(p)
-  p$labels <- defaults(labels, p$labels)
+  p@labels <- labs(!!!defaults(labels, p@labels))
   p
 }
 
@@ -69,7 +69,7 @@ setup_plot_labels <- function(plot, layers, data) {
   # Warn for spurious labels that don't have a mapping.
   # Note: sometimes, 'x' and 'y' might not have a mapping, like in
   # `geom_function()`. We can display these labels anyway, so we include them.
-  plot_labels  <- plot$labels
+  plot_labels  <- plot@labels
   known_labels <- c(names(labels), fn_fmls_names(labs), "x", "y")
   extra_labels <- setdiff(names(plot_labels), known_labels)
 
@@ -102,7 +102,7 @@ setup_plot_labels <- function(plot, layers, data) {
     })
   }
 
-  defaults(plot_labels, labels)
+  labs(!!!defaults(plot_labels, labels))
 }
 
 #' Modify axis, legend, and plot labels
@@ -220,7 +220,7 @@ ggtitle <- function(label, subtitle = waiver()) {
 get_labs <- function(plot = get_last_plot()) {
   plot <- ggplot_build(plot)
 
-  labs <- plot$plot$labels
+  labs <- plot$plot@labels
 
   xy_labs <- rename(
     c(x = plot$layout$resolve_label(plot$layout$panel_scales_x[[1]], labs),
@@ -231,7 +231,7 @@ get_labs <- function(plot = get_last_plot()) {
 
   labs <- defaults(xy_labs, labs)
 
-  guides <- plot$plot$guides
+  guides <- plot$plot@guides
   if (length(guides$aesthetics) == 0) {
     return(labs)
   }
@@ -281,19 +281,19 @@ get_alt_text <- function(p, ...) {
 }
 #' @export
 get_alt_text.ggplot <- function(p, ...) {
-  alt <- p$labels[["alt"]] %||% ""
+  alt <- p@labels[["alt"]] %||% ""
   if (!is.function(alt)) {
     return(alt)
   }
-  p$labels[["alt"]] <- NULL
+  p@labels[["alt"]] <- NULL
   build <- ggplot_build(p)
-  build$plot$labels[["alt"]] <- alt
+  build$plot@labels[["alt"]] <- alt
   get_alt_text(build)
 }
 #' @export
 get_alt_text.ggplot_built <- function(p, ...) {
-  alt <- p$plot$labels[["alt"]] %||% ""
-  p$plot$labels[["alt"]] <- NULL
+  alt <- p$plot@labels[["alt"]] %||% ""
+  p$plot@labels[["alt"]] <- NULL
   if (is.function(alt)) alt(p$plot) else alt
 }
 #' @export
@@ -347,8 +347,8 @@ get_alt_text.gtable <- function(p, ...) {
 #'
 generate_alt_text <- function(p) {
   # Combine titles
-  if (!is.null(p$label$title %||% p$labels$subtitle)) {
-    title <- sub("\\.?$", "", c(p$labels$title, p$labels$subtitle))
+  if (!is.null(p@labels$title %||% p@labels$subtitle)) {
+    title <- sub("\\.?$", "", c(p@labels$title, p@labels$subtitle))
     if (length(title) == 2) {
       title <- paste0(title[1], ": ", title[2])
     }
@@ -364,7 +364,7 @@ generate_alt_text <- function(p) {
   axes <- safe_string(axes)
 
   # Get layer types
-  layers <- vapply(p$layers, function(l) snake_class(l$geom), character(1))
+  layers <- vapply(p@layers, function(l) snake_class(l$geom), character(1))
   layers <- sub("_", " ", sub("^geom_", "", unique0(layers)))
   if (length(layers) == 1) {
     layers <- paste0(" using a ", layers, " layer")
@@ -375,21 +375,21 @@ generate_alt_text <- function(p) {
 
   # Combine
   alt <- paste0(title, "A plot", axes, layers, ".")
-  if (!is.null(p$labels$alt_insight)) {
-    alt <- paste0(alt, " ", p$labels$alt_insight)
+  if (!is.null(p@labels$alt_insight)) {
+    alt <- paste0(alt, " ", p@labels$alt_insight)
   }
   as.character(alt)
 }
 safe_string <- function(string) {
   if (length(string) == 0) "" else string
 }
 scale_description <- function(p, name) {
-  scale <- p$scales$get_scales(name)
+  scale <- p@scales$get_scales(name)
   if (is.null(scale)) {
-    lab <- p$labels[[name]]
+    lab <- p@labels[[name]]
     type <- "the"
   } else {
-    lab <- scale$make_title(scale$name %|W|% p$labels[[name]])
+    lab <- scale$make_title(scale$name %|W|% p@labels[[name]])
     type <- "a continuous"
     if (scale$is_discrete()) type <- "a discrete"
     if (inherits(scale, "ScaleBinned")) type <- "a binned"

R/layer.R

@@ -265,14 +265,14 @@ Layer <- ggproto("Layer", NULL,
   setup_layer = function(self, data, plot) {
     # For annotation geoms, it is useful to be able to ignore the default aes
     if (isTRUE(self$inherit.aes)) {
-      self$computed_mapping <- mapping(defaults(self$mapping, plot$mapping))
+      self$computed_mapping <- mapping(defaults(self$mapping, plot@mapping))
 
       # Inherit size as linewidth from global mapping
       if (self$geom$rename_size &&
-          "size" %in% names(plot$mapping) &&
+          "size" %in% names(plot@mapping) &&
           !"linewidth" %in% names(self$computed_mapping) &&
           "linewidth" %in% self$geom$aesthetics()) {
-        self$computed_mapping$size <- plot$mapping$size
+        self$computed_mapping$size <- plot@mapping$size
         deprecate_soft0("3.4.0", I("Using `size` aesthetic for lines"), I("`linewidth`"))
       }
     } else {
@@ -300,7 +300,7 @@ Layer <- ggproto("Layer", NULL,
 
     # Evaluate aesthetics
     evaled <- eval_aesthetics(aesthetics, data)
-    plot$scales$add_defaults(evaled, plot$plot_env)
+    plot@scales$add_defaults(evaled, plot@plot_env)
 
     # Check for discouraged usage in mapping
     warn_for_aes_extract_usage(aesthetics, data[setdiff(names(data), "PANEL")])
@@ -370,7 +370,7 @@ Layer <- ggproto("Layer", NULL,
     if (length(new) == 0) return(data)
 
     # data needs to be non-scaled
-    data_orig <- plot$scales$backtransform_df(data)
+    data_orig <- plot@scales$backtransform_df(data)
 
     # Add map stat output to aesthetics
     stat_data <- eval_aesthetics(
@@ -387,11 +387,11 @@ Layer <- ggproto("Layer", NULL,
     stat_data <- data_frame0(!!!stat_data)
 
     # Add any new scales, if needed
-    plot$scales$add_defaults(stat_data, plot$plot_env)
+    plot@scales$add_defaults(stat_data, plot@plot_env)
     # Transform the values, if the scale say it's ok
     # (see stat_spoke for one exception)
     if (self$stat$retransform) {
-      stat_data <- plot$scales$transform_df(stat_data)
+      stat_data <- plot@scales$transform_df(stat_data)
     }
     stat_data <- cleanup_mismatched_data(stat_data, nrow(data), "after_stat")
 

R/plot-build.R

@@ -39,28 +39,28 @@ ggplot_build.ggplot_built <- function(plot) {
 #' @export
 ggplot_build.ggplot <- function(plot) {
   plot <- plot_clone(plot)
-  if (length(plot$layers) == 0) {
+  if (length(plot@layers) == 0) {
     plot <- plot + geom_blank()
   }
 
-  layers <- plot$layers
+  layers <- plot@layers
   data <- rep(list(NULL), length(layers))
 
-  scales <- plot$scales
+  scales <- plot@scales
 
   # Allow all layers to make any final adjustments based
   # on raw input data and plot info
-  data <- by_layer(function(l, d) l$layer_data(plot$data), layers, data, "computing layer data")
+  data <- by_layer(function(l, d) l$layer_data(plot@data), layers, data, "computing layer data")
   data <- by_layer(function(l, d) l$setup_layer(d, plot), layers, data, "setting up layer")
 
   # Initialise panels, add extra data for margins & missing faceting
   # variables, and add on a PANEL variable to data
-  layout <- create_layout(plot$facet, plot$coordinates, plot$layout)
-  data <- layout$setup(data, plot$data, plot$plot_env)
+  layout <- create_layout(plot@facet, plot@coordinates, plot@layout)
+  data <- layout$setup(data, plot@data, plot@plot_env)
 
   # Compute aesthetics to produce data with generalised variable names
   data <- by_layer(function(l, d) l$compute_aesthetics(d, plot), layers, data, "computing aesthetics")
-  plot$labels <- setup_plot_labels(plot, layers, data)
+  plot@labels <- setup_plot_labels(plot, layers, data)
   data <- .ignore_data(data)
 
   # Transform all scales
@@ -80,7 +80,7 @@ ggplot_build.ggplot <- function(plot) {
   data <- by_layer(function(l, d) l$map_statistic(d, plot), layers, data, "mapping stat to aesthetics")
 
   # Make sure missing (but required) aesthetics are added
-  plot$scales$add_missing(c("x", "y"), plot$plot_env)
+  plot@scales$add_missing(c("x", "y"), plot@plot_env)
 
   # Reparameterise geoms from (e.g.) y and width to ymin and ymax
   data <- by_layer(function(l, d) l$compute_geom_1(d), layers, data, "setting up geom")
@@ -98,27 +98,27 @@ ggplot_build.ggplot <- function(plot) {
   data <- layout$map_position(data)
 
   # Hand off position guides to layout
-  layout$setup_panel_guides(plot$guides, plot$layers)
+  layout$setup_panel_guides(plot@guides, plot@layers)
 
   # Complete the plot's theme
-  plot$theme <- plot_theme(plot)
+  plot@theme <- plot_theme(plot)
 
   # Train and map non-position scales and guides
   npscales <- scales$non_position_scales()
   if (npscales$n() > 0) {
-    npscales$set_palettes(plot$theme)
+    npscales$set_palettes(plot@theme)
     lapply(data, npscales$train_df)
-    plot$guides <- plot$guides$build(npscales, plot$layers, plot$labels, data, plot$theme)
+    plot@guides <- plot@guides$build(npscales, plot@layers, plot@labels, data, plot@theme)
     data <- lapply(data, npscales$map_df)
   } else {
     # Only keep custom guides if there are no non-position scales
-    plot$guides <- plot$guides$get_custom()
+    plot@guides <- plot@guides$get_custom()
   }
   data <- .expose_data(data)
 
   # Fill in defaults etc.
   data <- by_layer(
-    function(l, d) l$compute_geom_2(d, theme = plot$theme),
+    function(l, d) l$compute_geom_2(d, theme = plot@theme),
     layers, data, "setting up geom aesthetics"
   )
 
@@ -129,7 +129,7 @@ ggplot_build.ggplot <- function(plot) {
   data <- layout$finish_data(data)
 
   # Consolidate alt-text
-  plot$labels$alt <- get_alt_text(plot)
+  plot@labels$alt <- get_alt_text(plot)
 
   structure(
     list(data = data, layout = layout, plot = plot),
@@ -169,7 +169,7 @@ layer_scales <- get_panel_scales
 get_layer_grob <- function(plot = get_last_plot(), i = 1L) {
   b <- ggplot_build(plot)
 
-  b$plot$layers[[i]]$draw_geom(b$data[[i]], b$layout)
+  b$plot@layers[[i]]$draw_geom(b$data[[i]], b$layout)
 }
 
 #' @export
@@ -196,7 +196,7 @@ layer_grob <- get_layer_grob
 #' @export
 ggplot_gtable <- function(data) {
   # Attaching the plot env to be fetched by deprecations etc.
-  attach_plot_env(data$plot$plot_env)
+  attach_plot_env(data$plot@plot_env)
 
   UseMethod('ggplot_gtable')
 }
@@ -206,33 +206,33 @@ ggplot_gtable.ggplot_built <- function(data) {
   plot <- data$plot
   layout <- data$layout
   data <- data$data
-  theme <- plot$theme
+  theme <- plot@theme
 
-  geom_grobs <- by_layer(function(l, d) l$draw_geom(d, layout), plot$layers, data, "converting geom to grob")
+  geom_grobs <- by_layer(function(l, d) l$draw_geom(d, layout), plot@layers, data, "converting geom to grob")
 
-  plot_table <- layout$render(geom_grobs, data, theme, plot$labels)
+  plot_table <- layout$render(geom_grobs, data, theme, plot@labels)
 
   # Legends
-  legend_box <- plot$guides$assemble(theme)
+  legend_box <- plot@guides$assemble(theme)
   plot_table <- table_add_legends(plot_table, legend_box, theme)
 
   # Title
   title <- element_render(
-    theme, "plot.title", plot$labels$title,
+    theme, "plot.title", plot@labels$title,
     margin_y = TRUE, margin_x = TRUE
   )
   title_height <- grobHeight(title)
 
   # Subtitle
   subtitle <- element_render(
-    theme, "plot.subtitle", plot$labels$subtitle,
+    theme, "plot.subtitle", plot@labels$subtitle,
     margin_y = TRUE, margin_x = TRUE
   )
   subtitle_height <- grobHeight(subtitle)
 
   # whole plot annotation
   caption <- element_render(
-    theme, "plot.caption", plot$labels$caption,
+    theme, "plot.caption", plot@labels$caption,
     margin_y = TRUE, margin_x = TRUE
   )
   caption_height <- grobHeight(caption)
@@ -283,7 +283,7 @@ ggplot_gtable.ggplot_built <- function(data) {
   plot_table <- gtable_add_grob(plot_table, caption, name = "caption",
     t = -1, b = -1, l = caption_l, r = caption_r, clip = "off")
 
-  plot_table <- table_add_tag(plot_table, plot$labels$tag, theme)
+  plot_table <- table_add_tag(plot_table, plot@labels$tag, theme)
 
   # Margins
   plot_margin <- calc_element("plot.margin", theme) %||% margin()
@@ -298,7 +298,7 @@ ggplot_gtable.ggplot_built <- function(data) {
   }
 
   # add alt-text as attribute
-  attr(plot_table, "alt-label") <- plot$labels$alt
+  attr(plot_table, "alt-label") <- plot@labels$alt
 
   plot_table
 }