[Zooimage-commits] r111 - in pkg/zooimage: . R inst/gui man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Apr 27 10:12:48 CEST 2009
Author: romain
Date: 2009-04-27 10:12:48 +0200 (Mon, 27 Apr 2009)
New Revision: 111
Modified:
pkg/zooimage/NAMESPACE
pkg/zooimage/R/utilities.r
pkg/zooimage/R/zie.r
pkg/zooimage/R/zzz.r
pkg/zooimage/inst/gui/MenusZIDlgWin.txt
pkg/zooimage/man/utilities.Rd
Log:
s/Setwd/setwd/
Modified: pkg/zooimage/NAMESPACE
===================================================================
--- pkg/zooimage/NAMESPACE 2009-04-27 08:08:12 UTC (rev 110)
+++ pkg/zooimage/NAMESPACE 2009-04-27 08:12:48 UTC (rev 111)
@@ -102,7 +102,7 @@
export(saveObjects)
export(selectFile)
export(setKey)
-export(Setwd)
+export(setwd)
export(Spectrum)
export(Spectrum.sample)
export(startPgm)
Modified: pkg/zooimage/R/utilities.r
===================================================================
--- pkg/zooimage/R/utilities.r 2009-04-27 08:08:12 UTC (rev 110)
+++ pkg/zooimage/R/utilities.r 2009-04-27 08:12:48 UTC (rev 111)
@@ -511,12 +511,12 @@
}
# }}}
-# {{{ Setwd
+# {{{ setwd
#' Change the working directory and update the ZooImage assistant status bar
-"Setwd" <- function(dir) {
- ### TODO: this does not work if dir is changed from Rgui menu or from setwd()!
+setwd <- function(dir) {
# My own setwd() function that also updates the Tk window statusbar
- .Internal(setwd(dir))
+ base::setwd(dir)
+
# Possibly update the statusbar
if ("ZIDlgWin" %in% WinNames() && is.null(getTemp("statusBusy"))) {
tkconfigure(getTemp("statusText"), text = paste("Ready -", getwd()))
Modified: pkg/zooimage/R/zie.r
===================================================================
--- pkg/zooimage/R/zie.r 2009-04-27 08:08:12 UTC (rev 110)
+++ pkg/zooimage/R/zie.r 2009-04-27 08:12:48 UTC (rev 111)
@@ -147,7 +147,7 @@
# {{{ make.zie
#' @examples
-#' Setwd("g:/zooplankton/Madagascar2Macro") # My example directory
+#' setwd("g:/zooplankton/Madagascar2Macro") # My example directory
#' make.zie(path = ".", Filemap = "Import_Madagascar2Macro.zie")
"make.zie" <- function(path = ".", Filemap = "Import_Table.zie", check = TRUE, replace = FALSE,
move.to.raw = TRUE, zip.images = "[.][tT][iI][fF]$", show.log = TRUE, bell = FALSE) {
@@ -685,7 +685,7 @@
# {{{ compile.zie
#' @examples
-#' Setwd("g:/zooplankton/Madagascar2Macro") # Directory with the example dataset
+#' setwd("g:/zooplankton/Madagascar2Macro") # Directory with the example dataset
#' compile.zie(Tablefile = "Madagascar2Macro.txt", Nrange = c(2,2))
"compile.zie" <- function(path = ".", Tablefile = "Table.txt",
Template = "ImportTemplate.zie", Filemap = paste("Import_", noext(Tablefile), ".zie", sep = ""),
@@ -807,7 +807,7 @@
#' Read most important EXIF data from a Digicam RAW file
#'
#' @examples
-#' Setwd("g:/zooplankton/Madagascar2Macro") # Directory with the example dataset
+#' setwd("g:/zooplankton/Madagascar2Macro") # Directory with the example dataset
#' (Res <- readExifRaw("Image_0742.CR2"))
"readExifRaw" <- function(rawfile, full = FALSE, check = TRUE) {
@@ -886,7 +886,7 @@
#' Check a blank-field image, either in .pgm or in .tif format
#'
#' @examples
-#' Setwd("g:/zooplankton/Madagascar2Macro") # Directory with the example dataset
+#' setwd("g:/zooplankton/Madagascar2Macro") # Directory with the example dataset
#' checkBF("test.pgm")
#' checkBF("test.tif")
"checkBF" <- function(BFfile) {
@@ -950,7 +950,7 @@
# {{{ calibrate
#' calibrates
#' @examples
-#' Setwd("g:/zooplankton/madagascar2macro")
+#' setwd("g:/zooplankton/madagascar2macro")
#' calibrate("test.tif")
"calibrate" <- function(ODfile) {
### TODO: include also a spatial calibration procedure
@@ -1089,7 +1089,7 @@
#' The function returns TRUE in case of success... or an explicit error message
#'
#' @examples
-#' Setwd("g:/zooplankton/madagascar2macro")
+#' setwd("g:/zooplankton/madagascar2macro")
#' BFcorrection("_CalibOD03.pgm", "_CalibBF03.pgm")
#' @throws this calls many xite scripts and might generate errors
"BFcorrection" <- function(File, BFfile, deleteBF = TRUE, check = TRUE) {
@@ -1174,7 +1174,7 @@
#' Convert a RAW file (digital camera) into a pgm file
#'
#' @examples
-#' Setwd("d:/ZI examples/MacroG16-example")
+#' setwd("d:/ZI examples/MacroG16-example")
#' RawConvert("Image_3822.CR2", fake = TRUE)
#' RawConvert("Image_3822.CR2")
#' @todo can we not do this in the the ImageJ plugin directly
Modified: pkg/zooimage/R/zzz.r
===================================================================
--- pkg/zooimage/R/zzz.r 2009-04-27 08:08:12 UTC (rev 110)
+++ pkg/zooimage/R/zzz.r 2009-04-27 08:12:48 UTC (rev 111)
@@ -185,7 +185,7 @@
# {{{ Switch to the default directory, if defined
defdir <- getKey("DefaultDirectory", "")
if (defdir != "" && file.exists(defdir) && file.info(defdir)$isdir){
- Setwd(defdir)
+ setwd(defdir)
}
# }}}
Modified: pkg/zooimage/inst/gui/MenusZIDlgWin.txt
===================================================================
--- pkg/zooimage/inst/gui/MenusZIDlgWin.txt 2009-04-27 08:08:12 UTC (rev 110)
+++ pkg/zooimage/inst/gui/MenusZIDlgWin.txt 2009-04-27 08:12:48 UTC (rev 111)
@@ -109,7 +109,7 @@
|||&Activate next ~~ {dev.set(); if( isWin() ) bringToTop()}
|||&Close all ~~ graphics.off()
|$Options
-||Change &active dir... ~~ Setwd(paste(tkchooseDirectory(), collapse = " "))
+||Change &active dir... ~~ setwd(paste(tkchooseDirectory(), collapse = " "))
||-
||Define decimal separator... ~~ optInOutDecimalSep()
|$Help
Modified: pkg/zooimage/man/utilities.Rd
===================================================================
--- pkg/zooimage/man/utilities.Rd 2009-04-27 08:08:12 UTC (rev 110)
+++ pkg/zooimage/man/utilities.Rd 2009-04-27 08:12:48 UTC (rev 111)
@@ -16,7 +16,7 @@
\alias{Progress}
\alias{selectFile}
\alias{setKey}
-\alias{Setwd}
+\alias{setwd}
\alias{trim}
\alias{underscore2space}
\alias{ZIpgm}
@@ -52,7 +52,7 @@
parse.ini(data, label = "1")
Progress(value, max.value = NULL)
-Setwd(dir)
+setwd(dir)
getKey(key, default.value = NULL)
setKey(key, value, type = "sz")
@@ -122,7 +122,7 @@
various different ini files are merged together (typically using \code{list.add()} or
\code{list.merge()}.
- Nothing for \code{Progress()} and \code{Setwd()}.
+ Nothing for \code{Progress()} and \code{setwd()}.
For \code{getKey()}, either the content of the key, or the default.value is returned.
\code{setKey()} returns \code{TRUE} or \code{FALSE}, depending if the key=value was
More information about the Zooimage-commits
mailing list