Skip to content

Commit

Permalink
Rename functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbengler
jbengler committed Feb 12, 2024
1 parent a16e8cb commit 04dfb35
Show file tree
Hide file tree
Showing 57 changed files with 1,187 additions and 1,116 deletions.
20 changes: 11 additions & 9 deletions NAMESPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export(add_areastack_absolute)
export(add_areastack_relative)
export(add_barstack_absolute)
export(add_barstack_relative)
export(add_box)
export(add_boxplot)
export(add_caption)
export(add_ci95)
export(add_ci95_ribbon)
Expand All @@ -18,14 +18,16 @@ export(add_count_dot)
export(add_count_line)
export(add_count_value)
export(add_curve)
export(add_data_points)
export(add_data_points_beeswarm)
export(add_data_points_jitter)
export(add_density_curve)
export(add_density_histogram)
export(add_donut)
export(add_error)
export(add_error_ribbon)
export(add_heatmap)
export(add_histogram)
export(add_jitter)
export(add_line)
export(add_mean_area)
export(add_mean_bar)
Expand All @@ -40,7 +42,6 @@ export(add_median_dot)
export(add_median_line)
export(add_median_value)
export(add_pie)
export(add_points)
export(add_range)
export(add_range_ribbon)
export(add_reference_lines)
Expand All @@ -54,17 +55,17 @@ export(add_sum_dash)
export(add_sum_dot)
export(add_sum_line)
export(add_sum_value)
export(add_text)
export(add_text_labels)
export(add_title)
export(add_violin)
export(adjust_colors)
export(adjust_flip)
export(adjust_fontsize)
export(adjust_labels)
export(adjust_data_labels)
export(adjust_description)
export(adjust_font)
export(adjust_legend)
export(adjust_padding)
export(adjust_size)
export(adjust_variable)
export(adjust_plot_size)
export(adjust_rotate_plot)
export(adjust_x_axis)
export(adjust_y_axis)
export(all_rows)
Expand All @@ -89,6 +90,7 @@ export(remove_y_axis_line)
export(remove_y_axis_ticks)
export(remove_y_axis_title)
export(save_plot)
export(show_color_palettes)
export(show_plot)
export(split_plot)
export(theme_ggplot2)
Expand Down
157 changes: 94 additions & 63 deletions R/add.R
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

