Merge pull request #220 from HorridTom/refactor-tidyplot-64-65

Refactor tidyplot 64 65

Author: HorridTom

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: autospc
 Title: Automatically Partitioned SPC Charts
-Version: 0.0.0.9040
+Version: 0.0.0.9041
 Authors@R: c(
     person("Thomas", "Woodcock", , "woodcock.thomas@gmail.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-4735-4856")),
@@ -14,6 +14,7 @@ Imports:
     DiagrammeR,
     dplyr,
     fpCompare,
+    ggnewscale,
     ggplot2,
     lifecycle,
     magrittr,

R/add_annotation_data.R

@@ -128,12 +128,17 @@ add_annotations_to_plot_pp <- function(p,
   if(annotation_arrows) {
 
     p_annotated <- p + ggrepel::geom_text_repel(
+      data = . %>% dplyr::filter(series %in% c("cl"),
+                                 !is.na(annotation_level)),
       ggplot2::aes(x = x,
-                   y = cl,
+                   y = value,
                    label = cl_label),
-      position = ggpp::position_nudge_to(y = df %>%
-                                           dplyr::filter(!is.na(y)) %>%
-                                           dplyr::pull(annotation_level)),
+      position = ggpp::position_nudge_to(
+        y = df %>%
+          dplyr::filter(series %in% c("cl"),
+                        !is.na(value),
+                        !is.na(annotation_level)) %>%
+          dplyr::pull(annotation_level)),
       color = "grey40",
       size = annotation_size,
       fontface = "bold",
@@ -143,7 +148,9 @@ add_annotations_to_plot_pp <- function(p,
       hjust             = 0,
       segment.size      = 0.75,
       segment.curvature = df %>%
-        dplyr::filter(!is.na(y)) %>%
+        dplyr::filter(series %in% c("cl"),
+                      !is.na(value),
+                      !is.na(annotation_level)) %>%
         dplyr::pull(annotation_curvature),
       segment.ncp = 4,
       segment.inflect = FALSE,
@@ -153,12 +160,17 @@ add_annotations_to_plot_pp <- function(p,
       max.overlaps = Inf)
   } else {
     p_annotated <- p + ggrepel::geom_text_repel(
+      data = . %>% dplyr::filter(series %in% c("cl"),
+                                 !is.na(annotation_level)),
       ggplot2::aes(x = x,
-                   y = cl,
+                   y = value,
                    label = cl_label),
-      position = ggpp::position_nudge_to(y = df %>%
-                                           dplyr::filter(!is.na(y)) %>%
-                                           dplyr::pull(annotation_level)),
+      position = ggpp::position_nudge_to(
+        y = df %>%
+          dplyr::filter(series %in% c("cl"),
+                        !is.na(value),
+                        !is.na(annotation_level)) %>%
+          dplyr::pull(annotation_level)),
       color = "grey40",
       size = annotation_size,
       fontface = "bold",
@@ -184,14 +196,17 @@ add_annotations_to_plot_basic <- function(p,
   x_nudge <- x_range/25
 
   p_annotated <- p +
-    ggplot2::geom_text(mapping = ggplot2::aes(x = x,
-                                              y = annotation_level,
-                                              label = cl_label),
-                       nudge_x = x_nudge,
-                       na.rm = TRUE,
-                       color = "grey40",
-                       size = annotation_size,
-                       fontface = "bold")
+    ggplot2::geom_text(
+      data = . %>% dplyr::filter(series %in% c("cl"),
+                                 !is.na(annotation_level)),
+      mapping = ggplot2::aes(x = x,
+                             y = annotation_level,
+                             label = cl_label),
+      nudge_x = x_nudge,
+      na.rm = TRUE,
+      color = "grey40",
+      size = annotation_size,
+      fontface = "bold")
 
   return(p_annotated)
 

R/add_floating_median.R

@@ -0,0 +1,38 @@
+# Add floating median line to the plot p
+add_floating_median <- function(df,
+                                p,
+                                floating_median_n) {
+  
+  p <- p +
+    ggplot2::geom_line(data = df %>%
+                         dplyr::filter(series == "cl"), 
+                       ggplot2::aes(x, median),
+                       linetype = "75551555",
+                       colour = "gray50",
+                       linewidth = 0.5,
+                       show.legend = TRUE,
+                       na.rm = TRUE) +
+    ggplot2::annotate(
+      "text",
+      x = df %>%
+        dplyr::filter(series == "cl") %>%
+        dplyr::filter(dplyr::row_number() ==
+                        nrow(df %>%
+                               dplyr::filter(series == "cl")) -
+                        floating_median_n + 1L) %>%
+        dplyr::pull(x),
+      y = df %>%
+        dplyr::filter(series == "cl") %>%
+        dplyr::filter(dplyr::row_number() ==
+                        nrow(df %>%
+                               dplyr::filter(series == "cl")) -
+                        floating_median_n + 1L) %>%
+        dplyr::pull(median)*0.95,
+      label = "Median",
+      size = 3,
+      colour = "gray50",
+      na.rm = TRUE)
+  
+  return(p)
+  
+}

R/algorithm_helpers.R

@@ -481,39 +481,6 @@ floating_median_column <- function(df,
 }
 
 
-# Add floating median line to the plot p
-add_floating_median <- function(df,
-                                p,
-                                floating_median_n) {
-  
-  p <- p +
-    ggplot2::geom_line(data = df, 
-                       ggplot2::aes(x, median),
-                       linetype = "75551555",
-                       colour = "gray50",
-                       linewidth = 0.5,
-                       show.legend = TRUE,
-                       na.rm = TRUE) +
-    ggplot2::annotate(
-      "text",
-      x = df %>%
-        dplyr::filter(dplyr::row_number() == nrow(df) -
-                        floating_median_n + 1L) %>%
-        dplyr::pull(x),
-      y = df %>%
-        dplyr::filter(dplyr::row_number() == nrow(df) -
-                        floating_median_n + 1L) %>%
-        dplyr::pull(median)*0.95,
-      label = "Median",
-      size = 3,
-      colour = "gray50",
-      na.rm = TRUE)
-  
-  return(p)
-  
-}
-
-
 sign_chr <- function(x) {
   y <- dplyr::case_when(
     x < 0 ~ "01",