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

[tfry at users.sourceforge.net]

Revision: 3713
          http://rkward.svn.sourceforge.net/rkward/?rev=3713&view=rev
Author:   tfry
Date:     2011-08-08 18:09:31 +0000 (Mon, 08 Aug 2011)

Log Message:
-----------
...and another one

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	2011-08-08 18:07:44 UTC (rev 3712)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal_graphics.R	2011-08-08 18:09:31 UTC (rev 3713)
@@ -46,15 +46,15 @@
 # set from rkward the application:
 # options(device="rk.screen.device")
 
-".rk.preview.devices" <- list ()
+.rk.variables$.rk.preview.devices <- list ()
 
 ".rk.startPreviewDevice" <- function (x) {
-	a <- .rk.preview.devices[[x]]
+	a <- .rk.variables$.rk.preview.devices[[x]]
 	if (is.null (a)) {
 		a <- dev.cur ()
 		x11 (is.preview.device = TRUE)
 		if (a != dev.cur ()) {
-			.rk.preview.devices[[x]] <<- dev.cur ()
+			.rk.variables$.rk.preview.devices[[x]] <- dev.cur ()
 		}
 	} else {
 		dev.set (a)
@@ -62,12 +62,12 @@
 }
 
 ".rk.killPreviewDevice" <- function (x) {
-	a <- .rk.preview.devices[[x]]
+	a <- .rk.variables$.rk.preview.devices[[x]]
 	if (!is.null (a)) {
 		if (a %in% dev.list ()) {
 			dev.off (a)
 		}
-		.rk.preview.devices[[x]] <<- NULL
+		.rk.variables$.rk.preview.devices[[x]] <- NULL
 	}
 }
 

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2011-08-08 18:07:44 UTC (rev 3712)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2011-08-08 18:09:31 UTC (rev 3713)
@@ -172,7 +172,7 @@
 		
 		# all open screen devices
 		.osd <- which (names (dev.list ()) %in% deviceIsInteractive ()) + 1
-		.opd <- unlist (.rk.preview.devices)
+		.opd <- unlist (.rk.variables$.rk.preview.devices)
 		# to be managed devices:
 		if (length (.opd) > 0) .osd <-.osd [!(.osd %in% .opd)]
 		if (length (.osd) == 0) return (invisible ())


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