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

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

Author: mvkorpel
Date: 2012-08-29 12:52:26 +0200 (Wed, 29 Aug 2012)
New Revision: 648

Modified:
   pkg/dplR/ChangeLog
   pkg/dplR/DESCRIPTION
   pkg/dplR/R/corr.rwl.seg.R
Log:
Bug fixes in corr.rwl.seg()


Modified: pkg/dplR/ChangeLog
===================================================================
--- pkg/dplR/ChangeLog	2012-07-30 21:44:55 UTC (rev 647)
+++ pkg/dplR/ChangeLog	2012-08-29 10:52:26 UTC (rev 648)
@@ -17,7 +17,12 @@
   using one of three methods. Contributed by a user Filipe Campelo (fcampelo at ci.uc.pt).
   This is his first contribution. Need to add to author list.
 
+File: corr.rwl.seg.R
+--------------------
 
+- Bug fix: series names were not shown (numbers were shown instead)
+- Bug fix: there were off-by-one errors in the length of the bars
+
 * CHANGES IN dplR VERSION 1.5.5
 
 File: NAMESPACE

Modified: pkg/dplR/DESCRIPTION
===================================================================
--- pkg/dplR/DESCRIPTION	2012-07-30 21:44:55 UTC (rev 647)
+++ pkg/dplR/DESCRIPTION	2012-08-29 10:52:26 UTC (rev 648)
@@ -3,7 +3,7 @@
 Type: Package
 Title: Dendrochronology Program Library in R
 Version: 1.5.6
-Date: 2012-07-30
+Date: 2012-08-29
 Authors at R: c(person(c("Andrew", "G."), "Bunn", role = c("aut", "cph",
         "cre", "trl"), email = "andrew.bunn at wwu.edu"), person("Mikko",
         "Korpela", role = c("aut", "cph")), person("Franco", "Biondi",

Modified: pkg/dplR/R/corr.rwl.seg.R
===================================================================
--- pkg/dplR/R/corr.rwl.seg.R	2012-07-30 21:44:55 UTC (rev 647)
+++ pkg/dplR/R/corr.rwl.seg.R	2012-08-29 10:52:26 UTC (rev 648)
@@ -245,18 +245,18 @@
             for (i in seq_len(nseries)) {
                 y.deviation <- y.deviation + 1
                 ## whole segs
-                xx <- segs.mat[i, ]
+                xx <- c(segs.mat[i, 1], segs.mat[i, 2] + 1)
                 xx <- c(xx, rev(xx))
                 yy <- c(i, i, y.deviation, y.deviation)
                 polygon(xx, yy, col=col.pal[3], border=NA)
                 ## complete segs
-                xx <- com.segs.mat[i, ]
+                xx <- c(com.segs.mat[i, 1], com.segs.mat[i, 2] + 1)
                 xx <- c(xx, rev(xx))
                 polygon(xx, yy, col=col.pal[2], border=NA)
                 ## flags
                 flag.segs.mat <- yr.ranges(flag.segs[, i], yrs)
                 for (j in seq_len(nrow(flag.segs.mat))) {
-                    xx <- flag.segs.mat[j, ]
+                    xx <- c(flag.segs.mat[j, 1], flag.segs.mat[j, 2] + 1)
                     xx <- c(xx, rev(xx))
                     polygon(xx, yy, col=col.pal[1], border=NA)
                 }
@@ -272,7 +272,7 @@
         ## finish up plotting
         odd.seq <- seq(from=1, to=nsegs, by=2)
         even.seq <- seq(from=2, to=nsegs, by=2)
-        cnames.segs <- names(segs)
+        cnames.segs <- colnames(segs)
         axis(2, at=odd.seq,
              labels=cnames.segs[odd.seq], srt=45,
              tick=FALSE, las=2, cex.axis=label.cex)