line colours

ggobi · Jun 15, 2023 · 9582836 · 9582836
1 parent c0d88fe
commit 9582836
Show file tree

Hide file tree

Showing 241 changed files with 198 additions and 178 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/edges.html b/docs/articles/edges.html
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
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
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
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/tourr.html b/docs/articles/tourr.html
diff --git a/docs/articles/tourr_files/figure-html/unnamed-chunk-2-1.png b/docs/articles/tourr_files/figure-html/unnamed-chunk-2-1.png
diff --git a/docs/articles/tourr_files/figure-html/unnamed-chunk-3-1.png b/docs/articles/tourr_files/figure-html/unnamed-chunk-3-1.png
diff --git a/docs/articles/tourr_files/figure-html/unnamed-chunk-4-1.png b/docs/articles/tourr_files/figure-html/unnamed-chunk-4-1.png
diff --git a/docs/articles/tourr_files/figure-html/unnamed-chunk-5-1.png b/docs/articles/tourr_files/figure-html/unnamed-chunk-5-1.png
diff --git a/docs/articles/tourr_files/figure-html/unnamed-chunk-6-1.png b/docs/articles/tourr_files/figure-html/unnamed-chunk-6-1.png
diff --git a/docs/articles/tourr_files/figure-html/unnamed-chunk-7-2.png b/docs/articles/tourr_files/figure-html/unnamed-chunk-7-2.png
diff --git a/docs/articles/tourr_files/figure-html/unnamed-chunk-8-2.png b/docs/articles/tourr_files/figure-html/unnamed-chunk-8-2.png
diff --git a/docs/articles/tourr_files/figure-html/unnamed-chunk-9-1.png b/docs/articles/tourr_files/figure-html/unnamed-chunk-9-1.png
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -1,8 +1,8 @@
-pandoc: 2.19.2
+pandoc: 3.1.1
 pkgdown: 2.0.7
 pkgdown_sha: ~
 articles:
  edges: edges.html
  tourr: tourr.html
-last_built: 2023-06-08T07:44Z
+last_built: 2023-06-15T01:44Z
 
diff --git a/docs/reference/Flea-measurements-1.png b/docs/reference/Flea-measurements-1.png
diff --git a/docs/reference/Flea-measurements-2.png b/docs/reference/Flea-measurements-2.png
diff --git a/docs/reference/Flea-measurements.html b/docs/reference/Flea-measurements.html
diff --git a/docs/reference/Laser-measurements-1.png b/docs/reference/Laser-measurements-1.png
diff --git a/docs/reference/Laser-measurements.html b/docs/reference/Laser-measurements.html
diff --git a/docs/reference/Olive-oil-measurements-1.png b/docs/reference/Olive-oil-measurements-1.png
diff --git a/docs/reference/Olive-oil-measurements-2.png b/docs/reference/Olive-oil-measurements-2.png
diff --git a/docs/reference/Olive-oil-measurements.html b/docs/reference/Olive-oil-measurements.html
diff --git a/docs/reference/Ozone-measurements.html b/docs/reference/Ozone-measurements.html
diff --git a/docs/reference/Places-Ratings-1.png b/docs/reference/Places-Ratings-1.png
diff --git a/docs/reference/Places-Ratings.html b/docs/reference/Places-Ratings.html
diff --git a/docs/reference/Rat-CNS-1.png b/docs/reference/Rat-CNS-1.png
diff --git a/docs/reference/Rat-CNS.html b/docs/reference/Rat-CNS.html
diff --git a/docs/reference/Rplot007.png b/docs/reference/Rplot007.png
diff --git a/docs/reference/Rplot008.png b/docs/reference/Rplot008.png
diff --git a/docs/reference/Rplot009.png b/docs/reference/Rplot009.png
diff --git a/docs/reference/Rplot010.png b/docs/reference/Rplot010.png
diff --git a/docs/reference/Rplot011.png b/docs/reference/Rplot011.png
diff --git a/docs/reference/Rplot012.png b/docs/reference/Rplot012.png
diff --git a/docs/reference/Rplot013.png b/docs/reference/Rplot013.png
diff --git a/docs/reference/Rplot014.png b/docs/reference/Rplot014.png
diff --git a/docs/reference/Rplot015.png b/docs/reference/Rplot015.png
diff --git a/docs/reference/Rplot016.png b/docs/reference/Rplot016.png
diff --git a/docs/reference/Rplot017.png b/docs/reference/Rplot017.png
diff --git a/docs/reference/Rplot018.png b/docs/reference/Rplot018.png
diff --git a/docs/reference/Rplot021.png b/docs/reference/Rplot021.png
diff --git a/docs/reference/Rplot024.png b/docs/reference/Rplot024.png
diff --git a/docs/reference/Rplot027.png b/docs/reference/Rplot027.png
diff --git a/docs/reference/Rplot030.png b/docs/reference/Rplot030.png
diff --git a/docs/reference/Rplot031.png b/docs/reference/Rplot031.png
diff --git a/docs/reference/Rplot034.png b/docs/reference/Rplot034.png
diff --git a/docs/reference/Tropical-Atmosphere-Ocean.html b/docs/reference/Tropical-Atmosphere-Ocean.html
diff --git a/docs/reference/anaglyph.html b/docs/reference/anaglyph.html
diff --git a/docs/reference/anchored_orthogonal_distance.html b/docs/reference/anchored_orthogonal_distance.html
diff --git a/docs/reference/andrews-2.png b/docs/reference/andrews-2.png
diff --git a/docs/reference/andrews.html b/docs/reference/andrews.html
diff --git a/docs/reference/angular_breaks.html b/docs/reference/angular_breaks.html
diff --git a/docs/reference/animate-1.png b/docs/reference/animate-1.png
diff --git a/docs/reference/animate-2.png b/docs/reference/animate-2.png
diff --git a/docs/reference/animate-3.png b/docs/reference/animate-3.png
diff --git a/docs/reference/animate-4.png b/docs/reference/animate-4.png
diff --git a/docs/reference/animate.html b/docs/reference/animate.html
diff --git a/docs/reference/areColors.html b/docs/reference/areColors.html
diff --git a/docs/reference/bases_little.html b/docs/reference/bases_little.html
diff --git a/docs/reference/basis_init.html b/docs/reference/basis_init.html
diff --git a/docs/reference/basis_nearby.html b/docs/reference/basis_nearby.html
diff --git a/docs/reference/basis_random.html b/docs/reference/basis_random.html
diff --git a/docs/reference/blank_plot.html b/docs/reference/blank_plot.html
diff --git a/docs/reference/center.html b/docs/reference/center.html
diff --git a/docs/reference/check_freezer_safe.html b/docs/reference/check_freezer_safe.html