fixed merge issue about default colours

Author: chrismainey

R/funnel_plot.R

@@ -48,7 +48,7 @@
 #' Default has been chosen to avoid red and green which can lead to subconscious value judgements of good or bad.
 #' Default is hex colours: c("#FF7F0EFF", "#FF7F0EFF", "#1F77B4FF","#1F77B4FF", "#9467BDFF", "#9467BDFF", "#2CA02CFF", "#2CA02CFF")
 #' @param SHMI_rounding TRUE/FALSE, for SHMI calculation (standardised ratio, with SHMI truncation etc.), should you round the expected values to 2 decimal places (TRUE) or not (FALSE)
-#' @param max.overlaps 	Exclude text labels that overlap too many things. Defaults to 10. (inheritted from geom_label_repel)
+#' @param max.overlaps 	Exclude text labels that overlap too many things. Defaults to 10. (inherited from geom_label_repel)
 #'
 #' @return A fitted `funnelplot` object.  A `funnelplot` object is a list containing the following components:\cr
 #' \item{print}{Prints the number of points, outliers and whether the plot has been adjusted, and prints the plot}
@@ -122,8 +122,8 @@ funnel_plot <- function(.data, numerator, denominator, group
                         , multiplier = 1, x_label = "Expected"
                         , y_label , x_range = "auto", y_range = "auto"
                         , plot_cols =
-                          c("#FF7F0EFF", "#1F77B4FF"
-                            , "#9467BDFF", "#2CA02CFF")
+                          c("#FF7F0EFF", "#FF7F0EFF", "#1F77B4FF","#1F77B4FF",
+                            "#9467BDFF", "#9467BDFF", "#2CA02CFF", "#2CA02CFF")
                         , theme = funnel_clean()
                         , label_outliers, Poisson_limits, OD_adjust
                         , xrange, yrange
@@ -194,7 +194,7 @@ funnel_plot <- function(.data, numerator, denominator, group
 
 
   if(length(plot_cols) < 8){
-    stop("Please supply a vector of 4 colours for funnel limits, in order: 95% Lower Poisson, 95% Upper Poisson
+    stop("Please supply a vector of 8 colours for funnel limits, in order: 95% Lower Poisson, 95% Upper Poisson
          , 99.8% Lower Poisson, 99.8% Upper Poisson, 95% Upper OD-adjusted, 95% Lower OD-adjusted,
          99.8% Lower OD-adjusted, 99.8% Upper OD-adjusted, even if you are only using one set of limits.")
   }