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

[kapatp at users.sourceforge.net]

Revision: 3017
          http://rkward.svn.sourceforge.net/rkward/?rev=3017&view=rev
Author:   kapatp
Date:     2010-09-12 02:02:38 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
small cleanup

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-09-12 00:29:19 UTC (rev 3016)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-09-12 02:02:38 UTC (rev 3017)
@@ -279,7 +279,7 @@
 		st <- .get.sys.time ()
 		n <- switch (histPositions[[devId]]$pkg,
 			graphics = .record.graphics (devId, action, newplot.in.Q, st),
-			unknown = .record.graphics (devId, action, newplot.in.Q, st, TRUE),
+			unknown = .record.graphics (devId, action, newplot.in.Q, st, "unknown"),
 			lattice = .record.lattice (devId, action, newplot.in.Q, st),
 			NA_integer_)
 		
@@ -304,11 +304,10 @@
 		getDevSummary ()
 		invisible ()
 	}
-	.record.graphics <- function (devId, action, newplot.in.Q, st, unk = FALSE)
+	.record.graphics <- function (devId, action, newplot.in.Q, st, pkg = "graphics")
 	{
-		.pkg <- ifelse (unk, "unknown", "graphics")
-		.my.message ("in: .record.", .pkg)
-		.record.main (devId, .pkg)
+		.my.message ("in: .record.", pkg)
+		.record.main (devId, pkg)
 		if (is.null (.unsavedPlot$plot)) return (invisible (NA_integer_))
 		
 		if (histPositions [[devId]]$is.this.plot.new) {
@@ -322,7 +321,7 @@
 		.my.message ("save.mode: ", save.mode)
 		
 		n <- save.plot.to.history (devId, save.mode, 
-			ifelse (action == "force.append", "unknown", .pkg), 
+			ifelse (action == "force.append", "unknown", pkg), 
 			st, histPositions[[devId]]$call)
 		.my.message ("'n' = ", n, " (RET from save.plot.to.history)")
 		invisible (n)


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