[Vegan-commits] r2373 - in branches/2.0: R inst

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

Author: gsimpson
Date: 2013-01-15 18:28:12 +0100 (Tue, 15 Jan 2013)
New Revision: 2373

Modified:
   branches/2.0/R/ordilabel.R
   branches/2.0/inst/ChangeLog
Log:
merge r2732 to branch

Modified: branches/2.0/R/ordilabel.R
===================================================================
--- branches/2.0/R/ordilabel.R	2013-01-15 17:20:54 UTC (rev 2372)
+++ branches/2.0/R/ordilabel.R	2013-01-15 17:28:12 UTC (rev 2373)
@@ -29,10 +29,15 @@
         else
             col <- par("fg")
     for (i in 1:nrow(x)) {
-        polygon(x[i,1] + c(-1,1,1,-1)*w[i], x[i,2] + c(-1,-1,1,1)*h[i],
-                col = fill, border = border, xpd = xpd)
-        text(x[i,1], x[i,2], labels = labels[i], cex = cex, col = col,
-             xpd = xpd, ...)
+        ## polygon(x[i,1] + c(-1,1,1,-1)*w[i], x[i,2] + c(-1,-1,1,1)*h[i],
+        ##         col = fill, border = border, xpd = xpd)
+        ## text(x[i,1], x[i,2], labels = labels[i], cex = cex, col = col,
+        ##      xpd = xpd, ...)
+        ordiArgAbsorber(x[i,1] + c(-1,1,1,-1)*w[i], x[i,2] + c(-1,-1,1,1)*h[i],
+                        col = fill, border = border, xpd = xpd,
+                        FUN = polygon, ...)
+        ordiArgAbsorber(x[i,1], x[i,2], labels = labels[i], cex = cex,
+                        col = col, xpd = xpd, FUN = text, ...)
     }
     invisible(x)
 }

Modified: branches/2.0/inst/ChangeLog
===================================================================
--- branches/2.0/inst/ChangeLog	2013-01-15 17:20:54 UTC (rev 2372)
+++ branches/2.0/inst/ChangeLog	2013-01-15 17:28:12 UTC (rev 2373)
@@ -4,6 +4,7 @@
 
 Version 2.0-6 (opened October 8, 2012)
 
+	* merge 2372: ordilabel uses ordiArgAbsorber when plotting
 	* merge 2369: clamtest fix and border cases.
 	* merge 2367: rectify mantel, summary.anosim print.
 	* merge 2362: doc on r2357 for capscale.