[rkward-cvs] SF.net SVN: rkward:[2896] trunk/rkward/rkward/rbackend/rpackages/rkward/R

[kapatp at users.sourceforge.net]

Revision: 2896
          http://rkward.svn.sourceforge.net/rkward/?rev=2896&view=rev
Author:   kapatp
Date:     2010-06-24 08:41:31 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
A typo and some cosmetic changes

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal_graphics.R
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal_graphics.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal_graphics.R	2010-06-24 01:19:15 UTC (rev 2895)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal_graphics.R	2010-06-24 08:41:31 UTC (rev 2896)
@@ -84,9 +84,15 @@
 
 "dev.off" <- function (which = dev.cur ())
 {
-	# Why use 'which'? There is a which ()!!
-	if (dev.interactive () && !(which %in% .rk.preview.devices)) rk.record.plot$onDelDevice (deviceId = which)
+	.is.inter <- dev.interactive ()
+	if (.is.inter) { 
+		# Why use 'which'? There is a which ()!!
+		if (!(which %in% .rk.preview.devices)) rk.record.plot$onDelDevice (deviceId = which)
+	}
+	
 	eval (body (.rk.dev.off.default))
+	.ret.value <- .Last.value
+	return (.ret.value)
 }
 formals (dev.off) <- formals (grDevices::dev.off)
 .rk.dev.off.default <- grDevices::dev.off

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-06-24 01:19:15 UTC (rev 2895)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-06-24 08:41:31 UTC (rev 2896)
@@ -133,8 +133,8 @@
 	resetHistory <- function ()
 	{
 		recorded <<- list()
-		current <- as.list(0)
-		newPlotExists <- as.list(FALSE)
+		current <<- as.list(0)
+		newPlotExists <<- as.list(FALSE)
 		.rk.graph.history.gui (deviceId)
 	}
 	printPars <- function ()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.