From a13dc5e5fefc9cbbd1418ce7398cae1e031030c6 Mon Sep 17 00:00:00 2001 From: gnoblet Date: Sat, 14 May 2022 10:31:40 -0400 Subject: [PATCH] Add `scale_fill()` that was misnamed --- DESCRIPTION | 2 +- NEWS.md | 9 +- R/scale.R | 2 +- docs/404.html | 2 +- docs/LICENSE.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 11 ++- docs/pkgdown.yml | 2 +- docs/reference/abort_bad_argument.html | 2 +- docs/reference/buffer_bbox.html | 2 +- docs/reference/cols_agora.html | 2 +- docs/reference/cols_reach.html | 2 +- docs/reference/hbar.html | 2 +- docs/reference/hbar_percent.html | 2 +- docs/reference/if_not_in_stop.html | 2 +- docs/reference/if_vec_not_in_stop.html | 2 +- docs/reference/index.html | 9 +- docs/reference/pal_agora.html | 2 +- docs/reference/pal_reach.html | 2 +- docs/reference/scale_color.html | 20 +---- docs/reference/scale_fill.html | 101 ++++++++++++++++++++++ docs/reference/subvec_not_in.html | 2 +- docs/reference/theme_reach.html | 2 +- docs/reference/theme_reach_borders.html | 2 +- docs/reference/theme_reach_flip_hist.html | 2 +- docs/reference/theme_reach_hist.html | 2 +- docs/search.json | 1 - docs/sitemap.xml | 3 + man/scale_color.Rd | 14 +-- man/scale_fill.Rd | 32 +++++++ 31 files changed, 186 insertions(+), 58 deletions(-) create mode 100644 docs/reference/scale_fill.html delete mode 100644 docs/search.json create mode 100644 man/scale_fill.Rd diff --git a/DESCRIPTION b/DESCRIPTION index fc68d1f..3b2658b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: visualizeR Type: Package Title: What a color! What a viz! -Version: 0.1.1.9000 +Version: 0.1.2.9000 Authors@R: c( person( 'Noblet', 'Guillaume', diff --git a/NEWS.md b/NEWS.md index 5fb51b7..e619fc5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,10 +1,17 @@ +# visualizeR 0.1.2.9000 + +* There was a duplicate `scale_color()` function, which should have been and is now `scale_fill()'` + +--- + # visualizeR 0.1.1.9000 * Added two horizontal bar functions: `hbar()`, `hbar_percent()` (#3) * Added some internals to check for missing columns and bad arguments (#3) * Modified some `theme_reach()` documentation -* Add `bbox_buffer()` function to produce a buffered bbox, e.g. for use with `tmap` +* Add `buffer_bbox()` function to produce a buffered bbox, e.g. for use with `tmap` +--- # visualizeR 0.1.0 diff --git a/R/scale.R b/R/scale.R index ae7671b..9108eb4 100644 --- a/R/scale.R +++ b/R/scale.R @@ -49,7 +49,7 @@ scale_color <- function(initiative = "reach", palette = "main", discrete = TRUE #' @return A fill scale for ggplot #' #' @export -scale_color <- function(initiative = "reach", palette = "main", discrete = TRUE, reverse = FALSE, ...) { +scale_fill <- function(initiative = "reach", palette = "main", discrete = TRUE, reverse = FALSE, ...) { if (initiative == "reach") { pal <- pal_reach( diff --git a/docs/404.html b/docs/404.html index 97a5642..f39a066 100644 --- a/docs/404.html +++ b/docs/404.html @@ -31,7 +31,7 @@ visualizeR - 0.1.1.9000 + 0.1.2.9000 + + + + + +
+
+
+ +
+

Fill scale constructor for REACH or AGORA colors

+
+ +
+

Usage

+
scale_fill(
+  initiative = "reach",
+  palette = "main",
+  discrete = TRUE,
+  reverse = FALSE,
+  ...
+)
+
+ +
+

Arguments

+
initiative
+

Either "reach" or "agora

+
palette
+

Character name of palette in drsimonj_palettes

+
discrete
+

Boolean indicating whether color aesthetic is discrete or not

+
reverse
+

Boolean indicating whether the palette should be reversed

+
...
+

Additional arguments passed to discrete_scale() or +scale_fill_gradientn(), used respectively when discrete is TRUE or FALSE

+
+
+

Value

+

A fill scale for ggplot

+
+ +
+ + +
+ + + +
+ + + + + + + diff --git a/docs/reference/subvec_not_in.html b/docs/reference/subvec_not_in.html index 8ddf218..939c64f 100644 --- a/docs/reference/subvec_not_in.html +++ b/docs/reference/subvec_not_in.html @@ -10,7 +10,7 @@ visualizeR - 0.1.1.9000 + 0.1.2.9000