gnoblet/visualizeR
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #23 from gnoblet/16-add-options-to-decrease-space-between-bars-in-bar

Browse source 
Tries and errors for backup
This commit is contained in:
Guillaume NOBLET 2023-08-06 16:37:59 +03:00 • committed by GitHub
commit f11a2726b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
R/bar.R
View file

@ -16,13 +16,15 @@
#' @param subtitle Plot subtitle. Default to NULL. #' @param subtitle Plot subtitle. Default to NULL.
#' @param caption Plot caption. Default to NULL. #' @param caption Plot caption. Default to NULL.
#' @param add_text TRUE or FALSE. Add the value as text. #' @param add_text TRUE or FALSE. Add the value as text.
#' @param add_text_threshold_display Minimum value to add the text label.
#' @param add_text_color Text color.
#' @param add_text_suffix If percent is FALSE, should we add a suffix to the text label? #' @param add_text_suffix If percent is FALSE, should we add a suffix to the text label?
#' @param theme Whatever theme. Default to theme_reach(). #' @param theme Whatever theme. Default to theme_reach().
#' #'
#' @return A bar chart #' @return A bar chart
#' #'
#' @export #' @export
bar <- function(df, x, y, group = NULL, flip = TRUE, percent = TRUE, wrap = NULL, position = "dodge", alpha = 1, x_title = NULL, y_title = NULL, group_title = NULL, title = NULL, subtitle = NULL, caption = NULL, add_text = FALSE, add_text_suffix = "", theme = theme_reach()){ bar <- function(df, x, y, group = NULL, flip = TRUE, percent = TRUE, wrap = NULL, position = "dodge", alpha = 1, x_title = NULL, y_title = NULL, group_title = NULL, title = NULL, subtitle = NULL, caption = NULL, width = 0.9, add_text = FALSE, add_text_threshold_display = 5, add_text_color = "white", add_text_suffix = "", theme = theme_reach()){
# To do : # To do :
# - automate bar width and text size, or at least give the flexibility and still center text # - automate bar width and text size, or at least give the flexibility and still center text
@ -51,8 +53,8 @@ bar <- function(df, x, y, group = NULL, flip = TRUE, percent = TRUE, wrap = NULL
fill = group_title fill = group_title
) )
width <- 0.5 width <- width
dodge_width <- 0.5 dodge_width <- width
# Should the graph use position_fill? # Should the graph use position_fill?
if (position == "stack"){ if (position == "stack"){
@ -108,27 +110,32 @@ bar <- function(df, x, y, group = NULL, flip = TRUE, percent = TRUE, wrap = NULL
# Add text labels # Add text labels
if (add_text) { if (add_text) {
df <- dplyr::mutate(df, "y_threshold" = ifelse({{ y }} >= add_text_threshold_display, {{ y }}, NA ))
if (percent) { if (percent) {
g <- g + ggplot2::geom_text( g <- g + ggplot2::geom_text(
data = df,
ggplot2::aes( ggplot2::aes(
label = scales::label_percent( label = scales::label_percent(
accuracy = 1, accuracy = 1,
decimal.mark = ",", decimal.mark = ",",
suffix = " %")({{ y }}), suffix = " %")(!!rlang::sym("y_threshold")),
group = {{ group }}), group = {{ group }}),
hjust = hjust_flip, hjust = hjust_flip,
vjust = vjust_flip, vjust = vjust_flip,
color = "white", color = add_text_color,
fontface = "bold", fontface = "bold",
position = ggplot2::position_dodge(width = dodge_width)) position = ggplot2::position_dodge(width = dodge_width))
} else { } else {
g <- g + ggplot2::geom_text( g <- g + ggplot2::geom_text(
data = df,
ggplot2::aes( ggplot2::aes(
label = paste0(round({{ y }}), add_text_suffix), label = paste0(round(!!rlang::sym("y_threshold")), add_text_suffix),
group = {{ group }}), group = {{ group }}),
hjust = hjust_flip, hjust = hjust_flip,
vjust = vjust_flip, vjust = vjust_flip,
color = "white", color = add_text_color,
fontface = "bold", fontface = "bold",
position = ggplot2::position_dodge(width = dodge_width)) position = ggplot2::position_dodge(width = dodge_width))
} }

5
R/donut.R
View file

@ -30,7 +30,10 @@ donut <- function(df,
arrange = TRUE, arrange = TRUE,
hole_size = 3, hole_size = 3,
add_text = TRUE, add_text = TRUE,
add_text_treshold_display = 5, add_text_color = "white", add_text_suffix = "", theme = theme_reach(legend_reverse = TRUE, axis_x = FALSE)){ add_text_threshold_display = 5,
add_text_color = "white",
add_text_suffix = "", theme = theme_reach(legend_reverse = TRUE)){
# Arrange by biggest prop first ? # Arrange by biggest prop first ?
if (arrange) df <- dplyr::arrange( if (arrange) df <- dplyr::arrange(