add_geom <- function(gg, geom, rasterize = FALSE, rasterize_dpi = 300) {
pf <- parent_function()
add_geom <- function(gg, geom, rasterize = FALSE, rasterize_dpi = 300, level = 0) {
pf <- parent_function(level = level)
if (check_input(gg) == "none")
stop(glue::glue("{pf}: Please provide a ggplot or list of ggplots as input to 'gg'"))

Expand All @@ -23,30 +23,13 @@ add_geom <- function(gg, geom, rasterize = FALSE, rasterize_dpi = 300) {
add <- .Primitive("+")


#' Add data points
#'
#' @param gg bla
#' @param data bla
#' @param dodge_width bla
#' @param jitter_width bla
#' @param jitter_height bla
#' @param size bla
#' @param shape bla
#' @param color bla
#' @param rasterize bla
#' @param rasterize_dpi bla
#' @param preserve bla
#' @param style bla
#' @param ... bla
#' @export
add_points <- function(gg, style = c("point", "circle", "confetti"), data = all_rows(),
color = NULL, size = 1,
dodge_width = NULL,
jitter_width = 0, jitter_height = 0,
shape = NULL,
preserve = "total",
rasterize = FALSE, rasterize_dpi = 300, ...) {
style <- match.arg(style)
## Points function
f_points <- function(gg, data = all_rows(),
shape = 19, size = 1, confetti = FALSE, beeswarm = FALSE,
cex = 3, corral = "wrap", corral.width = 0.5,
dodge_width = NULL,
jitter_width = 0, jitter_height = 0, preserve = "total",
rasterize = FALSE, rasterize_dpi = 300, ...) {

if (is_discrete(gg, "x")) {
dodge_width <- dodge_width %||% gg$tidyplot$dodge_width
Expand All @@ -65,50 +48,97 @@ add_points <- function(gg, style = c("point", "circle", "confetti"), data = all_
dodge.width = dodge_width)
}

if (is.null(shape)) {
use_style <- TRUE
if (style == "point") shape <- 19
if (style == "circle") shape <- 1
if (style == "confetti"){
shape <- 21
size <- size * 1.5
fill <- color
color <- "#FFFFFF"
}
if (confetti) {
size <- size * 1.5
shape = 21
}

if (style == "confetti" && use_style) {
if (is.null(fill)) {
add_geom(gg, ggplot2::geom_point(data = data, size = size, shape = shape, position = position, color = "#FFFFFF", ...),
rasterize = rasterize, rasterize_dpi = rasterize_dpi)
if (beeswarm) {
if (confetti) {
add_geom(gg, ggbeeswarm::geom_beeswarm(data = data, size = size, shape = shape, dodge.width = dodge_width, color = "#FFFFFF",
cex = cex, corral = corral, corral.width = corral.width, ...),
rasterize = rasterize, rasterize_dpi = rasterize_dpi, level = -1)
} else {
add_geom(gg, ggplot2::geom_point(data = data, size = size, shape = shape, position = position, color = "#FFFFFF", fill = fill, ...),
rasterize = rasterize, rasterize_dpi = rasterize_dpi)
add_geom(gg, ggbeeswarm::geom_beeswarm(data = data, size = size, shape = shape, dodge.width = dodge_width,
cex = cex, corral = corral, corral.width = corral.width, ...),
rasterize = rasterize, rasterize_dpi = rasterize_dpi, level = -1)
}

} else {
if (is.null(color)) {
add_geom(gg, ggplot2::geom_point(data = data, size = size, shape = shape, position = position, ...),
rasterize = rasterize, rasterize_dpi = rasterize_dpi)

# not beeswarm
if (confetti) {
add_geom(gg, ggplot2::geom_point(data = data, size = size, shape = shape, position = position, color = "#FFFFFF", ...),
rasterize = rasterize, rasterize_dpi = rasterize_dpi, level = -1)
} else {
add_geom(gg, ggplot2::geom_point(data = data, size = size, shape = shape, position = position, color = color, ...),
rasterize = rasterize, rasterize_dpi = rasterize_dpi)
add_geom(gg, ggplot2::geom_point(data = data, size = size, shape = shape, position = position, ...),
rasterize = rasterize, rasterize_dpi = rasterize_dpi, level = -1)
}
}
}
#' @rdname add_points
#' Add data points
#'
#' @param gg bla
#' @param data bla
#' @param size bla
#' @param shape bla
#' @param confetti bla
#' @param dodge_width bla
#' @param jitter_width bla
#' @param jitter_height bla
#' @param preserve bla
#' @param rasterize bla
#' @param rasterize_dpi bla
#' @param ... bla
#' @inheritParams ggbeeswarm::geom_beeswarm
#'
#' @examples
#' study %>%
#' tidyplot(x = treatment, y = score, color = treatment) %>%
#' add_mean_bar(alpha = 0.3) %>%
#' add_error() %>%
#' add_data_points_beeswarm()
#'
#' @export
add_jitter <- function(gg, style = c("point", "circle", "confetti"), data = all_rows(),
size = 1,
add_data_points <- function(gg, data = all_rows(),
shape = 19, size = 1, confetti = FALSE,
dodge_width = NULL,
jitter_width = 0.2, jitter_height = 0,
shape = NULL,
preserve = "total",
rasterize = FALSE, rasterize_dpi = 300, ...) {
style <- match.arg(style)
add_points(gg = gg, data = data, dodge_width = dodge_width,
jitter_width = jitter_width, jitter_height = jitter_height,
size = size, shape = shape, style = style,
preserve = preserve, rasterize = rasterize, rasterize_dpi = rasterize_dpi, ...)
f_points(gg = gg, data = data,
shape = shape, size = size, confetti = confetti,
dodge_width = dodge_width,
preserve = preserve,
rasterize = rasterize, rasterize_dpi = rasterize_dpi, ...)
}
#' @rdname add_data_points
#' @export
add_data_points_jitter <- function(gg, data = all_rows(),
shape = 19, size = 1, confetti = FALSE,
dodge_width = NULL,
jitter_width = 0.2, jitter_height = 0, preserve = "total",
rasterize = FALSE, rasterize_dpi = 300, ...) {
f_points(gg = gg, data = data,
shape = shape, size = size, confetti = confetti,
dodge_width = dodge_width,
jitter_width = jitter_width, jitter_height = jitter_height, preserve = preserve,
rasterize = rasterize, rasterize_dpi = rasterize_dpi, ...)
}
#' @rdname add_data_points
#' @export
add_data_points_beeswarm <- function(gg, data = all_rows(),
shape = 19, size = 1, confetti = FALSE,
cex = 3, corral = "wrap", corral.width = 0.5,
dodge_width = NULL,
preserve = "total",
rasterize = FALSE, rasterize_dpi = 300, ...) {
f_points(beeswarm = TRUE,
gg = gg, data = data,
shape = shape, size = size, confetti = confetti,
cex = cex, corral = corral, corral.width = corral.width,
dodge_width = dodge_width,
preserve = preserve,
rasterize = rasterize, rasterize_dpi = rasterize_dpi, ...)
}


Expand Down Expand Up @@ -136,11 +166,12 @@ add_error <- ff_errorbar(.fun.data = ggplot2::mean_se)
add_range <- ff_errorbar(.fun.data = min_max)
#' @rdname add_error
#' @export
add_sd <- ff_errorbar(.fun.data = ggplot2::mean_sdl)
# add_sd <- ff_errorbar(.fun.data = ggplot2::mean_sdl)
add_sd <- ff_errorbar(.fun.data = mean_sdl)
#' @rdname add_error
#' @export
add_ci95 <- ff_errorbar(.fun.data = ggplot2::mean_cl_boot)

# add_ci95 <- ff_errorbar(.fun.data = ggplot2::mean_cl_boot)
add_ci95 <- ff_errorbar(.fun.data = mean_cl_boot)

## Ribbon function factory
ff_ribbon <- function(.fun.data) {
Expand Down Expand Up @@ -417,7 +448,7 @@ add_count_area <- ff_line(.count = TRUE, .geom = "area")
#' @param ... bla
#'
#' @export
add_box <- function(gg, dodge_width = NULL, saturation = 0.3, show_whiskers = TRUE, show_outliers = FALSE,
add_boxplot <- function(gg, dodge_width = NULL, saturation = 0.3, show_whiskers = TRUE, show_outliers = FALSE,
box_width = 0.6, whiskers_width = 0.5, outlier.size = 0.5, coef = 1.5,
outlier.shape = 19, linewidth = 0.25, preserve = "total", ...) {
dodge_width <- dodge_width %||% gg$tidyplot$dodge_width
Expand Down Expand Up @@ -538,7 +569,7 @@ ff_pie <- function(.type = "pie") {
gg
}
}
#' Add pie chart
#' Add pie or donut chart
#' @param gg bla
#' @param bar_width bla
#' @param reverse bla
Expand Down Expand Up @@ -765,7 +796,7 @@ add_reference_lines <- function(gg, x = NULL, y = NULL, linetype = "dashed", lin
#' @param box.padding bla
#' @param ... bla
#' @export
add_text <- function(gg, var, data = all_rows(), fontsize = 7,
add_text_labels <- function(gg, var, data = all_rows(), fontsize = 7,
segment.size = 0.2, box.padding = 0.2, ...) {
size <- fontsize/ggplot2::.pt
gg + ggrepel::geom_text_repel(data = data, ggplot2::aes(label = {{var}}), size = size,
Expand Down
Loading

0 comments on commit 04dfb35

Please sign in to comment.