[Dplr-commits] r869 - in pkg/dplR: . R

[noreply at r-forge.r-project.org]

Author: mvkorpel
Date: 2014-05-14 10:15:59 +0200 (Wed, 14 May 2014)
New Revision: 869

Modified:
   pkg/dplR/DESCRIPTION
   pkg/dplR/R/wavelet.plot.R
Log:
wavelet.plot(): Adjusted handling of situation where rasterPlot() fails

Modified: pkg/dplR/DESCRIPTION
===================================================================
--- pkg/dplR/DESCRIPTION	2014-05-13 21:47:33 UTC (rev 868)
+++ pkg/dplR/DESCRIPTION	2014-05-14 08:15:59 UTC (rev 869)
@@ -3,7 +3,7 @@
 Type: Package
 Title: Dendrochronology Program Library in R
 Version: 1.6.1
-Date: 2014-05-13
+Date: 2014-05-14
 Authors at R: c(person("Andy", "Bunn", role = c("aut", "cph",
         "cre", "trl"), email = "andy.bunn at wwu.edu"), person("Mikko",
         "Korpela", role = c("aut", "trl")), person("Franco", "Biondi",

Modified: pkg/dplR/R/wavelet.plot.R
===================================================================
--- pkg/dplR/R/wavelet.plot.R	2014-05-13 21:47:33 UTC (rev 868)
+++ pkg/dplR/R/wavelet.plot.R	2014-05-14 08:15:59 UTC (rev 869)
@@ -95,7 +95,7 @@
                                         key.cols))
             tryCatch(rasterPlot(cl, res = res, antialias = "none"),
                      error = function(e) {
-                         warning(e)
+                         message(as.character(e), appendLF = FALSE)
                          message("reverting to useRaster=FALSE")
                          .filled.contour(as.double(x),
                                          as.double(period2),
@@ -181,7 +181,7 @@
                                         key.cols))
             tryCatch(rasterPlot(cl, res = res, antialias = "none"),
                      error = function(e) {
-                         warning(e)
+                         message(as.character(e), appendLF = FALSE)
                          message("reverting to useRaster=FALSE")
                          .filled.contour(as.double(x),
                                          as.double(period2),