diff --git a/CHANGES b/CHANGES index 09007162f68b8f4c9c43c46b6d2f7438d715a029..61d95477414237bd71885e952c5019a259402be5 100644 --- a/CHANGES +++ b/CHANGES @@ -1 +1,2 @@ 1.03 : added cross morlet +1.04 : added "mask" option to display influence cone in Morlet diff --git a/DESCRIPTION b/DESCRIPTION index 3a8cdb570b57fe4e0406368790b629598569fa7b..b103295c932d5b15018d740e7d6f429da9e1ea58 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: gtseries Type: Package Title: Time Series analysis for galcial cycles -Version: 1.03 -Date: 2015-02-12 +Version: 1.04 +Date: 2022-05-28 Author: Michel Crucifix Maintainer: Michel Crucifix <michel.crucifix@uclouvain.be> Description: More about what it does (maybe more than one line) diff --git a/R/cwt_morlet.R b/R/cwt_morlet.R index 02625e7ccf09a17e42825db5782ea2991120b06e..d000e0e72b0032c2442463a3e005c23f6219dded 100644 --- a/R/cwt_morlet.R +++ b/R/cwt_morlet.R @@ -192,13 +192,14 @@ cwt_morlet <- function (A,inter=20,k0=5.6,amin=1,amax=Inf,calcmask=TRUE,scale=NA wave } -plot.wavelet <- function (wave,resx=400,resy=300,xlab="Time",ylab="Period",scaling_correction=0,col=col_wavelet,legend=FALSE,Mode=Mod,...) +plot.wavelet <- function (wave,resx=400,resy=300,xlab="Time",ylab="Period",scaling_correction=0,col=col_wavelet,legend=FALSE,Mode=Mod,plotMask=TRUE,...) { require(fields) xx <- attr(wave,"time") period <- attr(wave,"period") mask <- attr(wave,"mask") + if (!plotMask) mask[,] = 1 # do not hide influence cone aa <- attr(wave,"scale") thin_factor_xx <- max(ceiling(length(xx)/ resx),1) thin_factor_yy <- max(ceiling(length(aa)/ resy),1)