From 375af69f873e833d63e42b52bf1dbdabdc8bfdda Mon Sep 17 00:00:00 2001
From: wuergh <erle.holgersen@gmail.com>
Date: Sun, 18 Mar 2018 17:02:47 +0000
Subject: [PATCH] Added option for custom x-axis and y-axis ticks

---
 R/multi_cat.R   | 30 +++++++++++++++++++++++++-----
 man/multicat.Rd |  7 ++++++-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/R/multi_cat.R b/R/multi_cat.R
index bd65077..11e71a4 100644
--- a/R/multi_cat.R
+++ b/R/multi_cat.R
@@ -32,6 +32,8 @@
 #' @param linecolor color of plotted lines
 #' @param type the type of plot ... justcats, or line
 #' @param canvas the plotting area
+#' @param xat vector of x-axis ticks
+#' @param yat vector of y-axis ticks
 #' @param ... additional parameters to pass to plot()
 #'
 #' @return a cat plot object... to plot more cats.
@@ -45,7 +47,10 @@ multicat <- function(xs, ys,
 					size=0.1, cat=c(1,2),
 					catcolor = '#000000FF',
 					linecolor=1, type="justcats",
-					canvas=c(0,1.1,0,1.1), ...) {
+					canvas=c(0,1.1,0,1.1), 
+					xat = NULL,
+					yat = NULL,
+					...) {
 	args <- list(...)
 
 	plot(x=xs, y=ys, col=0, xaxt="n", yaxt="n", ...)
@@ -55,10 +60,25 @@ multicat <- function(xs, ys,
 	xscale <- scaledData$xscale
 	yscale <- scaledData$yscale
 
-	xat = seq(min(xscale), max(xscale), length.out=length(xscale))
-	yat = seq(min(yscale), max(yscale), length.out=length(yscale))
-	xaxtlab = round(seq(min(xs), max(xs),length.out=length(xat)),1)
-	yaxtlab = round(seq(min(ys), max(ys),length.out=length(xat)),1)
+	# axis ticks
+	if( is.null(xat) ) {
+	    xat = seq(min(xscale), max(xscale), length.out = length(xscale))
+	    xaxtlab = round(seq(min(xs), max(xs),length.out=length(xat)),1)
+	} else {
+	    atscale = scaleData(xat, NA, args)
+	    xaxtlab = round(xat, 1)
+	    xat = atscale$xscale # overwrite x-ticks with scaled version
+	}
+	
+	if( is.null(yat) ) {
+	    yat = seq(min(yscale), max(yscale), length.out = length(yscale))
+	    yaxtlab = round(seq(min(ys), max(ys),length.out=length(yat)),1)
+	} else {
+	    atscale = scaleData(NA, yat, args)
+	    yaxtlab = round(yat, 1)
+	    yat = atscale$yscale # overwrite y-ticks with scaled version
+	}
+	
 	axis(side=1, at=xat, labels=xaxtlab)
 	axis(side=2, at=yat, labels=yaxtlab)
 
diff --git a/man/multicat.Rd b/man/multicat.Rd
index 2aed73e..2669c24 100644
--- a/man/multicat.Rd
+++ b/man/multicat.Rd
@@ -5,7 +5,8 @@
 \title{Multi-cat!  More cats. More colors.}
 \usage{
 multicat(xs, ys, size = 0.1, cat = c(1, 2), catcolor = "#000000FF",
-  linecolor = 1, type = "justcats", canvas = c(0, 1.1, 0, 1.1), ...)
+  linecolor = 1, type = "justcats", canvas = c(0, 1.1, 0, 1.1),
+  xat = NULL, yat = NULL, ...)
 }
 \arguments{
 \item{xs}{a vector of numbers}
@@ -24,6 +25,10 @@ multicat(xs, ys, size = 0.1, cat = c(1, 2), catcolor = "#000000FF",
 
 \item{canvas}{the plotting area}
 
+\item{xat}{vector of x-axis ticks}
+
+\item{yat}{vector of y-axis ticks}
+
 \item{...}{additional parameters to pass to plot()}
 }
 \value{