parts of #7 #8

R/color_repel.R

@@ -10,6 +10,7 @@
 #' @param seed sampling randomization seed
 #' @param col colour or fill in ggplot
 #' @param autoswitch try to switch between colour and fill automatically
+#' @param layer layer to detect color, defaults to first
 #' @param out_orig output the original colors as named vector
 #' @param out_worst output the worst combination instead of best
 #' @examples
@@ -30,14 +31,15 @@ color_repel <- function(g,
                         seed = 34,
                         col = "colour",
                         autoswitch = TRUE,
+                        layer = 1,
                         out_orig = FALSE,
                         out_worst = FALSE) {
   g <- check_patchwork(g)
 
   if (verbose) {
     message("extract original colors...")
   }
-  temp <- check_colour_mapping(g, col = col, return_col = TRUE, autoswitch = autoswitch)
+  temp <- check_colour_mapping(g, col = col, return_col = TRUE, autoswitch = autoswitch, layer = layer)
   col <- temp[["col"]]
   cols <- temp[["cols"]]
   g2 <- ggplot2::ggplot_build(g)
@@ -76,10 +78,10 @@ color_repel <- function(g,
   if (verbose) {
     message("extract plot distances...")
   }
-  if (all(c("x", "y") %in% colnames(g2$data[[1]]))) {
+  if (all(c("x", "y") %in% colnames(g2$data[[layer]]))) {
     em <- dplyr::select(g2$data[[1]], x, y)
     # clustering info
-    clust <- as.character(g2$data[[1]][[col]])
+    clust <- as.character(g2$data[[layer]][[col]])
     clust <- as.character(as.numeric(factor(clust, levels = orig_cols)))
     if (downsample == "chull") {
       res <- by_cluster_chull(em, clust, xcol = "x", ycol = "y")

R/utils.R

@@ -333,9 +333,9 @@ get_labs <- function(g) {
   }
 }
 
-check_colour_mapping <- function(g, col = "colour", return_col = FALSE, autoswitch = TRUE) {
+check_colour_mapping <- function(g, col = "colour", return_col = FALSE, autoswitch = TRUE, layer = 1) {
   g2 <- ggplot2::ggplot_build(g)
-  cols <- dplyr::arrange(g2$data[[1]], group)
+  cols <- dplyr::arrange(g2$data[[layer]], group)
   cols <- unique(cols[[col]])
   if (length(cols) <= 1) {
     if (!autoswitch) {
@@ -346,7 +346,7 @@ check_colour_mapping <- function(g, col = "colour", return_col = FALSE, autoswit
     } else {
       col <- "fill"
     }
-    cols <- dplyr::arrange(g2$data[[1]], group)
+    cols <- dplyr::arrange(g2$data[[layer]], group)
     cols <- unique(cols[[col]])
   }
   if (return_col) {

R/wrappers.R

@@ -8,6 +8,7 @@
 #' @param nsamp how many random sampling color combinations to test, default 50000
 #' @param seed sampling randomization seed
 #' @param autoswitch try to switch between colour and fill automatically
+#' @param layer layer to detect color, defaults to first
 #' @param out_orig output the original colors as named vector
 #' @param out_worst output the worst combination instead of best
 #' @param repel_label whether to add centroid labels with ggrepel
@@ -33,6 +34,7 @@ gg_color_repel <- function(g = ggplot2::last_plot(),
                            nsamp = 50000,
                            seed = 34,
                            autoswitch = TRUE,
+                           layer = 1,
                            out_orig = FALSE,
                            out_worst = FALSE,
                            repel_label = FALSE,
@@ -48,13 +50,13 @@ gg_color_repel <- function(g = ggplot2::last_plot(),
     downsample = downsample,
     nsamp = nsamp, seed = seed,
     sim = sim, severity = severity,
-    autoswitch = autoswitch,
+    autoswitch = autoswitch, layer = layer,
     out_orig = out_orig,
     out_worst = out_worst
   )
 
   if (autoswitch) {
-    col <- check_colour_mapping(g, col = col, autoswitch = autoswitch)
+    col <- check_colour_mapping(g, col = col, autoswitch = autoswitch, layer = layer)
   }
   .f <- paste0("ggplot2:::scale_", col, "_manual")