Merge pull request #182 from spsanderson/development

Fixes #181

NAMESPACE

@@ -5,8 +5,11 @@ export(":=")
 export(.data)
 export(as_label)
 export(as_name)
+export(color_blind)
 export(enquo)
 export(enquos)
+export(td_scale_color_colorblind)
+export(td_scale_fill_colorblind)
 export(tidy_autoplot)
 export(tidy_beta)
 export(tidy_binomial)

NEWS.md

@@ -4,7 +4,8 @@
 None
 
 ## New Features
-None
+1. Fix #181 - Add functions `color_blind()` `td_scale_fill_colorblind()` and 
+`td_scale_color_colorblind()`
 
 ## Minor Fixes and Improvements
 1. Fix #176 - Update `_autoplot` functions to include cumulative mean MCMC chart

R/autoplot-combined-dist.R

@@ -253,7 +253,7 @@ tidy_combined_autoplot <- function(.data, .plot_type = "density", .line_size = .
                 linetype = "dashed"
             ) +
             ggplot2::ylim(0, max_dy)
-    } else {
+    } else if (.geom_smooth & plot_type == "mcmc") {
         plt <- plt +
             ggplot2::geom_smooth(
                 ggplot2::aes(

R/autoplot-density.R

@@ -9,6 +9,7 @@
 #' -  `quantile`
 #' -  `probability`
 #' -  `qq`
+#' -  `mcmc`
 #'
 #' @description This is an auto plotting function that will take in a `tidy_`
 #' distribution function and a few arguments, one being the plot type, which is
@@ -17,6 +18,7 @@
 #' -  `quantile`
 #' -  `probablity`
 #' -  `qq`
+#' -  `mcmc`
 #'
 #' If the number of simulations exceeds 9 then the legend will not print. The plot
 #' subtitle is put together by the attributes of the table passed to the function.
@@ -325,7 +327,7 @@ tidy_autoplot <- function(.data, .plot_type = "density", .line_size = .5,
                 linetype = "dashed"
             ) +
             ggplot2::ylim(0, max_dy)
-    } else {
+    } else if (.geom_smooth & plot_type == "mcmc") {
         plt <- plt +
             ggplot2::geom_smooth(
                 ggplot2::aes(

R/autoplot-multi-dist.R

@@ -336,7 +336,7 @@ tidy_multi_dist_autoplot <- function(.data, .plot_type = "density", .line_size =
                 linetype = "dashed"
             ) +
             ggplot2::ylim(0, max_dy)
-    } else {
+    } else if (.geom_smooth & plot_type == "mcmc") {
         plt <- plt +
             ggplot2::geom_smooth(
                 ggplot2::aes(

R/palette-color-blind.R

@@ -0,0 +1,32 @@
+#' Provide Colorblind Compliant Colors
+#'
+#' 8 Hex RGB color definitions suitable for charts for colorblind people.
+#'
+#' @export
+color_blind <- function(){
+    c("#000000", "#E69F00", "#56B4E9",
+      "#009E73", "#F0E442", "#0072B2",
+      "#D55E00", "#CC79A7")
+}
+
+#' Provide Colorblind Compliant Colors
+#' @export
+td_scale_fill_colorblind <- function(..., theme = "td") {
+
+    pal <- switch(theme,
+                  "td" = unname(color_blind()) %>% rep(100)
+    )
+
+    ggplot2::scale_fill_manual(values = pal)
+}
+
+#' Provide Colorblind Compliant Colors
+#' @export
+td_scale_color_colorblind = function(..., theme = "td") {
+
+    pal <- switch(theme,
+                  "td" = unname(color_blind()) %>% rep(100)
+    )
+
+    ggplot2::scale_color_manual(values = pal)
+}