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

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

Author: gsimpson
Date: 2010-02-23 00:35:56 +0100 (Tue, 23 Feb 2010)
New Revision: 1139

Modified:
   pkg/vegan/R/screeplot.cca.R
   pkg/vegan/R/screeplot.prcomp.R
   pkg/vegan/R/screeplot.princomp.R
   pkg/vegan/inst/ChangeLog
Log:
Handle pch in bstick line so it matches legend usage...

Modified: pkg/vegan/R/screeplot.cca.R
===================================================================
--- pkg/vegan/R/screeplot.cca.R	2010-02-21 17:23:50 UTC (rev 1138)
+++ pkg/vegan/R/screeplot.cca.R	2010-02-22 23:35:56 UTC (rev 1139)
@@ -41,15 +41,15 @@
         mids <- comps
     }
     if(bstick) {
+        dot.args <- list(...)
+        dot.nams <- names(dot.args)
+        pch <- if("pch" %in% dot.nams)
+            dot.args$pch
+        else
+            par("pch")
         lines(mids, ord.bstick[comps], type = ptype, col = bst.col,
-              lty = bst.lty)
+              lty = bst.lty, pch = pch)
         if(legend) {
-            dot.args <- list(...)
-            dot.nams <- names(dot.args)
-            pch <- if("pch" %in% dot.nams)
-                dot.args$pch
-            else
-                par("pch")
             col <- if("col" %in% dot.nams)
                 dot.args$col
             else

Modified: pkg/vegan/R/screeplot.prcomp.R
===================================================================
--- pkg/vegan/R/screeplot.prcomp.R	2010-02-21 17:23:50 UTC (rev 1138)
+++ pkg/vegan/R/screeplot.prcomp.R	2010-02-22 23:35:56 UTC (rev 1139)
@@ -33,15 +33,15 @@
         box()
     }
     if(bstick) {
+        dot.args <- list(...)
+        dot.nams <- names(dot.args)
+        pch <- if("pch" %in% dot.nams)
+            dot.args$pch
+        else
+            par("pch")
         lines(mids, ord.bstick[comps], type = ptype, col = bst.col,
-              lty = bst.lty)
+              lty = bst.lty, pch = pch)
         if(legend) {
-            dot.args <- list(...)
-            dot.nams <- names(dot.args)
-            pch <- if("pch" %in% dot.nams)
-                dot.args$pch
-            else
-                par("pch")
             col <- if("col" %in% dot.nams)
                 dot.args$col
             else

Modified: pkg/vegan/R/screeplot.princomp.R
===================================================================
--- pkg/vegan/R/screeplot.princomp.R	2010-02-21 17:23:50 UTC (rev 1138)
+++ pkg/vegan/R/screeplot.princomp.R	2010-02-22 23:35:56 UTC (rev 1139)
@@ -33,15 +33,15 @@
         box()
     }
     if(bstick) {
+        dot.args <- list(...)
+        dot.nams <- names(dot.args)
+        pch <- if("pch" %in% dot.nams)
+            dot.args$pch
+        else
+            par("pch")
         lines(mids, ord.bstick[comps], type = ptype, col = bst.col,
-              lty = bst.lty)
+              lty = bst.lty, pch = pch)
         if(legend) {
-            dot.args <- list(...)
-            dot.nams <- names(dot.args)
-            pch <- if("pch" %in% dot.nams)
-                dot.args$pch
-            else
-                par("pch")
             col <- if("col" %in% dot.nams)
                 dot.args$col
             else

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2010-02-21 17:23:50 UTC (rev 1138)
+++ pkg/vegan/inst/ChangeLog	2010-02-22 23:35:56 UTC (rev 1139)
@@ -6,7 +6,8 @@
 
 	* screeplot: New argument 'legend' for all methods (except
 	'decorana') to draw a legend if the observed and broken stick
-	distribution are both plotted.
+	distribution are both plotted. Now also respects 'pch' for the
+	broken stick line.
 
 Version 1.18-1 (closed February 18, 2010)