point shapes can be specified like colour palettes

NEWS.md

@@ -7,6 +7,7 @@
 * palette can now be a vector of values
 * a new projection pursuit index for finding anomalies relative to 
 a null variance-covariance matrix.
+* point shapes can now be specified like palettes
 
 # tourr 1.1.0 
 

R/display-groupxy.r

@@ -20,6 +20,8 @@
 #' @param edges.col colour of edges to be plotted, Defaults to "black"
 #' @param edges.width line width for edges, default 1
 #' @param palette name of color palette for point colour, used by \code{\link{hcl.colors}}, default "Zissou 1"
+#' @param shapeset numbers corresponding to shapes in base R points, to use for mapping
+#' categorical variable to shapes, default=c(15:17, 23:25)
 #' @param ... other arguments passed on to \code{\link{animate}} and
 #' \code{\link{display_groupxy}}
 #' @export
@@ -39,7 +41,7 @@ display_groupxy <- function(centr = TRUE, axes = "center", half_range = NULL,
  col = "black", pch = 20, cex = 1,
  edges = NULL, edges.col = "black", edges.width=1,
  group_by = NULL, plot_xgp = TRUE,
- palette = "Zissou 1", ...) {
+ palette = "Zissou 1", shapeset=c(15:17, 23:25), ...) {
  labels <- NULL
 
  # If colors are a variable, convert to colors
@@ -53,7 +55,7 @@ display_groupxy <- function(centr = TRUE, axes = "center", half_range = NULL,
  }
  # If shapes are a variable, convert shapes
  if (is.factor(pch)) {
- shapes <- mapShapes(pch)
+ shapes <- mapShapes(pch, shapeset)
  } else {
  shapes <- pch
  }

R/display-xy.r

@@ -20,6 +20,8 @@
 #' @param ellsize This can be considered the equivalent of a critical value, used to
 #' scale the ellipse larger or smaller to capture more or fewer anomalies. Default 3.
 #' @param palette name of color palette for point colour, used by \code{\link{hcl.colors}}, default "Zissou 1"
+#' @param shapeset numbers corresponding to shapes in base R points, to use for mapping
+#' categorical variable to shapes, default=c(15:17, 23:25)
 #' @param ... other arguments passed on to \code{\link{animate}} and
 #' \code{\link{display_xy}}
 #' @importFrom graphics legend
@@ -67,7 +69,7 @@ display_xy <- function(center = TRUE, axes = "center", half_range = NULL,
  edges = NULL, edges.col = "black", edges.width=1,
  obs_labels = NULL,
  ellipse = NULL, ellsize = 3,
- palette="Zissou 1", ...) {
+ palette="Zissou 1", shapeset=c(15:17, 23:25), ...) {
  # Needed for CRAN checks
  labels <- NULL
  gps <- NULL
@@ -84,7 +86,7 @@ display_xy <- function(center = TRUE, axes = "center", half_range = NULL,
  }
  # If shapes are a variable, convert shapes
  if (is.factor(pch)) {
- shapes <- mapShapes(pch)
+ shapes <- mapShapes(pch, shapeset)
  } else {
  shapes <- pch
  }

R/util.r

@@ -137,8 +137,9 @@ mapColors <- function(x, palette) {
 #'
 #' @param x vector
 #' @export
-mapShapes <- function(x) {
+mapShapes <- function(x, shapeset) {
  n <- length(unique(x))
- shapes <- c(15:17, 23:25)
+ stopifnot(length(shapeset) >= n)
+ shapes <- shapeset
  shapes[as.numeric(x)]
 }