[Robast-commits] r402 - branches/robast-0.8/pkg/RobAStBase/R

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

Author: ruckdeschel
Date: 2010-05-03 21:47:07 +0200 (Mon, 03 May 2010)
New Revision: 402

Modified:
   branches/robast-0.8/pkg/RobAStBase/R/comparePlot.R
   branches/robast-0.8/pkg/RobAStBase/R/infoPlot.R
Log:
fixed two issues noticed by n.horbenko

Modified: branches/robast-0.8/pkg/RobAStBase/R/comparePlot.R
===================================================================
--- branches/robast-0.8/pkg/RobAStBase/R/comparePlot.R	2010-04-29 17:27:24 UTC (rev 401)
+++ branches/robast-0.8/pkg/RobAStBase/R/comparePlot.R	2010-05-03 19:47:07 UTC (rev 402)
@@ -228,7 +228,7 @@
         on.exit(options(warn = w0))
         opar <- par()
         opar$cin <- opar$cra <- opar$csi <- opar$cxy <-  opar$din <- NULL
-        if(mfColRow) on.exit(on.exit(par(opar)))
+        if(mfColRow) on.exit(par(opar))
         
         if(mfColRow)
              par(mfrow = c(nrows, ncols))

Modified: branches/robast-0.8/pkg/RobAStBase/R/infoPlot.R
===================================================================
--- branches/robast-0.8/pkg/RobAStBase/R/infoPlot.R	2010-04-29 17:27:24 UTC (rev 401)
+++ branches/robast-0.8/pkg/RobAStBase/R/infoPlot.R	2010-05-03 19:47:07 UTC (rev 402)
@@ -362,6 +362,9 @@
 
             if(!is.null(ylim)) 
                 dotsP$ylim <- ylim[,1]       
+            
+            fac.leg <- if(dims0>1) 3/4 else .75/.8 
+            
             if(1 %in% to.draw){
                do.call(plot, args=c(list(x.vec, absInfoClass, type = plty, 
                    lty = ltyI, col = colI, lwd = lwdI,
@@ -374,7 +377,7 @@
                      legend = c("class. opt. IC", objectc), 
                      bg = legend.bg,
                      lty = c(ltyI, lty), col = c(colI, col), 
-                     lwd = c(lwdI, lwd), cex = legend.cex*.75/.8)
+                     lwd = c(lwdI, lwd), cex = legend.cex*fac.leg)
 
                dotsT["main"] <- NULL
                dotsT["cex.main"] <- NULL
@@ -391,7 +394,7 @@
                 dotsT["ylim"] <- NULL
                 nrows <- trunc(sqrt(dims))
                 ncols <- ceiling(dims/nrows)
-                if (!withSweave||!mfColRow)
+                if (!withSweave)
                      devNew()
                 if(mfColRow)
                    parArgs <- c(parArgs,list(mfrow = c(nrows, ncols)))
@@ -419,7 +422,7 @@
                            bg = legend.bg,
                            legend = c("class. opt. IC", objectc),  
                            col = c(colI, col), lwd = c(lwdI, lwd),
-                           lty = c(ltyI, lty), cex = legend.cex*6/8)
+                           lty = c(ltyI, lty), cex = legend.cex*fac.leg)
                     if(innerL)
                        do.call(title, args = c(list(main = innerT[[1+indi]]),  
                                dotsT, line = lineT, cex.main = cex.inner,