fixed breaking changes

Merge remote-tracking branch 'origin' into NAtest_construct_label
# Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser
# Merge erforderlich ist, insbesondere wenn es einen aktualisierten
# Upstream-Branch mit einem Thema-Branch zusammenführt.
#
# Zeilen, die mit '#' beginnen, werden ignoriert,
# und eine leere Beschreibung bricht den Commit ab.

DESCRIPTION

@@ -9,7 +9,7 @@ Description: Functions for plotting eatModel output.
 License: GPL (>= 2)
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Suggests: 
     covr,
     knitr,
@@ -21,7 +21,7 @@ Depends:
     R (>= 2.10)
 LazyData: true
 Imports: 
-    ggbrace,
+    ggbrace (>= 0.1.1),
     ggnewscale,
     ggpattern,
     ggplot2,
@@ -32,6 +32,5 @@ Imports:
     patchwork,
     plyr,
     rlang
-Remotes: NicolasH2/ggbrace
 VignetteBuilder: knitr
 URL: https://nickhaf.github.io/eatPlot/

R/plot_braces.R

@@ -55,7 +55,7 @@ plot_braces <- function(dat,
 # Utils -------------------------------------------------------------------
 draw_braces <- function(dat, plot_settings = plotsettings_lineplot()) {
   if (plot_settings$split_plot == TRUE) {
-    res <- ggbrace::geom_brace(
+    res <- ggbrace::stat_brace(
       data = unique(dat[, c("years_Trend", "year_axis", "brace_y")]),
       mapping = ggplot2::aes(
         x = .data$year_axis,
@@ -64,20 +64,22 @@ draw_braces <- function(dat, plot_settings = plotsettings_lineplot()) {
       ),
       rotate = 180,
       linewidth = plot_settings$brace_line_width,
-      npoints = 200
+      npoints = 200,
+      outside = FALSE
     )
   } else {
     res <- lapply(unique(dat$years_Trend), function(x) {
       dat_year <- unique(dat[dat$years_Trend == x, c("year_start_axis", "year_end_axis", "upper_y", "lower_y", "mid")])
-      ggbrace::geom_brace(
+      ggbrace::stat_brace(
         mapping = ggplot2::aes(
           x = c(dat_year$year_start_axis, dat_year$year_end_axis),
           y = c(dat_year$upper_y, dat_year$lower_y),
         ),
         mid = unique(dat_year$mid),
         rotate = 180,
         linewidth = plot_settings$brace_line_width,
-        npoints = 200
+        npoints = 200,
+        outside = FALSE
       )
     })
   }

R/plot_lineplot.R

@@ -163,7 +163,7 @@ plot_lineplot <- function(plot_dat,
     widths_setting <- 1 / plot_settings$n_cols
   }
 
-  # The wholeGroup plot gets a box drawn around it.
+  ## The wholeGroup plot gets a box drawn around it.
   for (plot_names in names(plot_list)) {
     if (plot_names %in% seperate_plot_var_box) {
       plot_list[[plot_names]] <- plot_list[[plot_names]] +
@@ -223,19 +223,20 @@ filter_plot_years <- function(plot_dat, years_lines = NULL, years_braces = NULL,
 }
 
 
-plot_title <- function(title, title_raised_letter) {
-  if (!is.null(title_raised_letter)) {
-    names(title_raised_letter) <- sapply(names(title_raised_letter), sub_dash)
-    pos <- which(title == names(title_raised_letter))
+plot_title <- function(title, title_superscript) {
+  if (!is.null(title_superscript)) {
+    names(title_superscript) <- sapply(names(title_superscript), sub_dash)
+    pos <- which(title == names(title_superscript))
     if (length(pos) == 0) {
       ggplot2::labs(title = title)
     } else {
-      superscript <- title_raised_letter[[pos]]
+      superscript <- title_superscript[[pos]]
       ggplot2::labs(title = bquote(.(title)^.(superscript)))
     }
   } else {
     ggplot2::labs(title = title)
   }
+
 }
 
 

R/plot_tablebar.R

@@ -197,7 +197,7 @@ plot_tablebar <- function(dat,
   dat$y_axis <- rev(as.integer(dat$y_axis))
   dat$background_colour <- plot_settings$background_stripes_colour
 
-  if(length(plot_settings$bar_nudge_y) != 1 & length(plot_settings$bar_nudge_y) != nrow(dat)){
+  if (length(plot_settings$bar_nudge_y) != 1 & length(plot_settings$bar_nudge_y) != nrow(dat)) {
     stop(paste0("Your plot_settings$bar_nudge_y argument has either to have the length 1, or has to be as long as your data. Currently, it has the length: ", length(plot_settings$bar_nudge_y), ". Your data has: ", nrow(dat), " rows."), call. = FALSE)
   }
 
@@ -302,7 +302,6 @@ plot_tablebar <- function(dat,
       )
     }
 
-
   if (!is.null(bar_est)) {
     if (is.null(bar_sig)) {
       res_plot <- res_plot +
@@ -330,10 +329,10 @@ plot_tablebar <- function(dat,
         dat <- fill_na(dat, column_name = i, filling = "FALSE")
       }
 
-
       res_plot <- res_plot +
         ggnewscale::new_scale_fill() +
-        ggnewscale::new_scale_colour() +
+        ggpattern::scale_pattern_manual(values = plot_settings$bar_pattern_type) +
+        ggplot2::scale_fill_manual(values = plot_settings$bar_fill_colour) +
         ggpattern::geom_rect_pattern(
           data = dat,
           ggplot2::aes(
@@ -353,12 +352,6 @@ plot_tablebar <- function(dat,
           pattern_spacing = plot_settings$bar_pattern_spacing,
           pattern_key_scale_factor = 0.6 # legend adjustment
         ) +
-        ggpattern::scale_pattern_manual(values = plot_settings$bar_pattern_type) +
-        ggplot2::scale_colour_manual(values = plot_settings$bar_fill_colour) +
-        ggplot2::scale_fill_manual(values = plot_settings$bar_fill_colour) +
-        ggpattern::scale_pattern_manual(values = plot_settings$bar_pattern_type) +
-        ggplot2::scale_colour_manual(values = plot_settings$bar_fill_colour) +
-        ggplot2::scale_fill_manual(values = plot_settings$bar_fill_colour) +
         NULL
     } else if (plot_settings$bar_sig_type == "frame") {
       res_plot <- res_plot +
@@ -384,7 +377,6 @@ plot_tablebar <- function(dat,
     }
   }
 
-
   # Column spanners ---------------------------------------------------------
   plot_settings <- check_spanners_requirements(column_spanners, column_spanners_2, plot_settings)
 
@@ -496,7 +488,6 @@ build_background_stripes <- function(dat,
                                      columns_table,
                                      plot_borders,
                                      plot_settings = plotsettings_tablebarplot()) {
-
   scale_breaks <- set_scale_breaks(plot_borders)
 
   if (plot_settings$background_stripes_border == "Inf") {
@@ -723,14 +714,14 @@ plot_capped_x_axis <- function(scale_breaks) {
       yend = 0.4,
       linewidth = 0.1
     )
-  }else{
+  } else {
     ## Plot something invisible, so the y axis is the same over all plots:
     ggplot2::annotate("segment",
-                      x = 0,
-                      xend = 0,
-                      y = 0.4,
-                      yend = 0.4,
-                      linewidth = 0.00000001
+      x = 0,
+      xend = 0,
+      y = 0.4,
+      yend = 0.4,
+      linewidth = 0.00000001
     )
   }
 }

R/themes.R

@@ -87,6 +87,10 @@ theme_line <- function(plot_settings = plotsettings_lineplot()) {
       text = ggplot2::element_text(colour = "#000000"),
       panel.spacing = ggplot2::unit(plot_settings$split_plot_gap_width, "npc"), # Gap in split plot
       plot.margin = ggplot2::unit(c(0, 0, 0.25, 0), units = "npc"),
-      plot.title = ggplot2::element_text(size = 7, hjust = 0.5, vjust = 2.5)
+      plot.title = ggplot2::element_text(size = 7,
+                                         hjust = 0.5,
+                                         vjust = 0,
+                                         margin = ggplot2::margin(-3.5, 0, 3.5, 0)
+                                         )
     )
 }

R/utils.R

@@ -93,7 +93,7 @@ consecutive_numbers <- function(vec) {
 #' @keywords internal
 #' @noRd
 #'
-#' @param vec Character vector, usually the group-column in a data.frame returned by [eatRep::report()].
+#' @param vec Character vector, usually the group-column in a data.frame returned by `eatRep::report()`.
 #' @param groups Character vector of groups that should be extracted from vec.
 #'
 #' @return Returns the first group found in vec.