warn user when incorrect labels are specified

earlier code provided incomprehensible information to the user.
Behaviour of point.attr now updated to match changes to plot code, when
input has no information on labels.

Author: mjwestgate

R/plot_calls.R

@@ -66,7 +66,7 @@ circleplot<-function(
 point.attr<-function(distance.matrix)
 	{
 	if(length(attr(distance.matrix, "Labels"))==0){
-		attr(distance.matrix, "Labels")<-c(1:attr(distance.matrix, "Size"))}
+		attr(distance.matrix, "Labels")<-paste("V", c(1:attr(distance.matrix, "Size")), sep="")}
 	labels<-as.character(attr(distance.matrix, "Labels"))
 	color.hex<-c(RColorBrewer::brewer.pal(8, "Dark2"), 
 		brewer.pal(9, "Set1"),

R/prep_objects.R

@@ -182,12 +182,17 @@ set.plot.attributes<-function(
 	if(is.null(plot.defaults$par)){plot.defaults$par<-par.default}
 
 	# 3. points
+	matrix.labels<-lapply(input$wide, colnames)[[1]]
 	if(is.null(plot.defaults$points)){ #  | reduce
 		n.points<-lapply(input$wide, ncol)[[1]]  #ncol(input$wide)
-		label.vals<-lapply(input$wide, colnames)[[1]]
+		label.vals<-matrix.labels
 	}else{
 		n.points<-nrow(plot.defaults$points)
-		label.vals<-plot.defaults$points$labels}
+		label.vals<-plot.defaults$points$labels
+		# check these match
+		if(all(sort(matrix.labels)==sort(label.vals))==FALSE){
+			stop("supplied point labels do not match those from the input matrix or data.frame")}
+		}
 	# generate a 'null' data.frame
 	point.defaults<-data.frame(
 			labels= label.vals,