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

[kapatp at users.sourceforge.net]

Revision: 2932
          http://rkward.svn.sourceforge.net/rkward/?rev=2932&view=rev
Author:   kapatp
Date:     2010-07-04 02:39:01 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
make .rk.graph.history.gui marginally efficient

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

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-07-03 22:11:48 UTC (rev 2931)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-07-04 02:39:01 UTC (rev 2932)
@@ -90,7 +90,7 @@
 			histPositions [[deviceId]] <<- if (n > 0) n + 1 else 0
 		}
 		newPlotExists [[deviceId]] <<- FALSE
-		.rk.graph.history.gui ()
+		.rk.graph.history.gui (deviceId)
 	}
 	onDelDevice <- function (deviceId = dev.cur())
 	{
@@ -176,7 +176,7 @@
 		if (n > 0 && n <= length(recorded)) {
 			histPositions [[deviceId]] <<- n
 			replayPlot(recorded[[n]])
-			.rk.graph.history.gui ()
+			.rk.graph.history.gui (deviceId)
 		}
 		else message("replay: 'n' not in valid range: ", n)
 		dev.set (cur.deviceId)
@@ -219,21 +219,29 @@
 		message ('Current positions: ', paste (unlist (histPositions), collapse = ', ')) 
 		message ('New plot exists? ', paste (unlist (newPlotExists), collapse = ', ')) 
 	}
-	.rk.graph.history.gui <- function ()
+	.rk.graph.history.gui <- function (deviceId = NULL)
 	{
 		# this function is called whenever the history length changes (ie, increases, for now)
 		# or the position changes in any device.
 		history_length <- length (recorded)
 		
-		# TODO: no need to update all devices when called from replay ()
-		ndevs <- length (histPositions)
-		if (ndevs > 1) {
-			positions <- character (1 + 2 * ndevs)
-			positions [1] <- history_length # coerced as character
-			positions [2 * (1:ndevs)] <- names (histPositions)
-			positions [1 + 2 * (1:ndevs)] <- unlist (histPositions, use.names = FALSE)
-			.rk.do.call ("updateDeviceHistory", positions);
+		if (is.null (deviceId)) {
+			# update all managed devices:
+			ndevs <- length (histPositions)
+			if (ndevs > 1) {
+				positions <- character (1 + 2 * ndevs)
+				positions [1] <- history_length # coerced as character
+				positions [2 * (1:ndevs)] <- names (histPositions)
+				positions [1 + 2 * (1:ndevs)] <- unlist (histPositions, use.names = FALSE)
+			}
+		} else {
+			# update only the one device: deviceId:
+			positions <- c(history_length, deviceId, histPositions [[as.character (deviceId)]])
+			positions <- as.character (positions)
+			names (positions) <- NULL
 		}
+		
+		.rk.do.call ("updateDeviceHistory", positions);
 		invisible (NULL)
 	}
 


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