- Corrected the use of the par() function, so no

  unnecessary devices are opened any more
- Adjusted the .Rout.save files to kriemhilds version
  (R 2.3.0 from Debian unstable, i386)



git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/drfit@78 d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc

5 files changed, 15 insertions, 21 deletions

diff --git a/DESCRIPTION b/DESCRIPTION
index fa83085..7182eda 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: drfit
-Version: 0.05-77
-Date: 2006-05-05
+Version: 0.05-78
+Date: 2006-05-08
 Title: Dose-response data evaluation
 Author: Johannes Ranke <jranke@uni-bremen.de>
 Maintainer: Johannes Ranke <jranke@uni-bremen.de>
diff --git a/R/checkexperiment.R b/R/checkexperiment.R
index fb83432..3078ca5 100644
--- a/R/checkexperiment.R
+++ b/R/checkexperiment.R
@@ -1,7 +1,5 @@
 checkexperiment <- function(id,db="ecotox")
 {
-    op <- par(no.readonly = TRUE)
-
     databases <- data.frame(
         responsetype=c("viability","activity","response"),
         testtype=c("celltype","enzyme","organism"),
@@ -31,7 +29,8 @@ checkexperiment <- function(id,db="ecotox")
 
     odbcClose(channel)
 
-    par(ask=TRUE)
+    op <- par(ask=TRUE)
+    on.exit(par(op))
 
     if (db %in% c("cytotox","enzymes")) {
         blinds <- subset(controldata,type=="blind")
@@ -119,7 +118,4 @@ checkexperiment <- function(id,db="ecotox")
     legend("topright",substances, pch=1, col=1:length(substances), inset=0.05)
     title(main=paste(levels(expdata$experimentator),
         " - ",levels(expdata$type)))
-
-    # Reset the graphics parameters to previous setting
-    par(op)
 }
diff --git a/R/drplot.R b/R/drplot.R
index e690653..120a4b5 100644
--- a/R/drplot.R
+++ b/R/drplot.R
@@ -7,7 +7,6 @@ drplot <- function(drresults, data,
         pointsize = 12,
         colors = 1:8, devoff=T, lpos="topright")
 {
-    op <- par(no.readonly = TRUE)
     # Check if all data have the same unit
     unitlevels <- levels(as.factor(drresults$unit))
     if (length(unitlevels) == 1) {
@@ -88,6 +87,7 @@ drplot <- function(drresults, data,
         # If overlay plot is not requested, ask before showing multiple plots on the screen
         if (!postscript && !png && !pdf && length(dsubstances) > 1) {
             op <- par(ask=TRUE)
+            on.exit(par(op))
         } 
     }
 
@@ -220,6 +220,4 @@ drplot <- function(drresults, data,
             dev.off()
         }
     }
-    # Reset the ask parameter to previous setting
-    par(op)
 }
diff --git a/tests/IM1xIPC81.Rout.save b/tests/IM1xIPC81.Rout.save
index b56b8c9..5d9bcc7 100644
--- a/tests/IM1xIPC81.Rout.save
+++ b/tests/IM1xIPC81.Rout.save
@@ -76,5 +76,5 @@ Waiting for profiling to be done...
 5 2.6617385   然 0.2375857 2.5785719 2.300216 0.01468034
 6 1.7418917   然 0.2324871 1.6806040 2.237338 0.05719295
 7 1.7031463   然 0.1452716 1.6496121 1.976976 0.10956088
-8 0.8544213   然 0.2987708 0.7696961 1.936253 0.45808612
+8 0.8544213   然 0.2987708 0.7696961 1.936253 0.45808611
 > 
diff --git a/tests/pyrithione.Rout.save b/tests/pyrithione.Rout.save
index 2a05dd8..553f91b 100644
--- a/tests/pyrithione.Rout.save
+++ b/tests/pyrithione.Rout.save
@@ -72,30 +72,30 @@ NaJ: Fitting data...
 1  Na Pyrithion  20 108 -2.107210 2.00000 linlogit -0.3461318         NA
 2       Pyridin  19 161  0.591760 3.69897 inactive         NA         NA
 3          PyNO  19  81  0.591760 3.69897   no fit         NA         NA
-4         (PT)2  19  81 -2.408240 2.00000 linlogit -0.4197042 -0.5326102
+4         (PT)2  19  81 -2.408240 2.00000 linlogit -0.4197031 -0.5326102
 5         MSO2P  28 108 -1.709271 3.69897 inactive         NA         NA
 6         MSPHI  19  81  0.591760 3.69897   probit  3.6625025  3.5548278
 7           PyS  18  80 -0.408240 3.00000   probit  2.6817944         NA
-8  Zn Pyrithion  27  81 -2.107210 2.00000 linlogit -0.4132886 -0.5293327
+8  Zn Pyrithion  27  81 -2.107210 2.00000 linlogit -0.4132885 -0.5293327
 9  Cu Pyrithion  19  79 -2.408240 2.00000 linlogit -0.3074717 -0.4753489
-10 Fe Pyrithion  19  81 -2.408240 2.00000 linlogit -0.3534573 -0.5003829
+10 Fe Pyrithion  19  81 -2.408240 2.00000 linlogit -0.3534572 -0.5003829
 11       (PyS)2  20  81 -0.408240 3.00000   probit  1.7840499  1.6726792
 12         MSPT  18 108 -0.408240 3.00000   probit  2.1384811  2.0709306
 13          TBT  38 135 -2.709271 2.39794 linlogit -0.1580954 -0.2602139
 14          NaJ  10 108  0.591760 3.30103 inactive         NA         NA
          97.5% unit      sigma          a         b           c
-1           NA   然 0.20857751 -0.3461318 2.1188275 -0.26698926
+1           NA   然 0.20857751 -0.3461318 2.1188272 -0.26698979
 2           NA   然         NA         NA        NA          NA
 3           NA   然 0.09188853         NA        NA          NA
-4           NA   然 0.20509070 -0.4197042 1.8467290 -0.51505615
+4           NA   然 0.20509070 -0.4197031 1.8466994 -0.51508088
 5           NA   然         NA         NA        NA          NA
 6   3.88053203   然 0.12943273  3.6625025 0.4387540          NA
 7           NA   然 0.13401920  2.6817944 0.1250523          NA
-8  -0.29979846   然 0.22877916 -0.4132886 1.7424848  0.61079006
-9  -0.15442805   然 0.24494451 -0.3074717 1.0150650 -0.04897413
-10 -0.21459555   然 0.23383185 -0.3534573 1.1823561  0.02510663
+8  -0.29979846   然 0.22877916 -0.4132885 1.7424846  0.61078660
+9  -0.15442805   然 0.24494451 -0.3074717 1.0150649 -0.04897422
+10 -0.21459555   然 0.23383185 -0.3534572 1.1823558  0.02510613
 11  1.88824519   然 0.23298721  1.7840499 0.4098018          NA
 12  2.20511512   然 0.22881257  2.1384811 0.2112625          NA
-13 -0.05045493   然 0.19264079 -0.1580954 1.0406577 -0.02416082
+13 -0.05045493   然 0.19264079 -0.1580954 1.0406576 -0.02416104
 14          NA   然         NA         NA        NA          NA
 >