[Distr-commits] r650 - in branches/distr-2.3/pkg: distr/R distrMod/R distrSim/R distrTEst/R distrTeach/R

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

Author: ruckdeschel
Date: 2010-04-29 16:51:48 +0200 (Thu, 29 Apr 2010)
New Revision: 650

Modified:
   branches/distr-2.3/pkg/distr/R/plot-methods.R
   branches/distr-2.3/pkg/distr/R/plot-methods_LebDec.R
   branches/distr-2.3/pkg/distrMod/R/AllPlot.R
   branches/distr-2.3/pkg/distrSim/R/plot-methods.R
   branches/distr-2.3/pkg/distrTEst/R/plot-methods.R
   branches/distr-2.3/pkg/distrTeach/R/illustCLT.R
   branches/distr-2.3/pkg/distrTeach/R/illustLLN.R
Log:
for restoring old par() values, not all attributes may be set; hence deleted them from
stored value in plot functions by something like
            opar$cin <- opar$cra <- opar$csi <- opar$cxy <-  opar$din <- NULL


Modified: branches/distr-2.3/pkg/distr/R/plot-methods.R
===================================================================
--- branches/distr-2.3/pkg/distr/R/plot-methods.R	2010-04-29 14:27:46 UTC (rev 649)
+++ branches/distr-2.3/pkg/distr/R/plot-methods.R	2010-04-29 14:51:48 UTC (rev 650)
@@ -68,6 +68,7 @@
            devNew(width = width, height = height)
            }
      omar <- par("mar")
+     omar$cin <- omar$cra <- omar$csi <- omar$cxy <-  omar$din <- NULL
      on.exit(par(omar))
      
      mainL <- FALSE
@@ -367,6 +368,7 @@
            devNew(width = width, height = height)
            }
      omar <- par("mar")
+     omar$cin <- omar$cra <- omar$csi <- omar$cxy <-  omar$din <- NULL
      on.exit(par(omar))
      
      mainL <- FALSE

Modified: branches/distr-2.3/pkg/distr/R/plot-methods_LebDec.R
===================================================================
--- branches/distr-2.3/pkg/distr/R/plot-methods_LebDec.R	2010-04-29 14:27:46 UTC (rev 649)
+++ branches/distr-2.3/pkg/distr/R/plot-methods_LebDec.R	2010-04-29 14:51:48 UTC (rev 650)
@@ -155,7 +155,8 @@
            devNew(width = width, height = height)
            }
      omar <- par("mar")
-     on.exit(par(omar))
+     omar$cin <- omar$cra <- omar$csi <- omar$cxy <-  omar$din <- NULL
+     on.exit(on.exit(par(omar))
      
      mainL <- FALSE
      subL <- FALSE

Modified: branches/distr-2.3/pkg/distrMod/R/AllPlot.R
===================================================================
--- branches/distr-2.3/pkg/distrMod/R/AllPlot.R	2010-04-29 14:27:46 UTC (rev 649)
+++ branches/distr-2.3/pkg/distrMod/R/AllPlot.R	2010-04-29 14:51:48 UTC (rev 650)
@@ -211,6 +211,7 @@
         options(warn = -1)
         on.exit(options(warn=o.warn))
         opar <- par()
+        opar$cin <- opar$cra <- opar$csi <- opar$cxy <-  opar$din <- NULL
         on.exit(par(opar))
         
         if (!withSweave)

Modified: branches/distr-2.3/pkg/distrSim/R/plot-methods.R
===================================================================
--- branches/distr-2.3/pkg/distrSim/R/plot-methods.R	2010-04-29 14:27:46 UTC (rev 649)
+++ branches/distr-2.3/pkg/distrSim/R/plot-methods.R	2010-04-29 14:51:48 UTC (rev 650)
@@ -40,6 +40,7 @@
 #            get(getOption("device"))()
 
             opar <- par()
+            opar$cin <- opar$cra <- opar$csi <- opar$cxy <-  opar$din <- NULL
             on.exit(par(opar))
 
             o.warn <- getOption("warn")
@@ -185,6 +186,7 @@
             o.warn <- getOption("warn")
             on.exit(options("warn"=o.warn))
             opar <- par()
+            opar$cin <- opar$cra <- opar$csi <- opar$cxy <-  opar$din <- NULL
             on.exit(par(opar))
             
             options("warn" = -1)

Modified: branches/distr-2.3/pkg/distrTEst/R/plot-methods.R
===================================================================
--- branches/distr-2.3/pkg/distrTEst/R/plot-methods.R	2010-04-29 14:27:46 UTC (rev 649)
+++ branches/distr-2.3/pkg/distrTEst/R/plot-methods.R	2010-04-29 14:51:48 UTC (rev 650)
@@ -115,8 +115,9 @@
            ylim0[,c2*c1+(1:c3)] <- ylim1[,1:c3]
         options("warn" = o.warn) }
 
-  op <- par()
-  on.exit(par(op))
+  opar <- par()
+  opar$cin <- opar$cra <- opar$csi <- opar$cxy <-  opar$din <- NULL
+  on.exit(par(opar))
   par(mfrow=c(resdim0,1))
 
 

Modified: branches/distr-2.3/pkg/distrTeach/R/illustCLT.R
===================================================================
--- branches/distr-2.3/pkg/distrTeach/R/illustCLT.R	2010-04-29 14:27:46 UTC (rev 649)
+++ branches/distr-2.3/pkg/distrTeach/R/illustCLT.R	2010-04-29 14:51:48 UTC (rev 650)
@@ -46,6 +46,7 @@
                 dTn <- d(Tn)(supp)
                 ymax <- max(1/sqrt(2*pi), dTn)
                 opar <- par()
+                opar$cin <- opar$cra <- opar$csi <- opar$cxy <-  opar$din <- NULL
                 on.exit(par(opar))
                 dw <- min(diff(supp)) 
                 facD <- min(dw*2,1)

Modified: branches/distr-2.3/pkg/distrTeach/R/illustLLN.R
===================================================================
--- branches/distr-2.3/pkg/distrTeach/R/illustLLN.R	2010-04-29 14:27:46 UTC (rev 649)
+++ branches/distr-2.3/pkg/distrTeach/R/illustLLN.R	2010-04-29 14:51:48 UTC (rev 650)
@@ -71,6 +71,7 @@
   da <- matrix(NA,m,length(n))
   
   omar <- par()
+  omar$cin <- omar$cra <- omar$csi <- omar$cxy <-  omar$din <- NULL
   on.exit(par(omar))
      ## getting the parameter