Fixed handling of axis preferences in plot.biwavelet

tgouhier · Jun 25, 2016 · f3209ce · f3209ce
1 parent 6623fd1
commit f3209ce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: biwavelet
 Type: Package
 Title: Conduct Univariate and Bivariate Wavelet Analyses
-Version: 0.20.7
-Date: 2016-06-01
+Version: 0.20.8
+Date: 2016-06-25
 Author: Tarik C. Gouhier, Aslak Grinsted, Viliam Simko
 Maintainer: Tarik C. Gouhier <[email protected]>
 Description: This is a port of the WTC MATLAB package written by Aslak Grinsted

diff --git a/R/plot.biwavelet.R b/R/plot.biwavelet.R
@@ -222,14 +222,14 @@ plot.biwavelet <- function(x, ncol = 64, fill.cols = NULL,
   } else {
     if (xaxt != "n") {
       xlocs <- axTicks(1)
-      axis(side = 1, at = xlocs)
+      axis(side = 1, at = xlocs, ...)
     }
   }
 
   if (yaxt != "n") {
     axis.locs <- axTicks(2)
     yticklab <- format(2 ^ axis.locs, dig = 1)
-    axis(2, at = axis.locs, labels = yticklab)
+    axis(2, at = axis.locs, labels = yticklab, ...)
   }
 
   # COI
@@ -266,7 +266,7 @@ plot.biwavelet <- function(x, ncol = 64, fill.cols = NULL,
   }
   box()
 
-  ## Add color bar: this must happen after everything else otherwise chaos!
+  ## Add color bar: this must happen after everything, otherwise chaos ensues!
   if (plot.cb) {
     image.plot(x$t,
                yvals,
@@ -280,7 +280,7 @@ plot.biwavelet <- function(x, ncol = 64, fill.cols = NULL,
                horizontal = legend.horiz,
                legend.only = TRUE,
                axis.args =
-                 list(at = locs, labels = format(leg.lab, dig = 2)),
+                 list(at = locs, labels = format(leg.lab, dig = 2), ...),
                xpd = NA)
   }
 }
diff --git a/inst/CITATION b/inst/CITATION
@@ -1,8 +1,8 @@
 bibentry("Manual",
 		title="biwavelet: Conduct univariate and bivariate wavelet analyses",
 		author="Tarik C. Gouhier, Aslak Grinsted, Viliam Simko",
-		year="2015",
-		note="(Version 0.20.7)",
+		year="2016",
+		note="(Version 0.20.8)",
 		url="http://github.com/tgouhier/biwavelet",
 
 		textVersion =

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -2,6 +2,15 @@
 \title{News for Package 'biwavelet'}
 \encoding{UTF-8}
 
+\section{Changes in biwavelet version 0.20.8 (2016-06-25)}{
+  \subsection{fixed}{
+    \itemize{
+      \item Fixed handling of axis preferences in \code{plot.biwavelet}.
+    }
+  }
+}
+
+
 \section{Changes in biwavelet version 0.20.7 (2016-06-01)}{
   \subsection{fixed}{
     \itemize{