[Vegan-commits] r677 - in pkg/vegan: . R inst

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

Author: jarioksa
Date: 2009-01-28 17:37:53 +0100 (Wed, 28 Jan 2009)
New Revision: 677

Modified:
   pkg/vegan/DESCRIPTION
   pkg/vegan/R/ordirgl.R
   pkg/vegan/R/orgltext.R
   pkg/vegan/inst/ChangeLog
Log:
removed workarounds for rgl versions pre 0.65 in ordirgl & orgltext

Modified: pkg/vegan/DESCRIPTION
===================================================================
--- pkg/vegan/DESCRIPTION	2009-01-28 16:04:13 UTC (rev 676)
+++ pkg/vegan/DESCRIPTION	2009-01-28 16:37:53 UTC (rev 677)
@@ -1,7 +1,7 @@
 Package: vegan
 Title: Community Ecology Package
-Version: 1.16-10
-Date: Januay 20, 2009
+Version: 1.16-11
+Date: Januay 28, 2009
 Author: Jari Oksanen, Roeland Kindt, Pierre Legendre, Bob O'Hara, Gavin L. Simpson, 
    Peter Solymos, M. Henry H. Stevens, Helene Wagner  
 Maintainer: Jari Oksanen <jari.oksanen at oulu.fi>

Modified: pkg/vegan/R/ordirgl.R
===================================================================
--- pkg/vegan/R/ordirgl.R	2009-01-28 16:04:13 UTC (rev 676)
+++ pkg/vegan/R/ordirgl.R	2009-01-28 16:37:53 UTC (rev 677)
@@ -4,7 +4,6 @@
 {
     if (!require(rgl)) 
         stop("Requires package 'rgl'")
-    oldpak <- compareVersion(packageDescription("rgl", field="Version"), "0.65") == -1
     x <- scores(object, display = display, choices = choices, 
                 ...)
     if (ncol(x) < 3) 
@@ -15,18 +14,17 @@
     else if (type == "t") {
         if (missing(text)) 
             text <- rownames(x)
-        rgl.texts(x[, 1], x[, 2], x[, 3], text, ...,
-                  if (oldpak) justify = "center" else adj = 0.5)
+        rgl.texts(x[, 1], x[, 2], x[, 3], text, adj = 0.5, ...)
     }
     rgl.lines(range(x[, 1]), c(0, 0), c(0, 0), col = ax.col)
     rgl.lines(c(0, 0), range(x[, 2]), c(0, 0), col = ax.col)
     rgl.lines(c(0, 0), c(0, 0), range(x[, 3]), col = ax.col)
     rgl.texts(1.1 * max(x[, 1]), 0, 0, colnames(x)[1], col = ax.col, 
-              if (oldpak) justify = "center" else adj = 0.5)
+              adj = 0.5)
     rgl.texts(0, 1.1 * max(x[, 2]), 0, colnames(x)[2], col = ax.col, 
-              if (oldpak) justify = "center" else adj = 0.5)
+              adj = 0.5)
     rgl.texts(0, 0, 1.1 * max(x[, 3]), colnames(x)[3], col = ax.col, 
-              if (oldpak) justify = "center" else adj = 0.5)
+              adj = 0.5)
     if (!missing(envfit) || !is.null(object$CCA)) {
         if (!missing(envfit)) 
             object <- envfit
@@ -35,7 +33,7 @@
         if (!is.null(cn) && !any(is.na(cn))) {
             bp <- bp[!(rownames(bp) %in% rownames(cn)), , drop = FALSE]
             rgl.texts(cn[, 1], cn[, 2], cn[, 3], rownames(cn), 
-                      col = arr.col, if (oldpak) justify = "center" else adj = 0.5)
+                      col = arr.col, adj = 0.5)
             rgl.points(cn[, 1], cn[, 2], cn[, 3], size = 5, col = arr.col)
         }
         if (!is.null(bp) && nrow(bp) > 0) {
@@ -50,7 +48,7 @@
                                                             bp[i, 3]), col = arr.col)
                 rgl.texts(1.1 * bp[i, 1], 1.1 * bp[i, 2], 1.1 * 
                           bp[i, 3], rownames(bp)[i], col = arr.col,
-                          if (oldpak) justify = "center" else adj = 0.5)
+                          adj = 0.5)
             }
         }
     }

Modified: pkg/vegan/R/orgltext.R
===================================================================
--- pkg/vegan/R/orgltext.R	2009-01-28 16:04:13 UTC (rev 676)
+++ pkg/vegan/R/orgltext.R	2009-01-28 16:37:53 UTC (rev 677)
@@ -2,12 +2,10 @@
     function (object, text, display = "sites", choices = 1:3, justify = "center",  
               adj = 0.5, ...) 
 {
-    oldpak <- compareVersion(packageDescription("rgl", field="Version"), "0.65") == -1
     x <- scores(object, display = display, choices = choices, 
                 ...)
     if (missing(text)) 
         text <- rownames(x)
-    rgl.texts(x[, 1], x[, 2], x[, 3], text,
-              if (oldpak) justify = justify else adj = adj,  ...)
+    rgl.texts(x[, 1], x[, 2], x[, 3], text, adj = adj,  ...)
     invisible()
 }

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2009-01-28 16:04:13 UTC (rev 676)
+++ pkg/vegan/inst/ChangeLog	2009-01-28 16:37:53 UTC (rev 677)
@@ -2,8 +2,13 @@
 
 VEGAN DEVEL VERSIONS at http://r-forge.r-project.org/
 
-Version 1.6-10 (openen Jan 20, 2009)
+Version 1.6-11 (opened Jan 28, 2009)
 
+	* ordirgl & orgltext: removed work arounds for very old versions
+	(pre-0.65) of the rgl package.
+
+Version 1.6-10 (closed Jan 28, 2009)
+
 	* commsimulator: failed if input data (x) were a data.frame.
 
 	* metaMDS: really do not evaluate no.shared() if set