[Robast-commits] r401 - in branches/robast-0.8/pkg/RobAStBase: R man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Apr 29 19:27:24 CEST 2010
Author: ruckdeschel
Date: 2010-04-29 19:27:24 +0200 (Thu, 29 Apr 2010)
New Revision: 401
Modified:
branches/robast-0.8/pkg/RobAStBase/R/infoPlot.R
branches/robast-0.8/pkg/RobAStBase/man/comparePlot.Rd
branches/robast-0.8/pkg/RobAStBase/man/infoPlot.Rd
Log:
and forgot to commit the other changes...
Modified: branches/robast-0.8/pkg/RobAStBase/R/infoPlot.R
===================================================================
--- branches/robast-0.8/pkg/RobAStBase/R/infoPlot.R 2010-04-29 17:26:16 UTC (rev 400)
+++ branches/robast-0.8/pkg/RobAStBase/R/infoPlot.R 2010-04-29 17:27:24 UTC (rev 401)
@@ -6,7 +6,8 @@
main = FALSE, inner = TRUE, sub = FALSE,
col.inner = par("col.main"), cex.inner = 0.8,
bmar = par("mar")[1], tmar = par("mar")[3],
- legend.location = "bottomright",
+ with.legend = TRUE, legend.bg = "white",
+ legend.location = "bottomright", legend.cex = 0.8,
mfColRow = TRUE, to.draw.arg = NULL,
cex.pts = 1, col.pts = par("col"),
pch.pts = 1, jitter.fac = 1, with.lab = FALSE,
@@ -234,7 +235,7 @@
on.exit(options(warn = w0))
opar <- par()
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
- on.exit(par(opar))
+ if(mfColRow) on.exit(par(opar))
# if (!withSweave)
# devNew()
@@ -368,10 +369,12 @@
dotsP))
do.call(lines, args=c(list(x.vec, absInfo, type = plty,
lty = lty, lwd = lwd, col = col), dotsL))
- legend(legend.location[[1]],
+ if(with.legend)
+ legend(legend.location[[1]],
legend = c("class. opt. IC", objectc),
+ bg = legend.bg,
lty = c(ltyI, lty), col = c(colI, col),
- lwd = c(lwdI, lwd), cex = 0.75)
+ lwd = c(lwdI, lwd), cex = legend.cex*.75/.8)
dotsT["main"] <- NULL
dotsT["cex.main"] <- NULL
@@ -411,10 +414,12 @@
yc.vec <- sapply(x.vec, classIC.i.5 at Map[[indi]])^2/absInfoClass
do.call(lines, args = c(list(x.vec, yc.vec, type = plty,
lty = ltyI, col = colI, lwd = lwdI), dotsL))
- legend(legend.location[[i+in1to.draw]],
+ if(with.legend)
+ legend(legend.location[[i+in1to.draw]],
+ bg = legend.bg,
legend = c("class. opt. IC", objectc),
col = c(colI, col), lwd = c(lwdI, lwd),
- lty = c(ltyI, lty), cex = 0.6)
+ lty = c(ltyI, lty), cex = legend.cex*6/8)
if(innerL)
do.call(title, args = c(list(main = innerT[[1+indi]]),
dotsT, line = lineT, cex.main = cex.inner,
Modified: branches/robast-0.8/pkg/RobAStBase/man/comparePlot.Rd
===================================================================
--- branches/robast-0.8/pkg/RobAStBase/man/comparePlot.Rd 2010-04-29 17:26:16 UTC (rev 400)
+++ branches/robast-0.8/pkg/RobAStBase/man/comparePlot.Rd 2010-04-29 17:27:24 UTC (rev 401)
@@ -16,7 +16,8 @@
col = par("col"), lwd = par("lwd"), lty,
col.inner = par("col.main"), cex.inner = 0.8,
bmar = par("mar")[1], tmar = par("mar")[3],
- legend.location = "bottomright",
+ with.legend = TRUE, legend.bg = "white",
+ legend.location = "bottomright", legend.cex = 0.8,
mfColRow = TRUE, to.draw.arg = NULL,
cex.pts = 1, col.pts = par("col"),
pch.pts = 1, jitter.fac = 1, with.lab = FALSE,
@@ -51,9 +52,12 @@
to the current setting of \code{cex}; as in
\code{\link[graphics]{par}}}
\item{col.inner}{character or integer code; color for the inner title}
+ \item{with.legend}{logical; shall a legend be plotted?}
\item{legend.location}{a valid argument \code{x} for \code{\link{legend}} ---
the place where to put the legend on the last issued
plot}
+ \item{legend.bg}{background color for the legend}
+ \item{legend.cex}{magnification factor for the legend}
\item{mfColRow}{shall default partition in panels be used --- defaults to \code{TRUE}}
\item{to.draw.arg}{Either \code{NULL} (default;
everything is plotted) or a vector of either integers
Modified: branches/robast-0.8/pkg/RobAStBase/man/infoPlot.Rd
===================================================================
--- branches/robast-0.8/pkg/RobAStBase/man/infoPlot.Rd 2010-04-29 17:26:16 UTC (rev 400)
+++ branches/robast-0.8/pkg/RobAStBase/man/infoPlot.Rd 2010-04-29 17:27:24 UTC (rev 401)
@@ -16,7 +16,8 @@
main = FALSE, inner = TRUE, sub = FALSE,
col.inner = par("col.main"), cex.inner = 0.8,
bmar = par("mar")[1], tmar = par("mar")[3],
- legend.location = "bottomright",
+ with.legend = TRUE, legend.bg = "white",
+ legend.location = "bottomright", legend.cex = 0.8,
mfColRow = TRUE, to.draw.arg = NULL,
cex.pts = 1, col.pts = par("col"),
pch.pts = 1, jitter.fac = 1, with.lab = FALSE,
@@ -52,10 +53,13 @@
to the current setting of \code{cex}; as in
\code{\link[graphics]{par}}}
\item{col.inner}{character or integer code; color for the inner title}
+ \item{with.legend}{logical; shall a legend be plotted?}
\item{legend.location}{a valid argument \code{x} for \code{\link{legend}} ---
the place where to put the legend on the last issued
plot --- or a list of length (number of plotted panels)
of such arguments, one for each plotted panel.}
+ \item{legend.bg}{background color for the legend}
+ \item{legend.cex}{magnification factor for the legend}
\item{mfColRow}{shall default partition in panels be used --- defaults to \code{TRUE}}
\item{to.draw.arg}{Either \code{NULL} (default;
everything is plotted) or a vector making a selection
More information about the Robast-commits
mailing list