diff --git a/DESCRIPTION b/DESCRIPTION index 092e6137..be622e8d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: tourr Title: Tour Methods for Multivariate Data Visualisation -Version: 0.6.17 +Version: 0.6.18 Authors@R: c( person("Hadley", "Wickham", email = "h.wickham@gmail.com", role = c("aut", "ctb"), comment = c(ORCID = "0000-0003-4757-117X")), person("Dianne", "Cook", email = "dicook@monash.edu", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-3813-7155")), diff --git a/NEWS.md b/NEWS.md index 934fd4d2..9cfccb72 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# tourr 0.6.18 + +* Changed line colours to take a factor, and be handled the same as points. + # tourr 0.6.17 * Fixed sizing issue in display_trails diff --git a/R/display-andrews.r b/R/display-andrews.r index 7ac32bef..ca7ed9d1 100644 --- a/R/display-andrews.r +++ b/R/display-andrews.r @@ -53,7 +53,11 @@ display_andrews <- function(col = "black", ...) { grid <<- seq(-pi, pi, length = 50) } - if (!areColors(col)) col <- mapColors(col) + # If colors are a variable, convert to colors + if (is.factor(col) | !areColors(col)) { + gps <- col + col <- mapColors(col, palette) + } render_frame <- function() { blank_plot(xlim = c(-pi, pi), ylim = c(-1, 1)) diff --git a/R/display-groupxy.r b/R/display-groupxy.r index a2e8b678..9e35a92f 100644 --- a/R/display-groupxy.r +++ b/R/display-groupxy.r @@ -39,6 +39,10 @@ display_groupxy <- function(centr = TRUE, axes = "center", half_range = NULL, gps <- col col <- mapColors(col, palette) } + if (is.factor(edges.col) | !areColors(edges.col)) { + edges.gps <- edges.col + edges.col <- mapColors(edges.col, palette) + } init <- function(data) { half_range <<- compute_half_range(half_range, data, centr) diff --git a/R/display-slice.r b/R/display-slice.r index 1a5d5074..761ac7b3 100644 --- a/R/display-slice.r +++ b/R/display-slice.r @@ -60,6 +60,10 @@ display_slice <- function(center = TRUE, axes = "center", half_range = NULL, gps <- col col <- mapColors(col, palette) } + if (is.factor(edges.col) | !areColors(edges.col)) { + edges.gps <- edges.col + edges.col <- mapColors(edges.col, palette) + } init <- function(data) { half_range <<- compute_half_range(half_range, data, center) diff --git a/R/display-xy.r b/R/display-xy.r index 0518b2c2..95d83843 100644 --- a/R/display-xy.r +++ b/R/display-xy.r @@ -69,6 +69,10 @@ display_xy <- function(center = TRUE, axes = "center", half_range = NULL, gps <- col col <- mapColors(col, palette) } + if (is.factor(edges.col) | !areColors(edges.col)) { + edges.gps <- edges.col + edges.col <- mapColors(edges.col, palette) + } # If shapes are a variable, convert shapes if (is.factor(pch)) { shapes <- mapShapes(pch) diff --git a/docs/404.html b/docs/404.html index 0f464896..6d155044 100644 --- a/docs/404.html +++ b/docs/404.html @@ -39,7 +39,7 @@
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 7c25f8ed..1d280271 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -17,7 +17,7 @@ diff --git a/docs/articles/edges.html b/docs/articles/edges.html index f0066e30..82b77932 100644 --- a/docs/articles/edges.html +++ b/docs/articles/edges.html @@ -40,7 +40,7 @@ diff --git a/docs/articles/edges_files/figure-html/unnamed-chunk-2-1.png b/docs/articles/edges_files/figure-html/unnamed-chunk-2-1.png index f714aaf6..cb294c79 100644 Binary files a/docs/articles/edges_files/figure-html/unnamed-chunk-2-1.png and b/docs/articles/edges_files/figure-html/unnamed-chunk-2-1.png differ diff --git a/docs/articles/edges_files/figure-html/unnamed-chunk-3-1.png b/docs/articles/edges_files/figure-html/unnamed-chunk-3-1.png index 4c2b7cdb..776701a6 100644 Binary files a/docs/articles/edges_files/figure-html/unnamed-chunk-3-1.png and b/docs/articles/edges_files/figure-html/unnamed-chunk-3-1.png differ diff --git a/docs/articles/edges_files/figure-html/unnamed-chunk-4-1.png b/docs/articles/edges_files/figure-html/unnamed-chunk-4-1.png index 0204c67c..6f1d61e5 100644 Binary files a/docs/articles/edges_files/figure-html/unnamed-chunk-4-1.png and b/docs/articles/edges_files/figure-html/unnamed-chunk-4-1.png differ diff --git a/docs/articles/index.html b/docs/articles/index.html index b75d809b..2c83d692 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -17,7 +17,7 @@ diff --git a/docs/articles/tourr.html b/docs/articles/tourr.html index fc89b498..ef0c2195 100644 --- a/docs/articles/tourr.html +++ b/docs/articles/tourr.html @@ -40,7 +40,7 @@ @@ -198,12 +198,12 @@When running the full guided tour for this example, the final view @@ -241,12 +241,12 @@
Alternatively, a colour vector can be created manually and passed @@ -288,12 +288,12 @@
NEWS.md
+