[Zooimage-commits] r89 - pkg/zooimage/R

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

Author: romain
Date: 2009-04-20 17:29:22 +0200 (Mon, 20 Apr 2009)
New Revision: 89

Removed:
   pkg/zooimage/R/choosefiles.R
   pkg/zooimage/R/templates.R
Modified:
   pkg/zooimage/R/utilities.r
Log:
moving functions to utilities

Deleted: pkg/zooimage/R/choosefiles.R
===================================================================
--- pkg/zooimage/R/choosefiles.R	2009-04-20 15:21:59 UTC (rev 88)
+++ pkg/zooimage/R/choosefiles.R	2009-04-20 15:29:22 UTC (rev 89)
@@ -1,15 +0,0 @@
-
-
-if( !isWin() ){
-	# choose.files is only available on windows, so we fall 
-	# back on tcl-tk equivalent function
-	choose.files <- function( default = "", caption = "Select files",
-	     multi = TRUE, filters = Filters,
-		 index = nrow(Filters) ){
-		
-		call <- match.call( )
-		call[[1]] <- as.name( "tk_choose.files")
-		eval( call, envir = parent.frame() )	
-	}
-}
-

Deleted: pkg/zooimage/R/templates.R
===================================================================
--- pkg/zooimage/R/templates.R	2009-04-20 15:21:59 UTC (rev 88)
+++ pkg/zooimage/R/templates.R	2009-04-20 15:29:22 UTC (rev 89)
@@ -1,8 +0,0 @@
-
-#' get a template file from the "ZITemplate" option
-template <- function( file = "default.zim", dir = getOption("ZITemplates") ){
-	f <- file.path( dir, file )
-	checkFileExists( f, "template file '%s' does not exist" )
-	f
-}
-

Modified: pkg/zooimage/R/utilities.r
===================================================================
--- pkg/zooimage/R/utilities.r	2009-04-20 15:21:59 UTC (rev 88)
+++ pkg/zooimage/R/utilities.r	2009-04-20 15:29:22 UTC (rev 89)
@@ -788,4 +788,25 @@
 		} )
 }
 
+if( !isWin() ){
+	# choose.files is only available on windows, so we fall 
+	# back on tcl-tk equivalent function
+	choose.files <- function( default = "", caption = "Select files",
+	     multi = TRUE, filters = Filters,
+		 index = nrow(Filters) ){
+		
+		call <- match.call( )
+		call[[1]] <- as.name( "tk_choose.files")
+		eval( call, envir = parent.frame() )	
+	}
+}
+
+
+#' get a template file from the "ZITemplate" option
+template <- function( file = "default.zim", dir = getOption("ZITemplates") ){
+	f <- file.path( dir, file )
+	checkFileExists( f, "template file '%s' does not exist" )
+	f
+}
+
 # :tabSize=4:indentSize=4:noTabs=false:folding=explicit:collapseFolds=1: