Merge pull request #19 from daffp/master

Additional graphical parameters for loess lines
edzer · Jan 7, 2021 · 367ab7b · 367ab7b
2 parents 8098c76 + e7fd6d5
commit 367ab7b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: hexbin
-Version: 1.28.1
+Version: 1.28.2
 Title: Hexagonal Binning Routines
 Author: Dan Carr <dcarr@voxel.galaxy.gmu.edu>, ported by Nicholas
         Lewin-Koh and Martin Maechler <maechler@stat.math.ethz.ch>,

diff --git a/R/hexPlotMA.R b/R/hexPlotMA.R
@@ -189,8 +189,8 @@ plotMAhex <- function (MA, array = 1, xlab = "A", ylab = "M",
     invisible(list(hbin = hbin, plot.vp = hp$plot.vp, legend.vp = hp$legend.vp))
 }
 
-hexMA.loess <- function(pMA, span = .4, col = 'red', n = 200)
+hexMA.loess <- function(pMA, span = .4, col = 'red', n = 200, ...)
 {
-  fit <- hexVP.loess(pMA$hbin, pMA$plot.vp, span = span, col = col, n = n)
+  fit <- hexVP.loess(pMA$hbin, pMA$plot.vp, span = span, col = col, n = n, ...)
   invisible(fit)
 }
diff --git a/R/hexViewport.R b/R/hexViewport.R
@@ -241,7 +241,7 @@ hexVP.abline <- function(hvp, a = NULL, b = NULL, h = numeric(0),
     popViewport()
 }
 
-hexVP.loess <- function(hbin, hvp = NULL, span = 0.4, col = 'red', n = 200)
+hexVP.loess <- function(hbin, hvp = NULL, span = 0.4, col = 'red', n = 200, ...)
 {
     fit <- loess(hbin@ycm ~ hbin@xcm, weights = hbin@count, span = span)
     if(!is.null(hvp)) {
@@ -251,7 +251,7 @@ hexVP.loess <- function(hbin, hvp = NULL, span = 0.4, col = 'red', n = 200)
 #                   gp = gpar(col = col), default.units = 'native')
  		grid.lines(seq(hbin@xbnds[1], hbin@xbnds[2], length = n),
 				predict(fit,seq(hbin@xbnds[1], hbin@xbnds[2], length = n)),
-				gp = gpar(col = col), default.units = 'native')
+				gp = gpar(col = col, ...), default.units = 'native')
         popViewport()
     }
     invisible(fit)

diff --git a/man/hexMA.loess.Rd b/man/hexMA.loess.Rd
@@ -7,8 +7,8 @@
   coordinates and the cell counts as weights.
 }
 \usage{
-hexMA.loess(pMA, span = 0.4, col = "red", n = 200)
-hexVP.loess(hbin, hvp = NULL, span = 0.4, col = "red", n = 200)
+hexMA.loess(pMA, span = 0.4, col = "red", n = 200, ...)
+hexVP.loess(hbin, hvp = NULL, span = 0.4, col = "red", n = 200, ...)
 }
 
 \arguments{
@@ -18,7 +18,7 @@ hexVP.loess(hbin, hvp = NULL, span = 0.4, col = "red", n = 200)
   \item{span}{the parameter alpha which controls the degree of smoothing.}
   \item{col}{line color for the loess fit.}
   \item{n}{number of points at which the fit should be evaluated.}
-}
+  \item{...}{Additional graphical parameter settings for the \code{loess} line fit; see \code{\link[grid]{gpar}}.}}
 \value{
   Returns invisibly the object associated with the loess fit.
 }
@@ -36,7 +36,12 @@ hexVP.loess(hbin, hvp = NULL, span = 0.4, col = "red", n = 200)
     hb <- plotMAhex(swirl[,1], main = "M vs A plot with hexagons", legend=0)
     hexVP.abline(hb$plot, h=0, col= gray(.6))
     hexMA.loess(hb)
-  }
+  } 
+
+  dat <- data.frame(x=rnorm(1000), y=rnorm(1000))
+  bin <- hexbin(dat$x, dat$y)
+  hb <- plot(bin)
+  hexVP.loess(bin, hvp = hb$plot.vp, span = 0.4, n = 200, col = "blue", lwd = 3, lty = "dashed")
 }
 \keyword{aplot}