[Gsdesign-commits] r238 - in pkg: gsDesign/R gsDesignGUIReview/osx

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

Author: keaven
Date: 2009-12-22 01:55:21 +0100 (Tue, 22 Dec 2009)
New Revision: 238

Modified:
   pkg/gsDesign/R/gsqplot.R
   pkg/gsDesignGUIReview/osx/gsDesign_2.2-1.tar.gz
   pkg/gsDesignGUIReview/osx/gsDesign_2.2-1.zip
Log:
Plotting bug with lty, col; now works with character values

Modified: pkg/gsDesign/R/gsqplot.R
===================================================================
--- pkg/gsDesign/R/gsqplot.R	2009-12-22 00:40:02 UTC (rev 237)
+++ pkg/gsDesign/R/gsqplot.R	2009-12-22 00:55:21 UTC (rev 238)
@@ -95,9 +95,9 @@
 "qplotit" <- function(x, xlim=NULL, ylim=NULL, geom=c("line", "text"), zround=2, lty=c(1,1), col=c(1,1),
                      lwd=c(1,1), nlabel="TRUE", xlab=NULL, ylab=NULL, fn=function(z,i,x,...){z},
                      ratio=1, delta0=0, delta=.05, cex=1, base=FALSE,...)
-{  lty <- lty * c(1,1)
-   col <- col * c(1,1)
-   lwd <- lwd * c(1,1)
+{  if (length(lty)==1) lty <- array(lty, 2)
+   if (length(col)==1) col <- array(col, 2)
+   if (length(lwd)==1) lwd <- array(lwd, 2)
    if(x$n.I[x$k] < 3) 
    {   nround <- 3 
        ntx <- "r="
@@ -279,9 +279,9 @@
 	mai=c(.85, .75, .5, .5), xmax=1, base=FALSE,...)
 {	ylab <- expression(paste(alpha, "-spending"))
 	ylab2 <- expression(paste(beta, "-spending"))
-	lty <- c(1,1) * lty
-	col <- c(1,1) * col
-	lwd <- c(1,1) * lwd
+	if (length(lty)==1) lty <- array(lty, 2)
+	if (length(col)==1) col <- array(col, 2)
+	if (length(lwd)==1) lwd <- array(lwd, 2)
 
 	# K. Wills (GSD-31)
 	if (is(x, "gsProbability"))

Modified: pkg/gsDesignGUIReview/osx/gsDesign_2.2-1.tar.gz
===================================================================
(Binary files differ)

Modified: pkg/gsDesignGUIReview/osx/gsDesign_2.2-1.zip
===================================================================
(Binary files differ)