Added xaxis argument to eda_dens()

R/eda_dens.R

@@ -23,8 +23,11 @@
 #' @param alpha Fill transparency (0 = transparent, 1 = opaque). Only applicable
 #'   if \code{rgb()} is not used to define fill colors.
 #' @param legend Boolean determining if a legend should be added to the plot.
-#' @param xlab X variable label. Ignored if \code{x} is a dataframe.
-#' @param ylab Y variable label. Ignored if \code{x} is a dataframe.
+#' @param xlab X variable label. Ignored if \code{x} is a dataframe. This is
+#' not the x-axis label!
+#' @param ylab Y variable label. Ignored if \code{x} is a dataframe. This is
+#' not the y-axis label!
+#' @param xaxis Label for x-axis. Defaults to \code{"Value"}.
 #' @param show.par Boolean determining if parameters such as power
 #'   transformation or formula should be displayed.
 #' @param switch Boolean determining if the axes should be swapped. Only applies
@@ -55,11 +58,14 @@
 eda_dens <- function(x, y, fac = NULL, p = 1L, tukey = FALSE, fx = NULL,
                      fy = NULL, grey = 0.6, col = "red", size = 0.8,
                      show.par= TRUE, alpha = 0.4, xlab = NULL, ylab = NULL,
-                     switch = FALSE, legend = TRUE, ...) {
+                     xaxis = NULL, switch = FALSE, legend = TRUE, ...) {
 
   # Extract data
   if("data.frame" %in% class(x)){
     val <- eval(substitute(y), x)
+    if(is.null(xaxis)){
+      xaxis <- as.character(substitute(fac))
+    }
     #fac <- eval(substitute(fac), x)
     fac <- as.factor(eval(substitute(fac), x))
     fac <- droplevels(fac)
@@ -91,6 +97,10 @@ eda_dens <- function(x, y, fac = NULL, p = 1L, tukey = FALSE, fx = NULL,
     if(is.null(ylab)){
       ylab = substitute(y)
     }
+    if(is.null(xaxis)){
+      xaxis = "Value"
+    }
+
   }
 
   # Re-express data if required
@@ -169,7 +179,9 @@ eda_dens <- function(x, y, fac = NULL, p = 1L, tukey = FALSE, fx = NULL,
   axis(2,col=plotcol, col.axis=plotcol, labels=TRUE, las=1, hadj = 0.8,
        tck = -0.02)
   mtext("Density", side=3, adj= -0.1 , col=plotcol, padj = -1)
-  title(xlab = "Value", line = 1.8, col.lab=plotcol)
+
+  # Add x-axis label
+  title(xlab = xaxis, line = 1.8, col.lab=plotcol)
 
   if(show.par == TRUE){
      mtext(side = 3, text=paste0("p=",p,";",fx," ",fy,sep=""), adj=1, cex = 0.65)