diff --git a/DESCRIPTION b/DESCRIPTION index 0ff01f82b..97b3b2c3e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 3.0.0.9014 -Date: 2025-07-18 +Version: 3.0.0.9015 +Date: 2025-07-19 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) data analysis and to work with microbial and antimicrobial properties by diff --git a/NEWS.md b/NEWS.md index 2c8a3c6ad..28726c0d2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 3.0.0.9014 +# AMR 3.0.0.9015 This is primarily a bugfix release, though we added one nice feature too. diff --git a/R/ggplot_sir.R b/R/ggplot_sir.R index fc3b64082..f9c89fc96 100755 --- a/R/ggplot_sir.R +++ b/R/ggplot_sir.R @@ -177,8 +177,8 @@ ggplot_sir <- function(data, nrow = NULL, colours = c( S = "#3CAEA3", - SI = "#3CAEA3", SDD = "#8FD6C4", + SI = "#3CAEA3", I = "#F6D55C", IR = "#ED553B", R = "#ED553B" diff --git a/R/plotting.R b/R/plotting.R index 728449e42..faac2445d 100755 --- a/R/plotting.R +++ b/R/plotting.R @@ -1490,7 +1490,7 @@ labels_sir_count <- function(position = NULL, } expand_SIR_colours <- function(colours_SIR, unname = TRUE) { - sir_order <- c("S", "SDD", "I", "R") + sir_order <- c("S", "SDD", "SI", "I", "IR", "R") if (is.null(names(colours_SIR))) { if (length(colours_SIR) == 1) { diff --git a/man/ggplot_sir.Rd b/man/ggplot_sir.Rd index db0ead4dc..5c8dddb2f 100644 --- a/man/ggplot_sir.Rd +++ b/man/ggplot_sir.Rd @@ -9,7 +9,7 @@ ggplot_sir(data, position = NULL, x = "antibiotic", fill = "interpretation", facet = NULL, breaks = seq(0, 1, 0.1), limits = NULL, translate_ab = "name", combine_SI = TRUE, minimum = 30, language = get_AMR_locale(), nrow = NULL, colours = c(S - = "#3CAEA3", SI = "#3CAEA3", SDD = "#8FD6C4", I = "#F6D55C", IR = "#ED553B", + = "#3CAEA3", SDD = "#8FD6C4", SI = "#3CAEA3", I = "#F6D55C", IR = "#ED553B", R = "#ED553B"), datalabels = TRUE, datalabels.size = 2.5, datalabels.colour = "grey15", title = NULL, subtitle = NULL, caption = NULL, x.title = "Antimicrobial", y.title = "Proportion", ...)