diff options
| author | ranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc> | 2006-04-28 14:08:02 +0000 |
|---|---|---|
| committer | ranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc> | 2006-04-28 14:08:02 +0000 |
| commit | 8eea91d691ee60f0ce5bd3560f2e4b7e5820556a (patch) | |
| tree | d35a44edb41b5f31c49cb90277392eb2b0735740 | |
| parent | 6d220f8d71564a0430473ab2465e169adddb02d8 (diff) | |
I also removed the get(getOption("device"))()
call from the checkexperiment function, and updated the INDEX.
git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/drfit@75 d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc
| -rw-r--r-- | DESCRIPTION | 2 | ||||
| -rw-r--r-- | INDEX | 2 | ||||
| -rw-r--r-- | R/checkexperiment.R | 10 |
3 files changed, 10 insertions, 4 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index b860b9b..5d92da7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: drfit -Version: 0.05-74 +Version: 0.05-75 Date: 2006-04-28 Title: Dose-response data evaluation Author: Johannes Ranke <jranke@uni-bremen.de> @@ -2,7 +2,7 @@ antifoul Dose-Response data for TBT and Zink Pyrithione in IPC-81 cells checkexperiment Check raw data from a specified experiment or microtiter plate -drdata Get dose-response data +drdata Get dose-response data via RODBC drfit Fit dose-response models drfit-package Dose-response data evaluation drplot Plot dose-response models diff --git a/R/checkexperiment.R b/R/checkexperiment.R index c29b1e5..fb83432 100644 --- a/R/checkexperiment.R +++ b/R/checkexperiment.R @@ -1,5 +1,7 @@ checkexperiment <- function(id,db="ecotox") { + op <- par(no.readonly = TRUE) + databases <- data.frame( responsetype=c("viability","activity","response"), testtype=c("celltype","enzyme","organism"), @@ -29,6 +31,8 @@ checkexperiment <- function(id,db="ecotox") odbcClose(channel) + par(ask=TRUE) + if (db %in% c("cytotox","enzymes")) { blinds <- subset(controldata,type=="blind") controls <- subset(controldata,type=="control") @@ -77,8 +81,7 @@ checkexperiment <- function(id,db="ecotox") "\tcontrol\t",numberOfControls,"\t",meanOfControls,"\t", stdOfControls,"\t\t",percentstdOfcontrols,"\n") - get(getOption("device"))(width=10,height=5) - par(mfcol=c(1,2)) + if (db == "ecotox") { boxplot(controls$response, names="controls", @@ -116,4 +119,7 @@ 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) } |