mirror of
https://github.com/msberends/AMR.git
synced 2026-11-16 03:40:48 +01:00
(v3.0.1.9137) Add the guideline argument to count_df(), proportion_df(), sir_df(), ggplot_sir(), geom_sir(), and labels_sir_count(), so that with CLSI the 'I' category is merged with R, and describe in the documentation of get_AMR_locale() that LANG takes precedence over LANGUAGE
This commit is contained in:
1 parent
46f5de1d36
commit
dbd95ffa46
17 files changed
+118
-40
No files matched your search
+6
-2
@@ -174,6 +174,7 @@ ggplot_sir <- function(data,
|
||||
combine_SI = TRUE,
|
||||
minimum = 30,
|
||||
language = get_AMR_locale(),
|
||||
guideline = getOption("AMR_guideline", "EUCAST"),
|
||||
nrow = NULL,
|
||||
colours = c(
|
||||
S = "#3CAEA3",
|
||||
@@ -242,7 +243,7 @@ ggplot_sir <- function(data,
|
||||
geom_sir(
|
||||
position = position, x = x, fill = fill, translate_ab = translate_ab,
|
||||
minimum = minimum, language = language,
|
||||
combine_SI = combine_SI, ...
|
||||
combine_SI = combine_SI, guideline = guideline, ...
|
||||
) +
|
||||
theme_sir()
|
||||
|
||||
@@ -263,6 +264,7 @@ ggplot_sir <- function(data,
|
||||
minimum = minimum,
|
||||
language = language,
|
||||
combine_SI = combine_SI,
|
||||
guideline = guideline,
|
||||
datalabels.size = datalabels.size,
|
||||
datalabels.colour = datalabels.colour
|
||||
)
|
||||
@@ -292,6 +294,7 @@ geom_sir <- function(position = NULL,
|
||||
minimum = 30,
|
||||
language = get_AMR_locale(),
|
||||
combine_SI = TRUE,
|
||||
guideline = getOption("AMR_guideline", "EUCAST"),
|
||||
...) {
|
||||
x <- x[1]
|
||||
stop_ifnot_installed("ggplot2")
|
||||
@@ -334,7 +337,8 @@ geom_sir <- function(position = NULL,
|
||||
translate_ab = translate_ab,
|
||||
language = language,
|
||||
minimum = minimum,
|
||||
combine_SI = combine_SI
|
||||
combine_SI = combine_SI,
|
||||
guideline = guideline
|
||||
)
|
||||
},
|
||||
mapping = utils::modifyList(ggplot2::aes(), list(x = str2lang(x), y = str2lang(y), fill = str2lang(fill))),
|
||||
|
||||
Reference in new issue
Block a user