diff --git a/DESCRIPTION b/DESCRIPTION index 68c23b41..26b69940 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.4.0.9004 +Version: 1.4.0.9005 Date: 2020-10-21 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index be64d39f..5892ef2a 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.4.0.9004 +# AMR 1.4.0.9005 ## Last updated: 21 October 2020 ### New diff --git a/R/ggplot_rsi.R b/R/ggplot_rsi.R index e56743f0..69240779 100755 --- a/R/ggplot_rsi.R +++ b/R/ggplot_rsi.R @@ -162,7 +162,7 @@ ggplot_rsi <- function(data, R = "#ff6961"), datalabels = TRUE, datalabels.size = 2.5, - datalabels.colour = "gray15", + datalabels.colour = "grey15", title = NULL, subtitle = NULL, caption = NULL, @@ -184,7 +184,7 @@ ggplot_rsi <- function(data, meet_criteria(minimum, allow_class = c("numeric", "integer"), has_length = 1) meet_criteria(language, has_length = 1, is_in = c(LANGUAGES_SUPPORTED, ""), allow_NULL = TRUE, allow_NA = TRUE) meet_criteria(nrow, allow_class = c("numeric", "integer"), has_length = 1, allow_NULL = TRUE) - meet_criteria(colours, allow_class = "character") + meet_criteria(colours, allow_class = c("character", "logical")) meet_criteria(datalabels, allow_class = "logical", has_length = 1) meet_criteria(datalabels.size, allow_class = c("numeric", "integer"), has_length = 1) meet_criteria(datalabels.colour, allow_class = "character", has_length = 1) @@ -226,8 +226,8 @@ ggplot_rsi <- function(data, if (fill == "interpretation") { # set RSI colours if (isFALSE(colours) & missing(datalabels.colour)) { - # set datalabel colour to middle gray - datalabels.colour <- "gray50" + # set datalabel colour to middle grey + datalabels.colour <- "grey50" } p <- p + scale_rsi_colours(colours = colours) } @@ -410,7 +410,7 @@ labels_rsi_count <- function(position = NULL, combine_SI = TRUE, combine_IR = FALSE, datalabels.size = 3, - datalabels.colour = "gray15") { + datalabels.colour = "grey15") { stop_ifnot_installed("ggplot2") meet_criteria(position, allow_class = "character", has_length = 1, is_in = c("fill", "stack", "dodge"), allow_NULL = TRUE) meet_criteria(x, allow_class = "character", has_length = 1) diff --git a/docs/404.html b/docs/404.html index 64004c0a..57b6a614 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.4.0.9004 + 1.4.0.9005 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index ae96a073..8b76c890 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.4.0.9004 + 1.4.0.9005 diff --git a/docs/articles/index.html b/docs/articles/index.html index 8b8e9f36..4d4b703e 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.4.0.9004 + 1.4.0.9005 diff --git a/docs/authors.html b/docs/authors.html index 94befaf0..e097c2b0 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.4.0.9004 + 1.4.0.9005 diff --git a/docs/index.html b/docs/index.html index e56c6ed0..b35154a3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 1.4.0.9004 + 1.4.0.9005 diff --git a/docs/news/index.html b/docs/news/index.html index 70438724..4d673e3b 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.4.0.9004 + 1.4.0.9005 @@ -236,9 +236,9 @@ Source: NEWS.md -
-

-AMR 1.4.0.9004 Unreleased +
+

+AMR 1.4.0.9005 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 3c3e4510..ebcb532f 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -12,7 +12,7 @@ articles: datasets: datasets.html resistance_predict: resistance_predict.html welcome_to_AMR: welcome_to_AMR.html -last_built: 2020-10-21T09:40Z +last_built: 2020-10-21T11:05Z urls: reference: https://msberends.github.io/AMR//reference article: https://msberends.github.io/AMR//articles diff --git a/docs/reference/ggplot_rsi.html b/docs/reference/ggplot_rsi.html index 0c624dac..aa0c0863 100644 --- a/docs/reference/ggplot_rsi.html +++ b/docs/reference/ggplot_rsi.html @@ -82,7 +82,7 @@ AMR (for R) - 1.4.0.9000 + 1.4.0.9005

@@ -260,7 +260,7 @@ "#ff6961"), datalabels = TRUE, datalabels.size = 2.5, - datalabels.colour = "gray15", + datalabels.colour = "grey15", title = NULL, subtitle = NULL, caption = NULL, @@ -301,7 +301,7 @@ combine_SI = TRUE, combine_IR = FALSE, datalabels.size = 3, - datalabels.colour = "gray15" + datalabels.colour = "grey15" )

Arguments

diff --git a/docs/reference/index.html b/docs/reference/index.html index 3f08f24a..ebb2d05b 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.4.0.9004 + 1.4.0.9005
diff --git a/docs/survey.html b/docs/survey.html index 4d2a86b3..66ac513b 100644 --- a/docs/survey.html +++ b/docs/survey.html @@ -81,7 +81,7 @@ AMR (for R) - 1.4.0.9004 + 1.4.0.9005

diff --git a/man/ggplot_rsi.Rd b/man/ggplot_rsi.Rd index 2622b090..3dc9b662 100644 --- a/man/ggplot_rsi.Rd +++ b/man/ggplot_rsi.Rd @@ -28,7 +28,7 @@ ggplot_rsi( "#ff6961"), datalabels = TRUE, datalabels.size = 2.5, - datalabels.colour = "gray15", + datalabels.colour = "grey15", title = NULL, subtitle = NULL, caption = NULL, @@ -69,7 +69,7 @@ labels_rsi_count( combine_SI = TRUE, combine_IR = FALSE, datalabels.size = 3, - datalabels.colour = "gray15" + datalabels.colour = "grey15" ) } \arguments{