[CHNOSZ-commits] r17 - pkg/Rpad/R

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

Author: jedick
Date: 2012-09-21 15:40:31 +0200 (Fri, 21 Sep 2012)
New Revision: 17

Modified:
   pkg/Rpad/R/Graphing.R
   pkg/Rpad/R/LocalVersion.R
Log:
Rpad: access textConnection result using get()


Modified: pkg/Rpad/R/Graphing.R
===================================================================
--- pkg/Rpad/R/Graphing.R	2012-09-21 13:21:02 UTC (rev 16)
+++ pkg/Rpad/R/Graphing.R	2012-09-21 13:40:31 UTC (rev 17)
@@ -78,7 +78,7 @@
   assign("Rpad.plot.type", type, envir = .RpadEnv)
   if (is.character(type) && type == "Rpng") { # for builtin png support
     unlink(grep(paste(name,".*\\.png",sep=""), dir(), value=T))
-    png(file = paste(name,"-%03d.png",sep=""), width = width*res, height = height*res)
+    png(filename = paste(name,"-%03d.png",sep=""), width = width*res, height = height*res)
     assign("RpadPlotParams", list(dev=dev.cur(), extension="png"), envir = .RpadEnv)
   } else if (is.function(type)) { # for an arbitrary R graphics device
     unlink(grep(paste(name,".*\\.", extension, sep=""), dir(), value=T))

Modified: pkg/Rpad/R/LocalVersion.R
===================================================================
--- pkg/Rpad/R/LocalVersion.R	2012-09-21 13:21:02 UTC (rev 16)
+++ pkg/Rpad/R/LocalVersion.R	2012-09-21 13:40:31 UTC (rev 17)
@@ -17,12 +17,12 @@
     guiSource(textcommands)
     sink()
     close(tc)
-    textfromconnection
+    get("textfromconnection")
   }, error=function(e) {
     sink()
     close(tc)
     cat('ERROR1: ')
-    paste(paste(textfromconnection, "\n", collapse=""), '\n', e)},
+    paste(paste(get("textfromconnection"), "\n", collapse=""), '\n', e)},
                       finally=close(textcommands))
   dev.set(.dev.active)
   formattedresults <- paste(results,"\n",sep="",collapse="")