From fd33a8cdbfb648caa94ae1282a8548fa1d73a2d3 Mon Sep 17 00:00:00 2001 From: leolrl Date: Fri, 21 Mar 2025 13:20:40 +0000 Subject: [PATCH 1/4] Echelle histo --- R/ggscatterstats.R | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/R/ggscatterstats.R b/R/ggscatterstats.R index 2b158479b..284246d1b 100644 --- a/R/ggscatterstats.R +++ b/R/ggscatterstats.R @@ -96,6 +96,8 @@ ggscatterstats <- function( smooth.line.args = list(linewidth = 1.5, color = "blue", method = "lm", formula = y ~ x), xsidehistogram.args = list(fill = "#009E73", color = "black", na.rm = TRUE), ysidehistogram.args = list(fill = "#D55E00", color = "black", na.rm = TRUE), + xsidehistogram.scale = NULL, + ysidehistogram.scale = NULL, xlab = NULL, ylab = NULL, title = NULL, @@ -178,15 +180,20 @@ ggscatterstats <- function( # marginal --------------------------------------------- - if (isTRUE(marginal)) { + if (isTRUE(marginal)){ plot_scatter <- plot_scatter + exec(ggside::geom_xsidehistogram, mapping = aes(y = after_stat(count)), !!!xsidehistogram.args) + - exec(ggside::geom_ysidehistogram, mapping = aes(x = after_stat(count)), !!!ysidehistogram.args) + - ggside::scale_ysidex_continuous() + - ggside::scale_xsidey_continuous() + exec(ggside::geom_ysidehistogram, mapping = aes(x = after_stat(count)), !!!ysidehistogram.args) + + # Apply scaling if specified + if (!is.null(xsidehistogram.scale)) { + plot_scatter <- plot_scatter + ggside::scale_xsidey_continuous(limits = xsidehistogram.scale) + } + if (!is.null(ysidehistogram.scale)) { + plot_scatter <- plot_scatter + ggside::scale_ysidex_continuous(limits = ysidehistogram.scale) + } + plot_scatter } - - plot_scatter } @@ -257,8 +264,8 @@ grouped_ggscatterstats <- function( grouping.var, plotgrid.args = list(), annotation.args = list() -) { +){ .grouped_list(data, {{ grouping.var }}) %>% purrr::pmap(.f = ggscatterstats, ...) %>% combine_plots(plotgrid.args, annotation.args) -} + } From 53b280316b80a2c537e8e7ec04cdd5746ebdf5d5 Mon Sep 17 00:00:00 2001 From: maryemguizani Date: Tue, 25 Mar 2025 23:46:27 +0000 Subject: [PATCH 2/4] maryem --- R/ggscatterstats.R | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/R/ggscatterstats.R b/R/ggscatterstats.R index 2b158479b..70410851d 100644 --- a/R/ggscatterstats.R +++ b/R/ggscatterstats.R @@ -79,6 +79,7 @@ ggscatterstats <- function( data, x, y, + axis_text_size = 10, type = "parametric", conf.level = 0.95, bf.prior = 0.707, @@ -185,6 +186,13 @@ ggscatterstats <- function( ggside::scale_ysidex_continuous() + ggside::scale_xsidey_continuous() } + plot_scatter <- plot_scatter + + theme( + axis.text.x = element_text(size = axis_text_size), + axis.text.y = element_text(size = axis_text_size), + ggside.axis.text.x = element_text(size = axis_text_size), + ggside.axis.text.y = element_text(size = axis_text_size) + ) plot_scatter } From 6dfcc228a7a453d6ddca66c5e9d75307f59b83fd Mon Sep 17 00:00:00 2001 From: maryemguizani Date: Tue, 25 Mar 2025 23:57:56 +0000 Subject: [PATCH 3/4] maryem --- R/ggscatterstats.R | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/R/ggscatterstats.R b/R/ggscatterstats.R index 70410851d..d31e8320f 100644 --- a/R/ggscatterstats.R +++ b/R/ggscatterstats.R @@ -79,7 +79,7 @@ ggscatterstats <- function( data, x, y, - axis_text_size = 10, + marginal_axis_text_size = 10, type = "parametric", conf.level = 0.95, bf.prior = 0.707, @@ -188,10 +188,8 @@ ggscatterstats <- function( } plot_scatter <- plot_scatter + theme( - axis.text.x = element_text(size = axis_text_size), - axis.text.y = element_text(size = axis_text_size), - ggside.axis.text.x = element_text(size = axis_text_size), - ggside.axis.text.y = element_text(size = axis_text_size) + ggside.axis.text.x = element_text(size = marginal_axis_text_size), + ggside.axis.text.y = element_text(size = marginal_axis_text_size) ) plot_scatter From eb87cd2651010a8cebf8dc18ec26b726e6b0c97f Mon Sep 17 00:00:00 2001 From: leolrl Date: Fri, 28 Mar 2025 15:16:37 +0000 Subject: [PATCH 4/4] merge propre --- R/ggscatterstats.R | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/R/ggscatterstats.R b/R/ggscatterstats.R index 1b86e8e3d..13b222cf3 100644 --- a/R/ggscatterstats.R +++ b/R/ggscatterstats.R @@ -185,7 +185,7 @@ ggscatterstats <- function( plot_scatter <- plot_scatter + exec(ggside::geom_xsidehistogram, mapping = aes(y = after_stat(count)), !!!xsidehistogram.args) + exec(ggside::geom_ysidehistogram, mapping = aes(x = after_stat(count)), !!!ysidehistogram.args) - + # Apply scaling if specified if (!is.null(xsidehistogram.scale)) { plot_scatter <- plot_scatter + ggside::scale_xsidey_continuous(limits = xsidehistogram.scale) @@ -193,9 +193,8 @@ ggscatterstats <- function( if (!is.null(ysidehistogram.scale)) { plot_scatter <- plot_scatter + ggside::scale_ysidex_continuous(limits = ysidehistogram.scale) } - plot_scatter } -<<<<<<< HEAD + plot_scatter <- plot_scatter + theme( ggside.axis.text.x = element_text(size = marginal_axis_text_size), @@ -203,8 +202,7 @@ ggscatterstats <- function( ) plot_scatter -======= ->>>>>>> leo + }