Skip to content

Commit

Permalink
Fixed plot.biwavelet so that the COI extends all the way to the botto…
Browse files Browse the repository at this point in the history
…m of the plot
  • Loading branch information
tgouhier committed Feb 25, 2017
1 parent f1473af commit a664cb6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: biwavelet
Type: Package
Title: Conduct Univariate and Bivariate Wavelet Analyses
Version: 0.20.13
Date: 2016-12-27
Version: 0.20.14
Date: 2017-02-24
Author: Tarik C. Gouhier, Aslak Grinsted, Viliam Simko
Maintainer: Tarik C. Gouhier <tarik.gouhier@gmail.com>
Description: This is a port of the WTC MATLAB package written by Aslak Grinsted
Expand Down
7 changes: 5 additions & 2 deletions R/plot.biwavelet.R
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,12 @@ plot.biwavelet <- function(x, ncol = 64, fill.cols = NULL,

# COI
if (plot.coi) {
# polygon(x = c(x$t, rev(x$t)), lty = lty.coi, lwd = lwd.coi,
# y = c(log2(x$coi),
# rep(max(log2(x$coi), na.rm = TRUE), length(x$coi))),
# col = adjustcolor(col.coi, alpha.f = alpha.coi), border = col.coi)
polygon(x = c(x$t, rev(x$t)), lty = lty.coi, lwd = lwd.coi,
y = c(log2(x$coi),
rep(max(log2(x$coi), na.rm = TRUE), length(x$coi))),
y = c(log2(x$coi), rep(max(c(log2(x$coi), x$period), na.rm = TRUE), length(x$coi))),
col = adjustcolor(col.coi, alpha.f = alpha.coi), border = col.coi)
}

Expand Down
10 changes: 10 additions & 0 deletions inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
\title{News for Package 'biwavelet'}
\encoding{UTF-8}


\section{Changes in biwavelet version 0.20.14 (2017-02-24)}{
\subsection{fixed}{
\itemize{
\item Fixed \code{plot.biwavelet} so that the COI extends all
the way to the bottom of the plot (max of periods)
}
}
}

\section{Changes in biwavelet version 0.20.13 (2016-12-27)}{
\subsection{fixed}{
\itemize{
Expand Down

4 comments on commit a664cb6

@lintr-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

R/plot.biwavelet.R:246:1: style: lines should not be more than 80 characters.

y = c(log2(x$coi), rep(max(c(log2(x$coi), x$period), na.rm = TRUE), length(x$coi))),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@lintr-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

R/plot.biwavelet.R:246:1: style: lines should not be more than 80 characters.

y = c(log2(x$coi), rep(max(c(log2(x$coi), x$period), na.rm = TRUE), length(x$coi))),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@lintr-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

R/plot.biwavelet.R:246:1: style: lines should not be more than 80 characters.

y = c(log2(x$coi), rep(max(c(log2(x$coi), x$period), na.rm = TRUE), length(x$coi))),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@lintr-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

R/plot.biwavelet.R:246:1: style: lines should not be more than 80 characters.

y = c(log2(x$coi), rep(max(c(log2(x$coi), x$period), na.rm = TRUE), length(x$coi))),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Please sign in to comment.