[rkward-cvs] SF.net SVN: rkward:[2968] trunk/rkward/rkward

[kapatp at users.sourceforge.net]

Revision: 2968
          http://rkward.svn.sourceforge.net/rkward/?rev=2968&view=rev
Author:   kapatp
Date:     2010-08-26 06:40:19 +0000 (Thu, 26 Aug 2010)

Log Message:
-----------
Set, if relevant, trellis.last.object () when activating a screen device.

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

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-08-26 06:36:21 UTC (rev 2967)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-08-26 06:40:19 UTC (rev 2968)
@@ -55,6 +55,12 @@
 	rk.record.plot$.set.isDuplicate (FALSE)
 }
 
+"rk.activate.device" <- function (deviceId = dev.cur ())
+{
+	dev.set (deviceId)
+	rk.record.plot$.set.trellis.last.object (deviceId)
+}
+
 # A global history of various graphics calls; trellis / grid graphics is not supported yet
 "rk.record.plot" <- function ()
 {

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-08-26 06:36:21 UTC (rev 2967)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-08-26 06:40:19 UTC (rev 2968)
@@ -327,7 +327,7 @@
 void RKCaughtX11Window::activateDevice () {
 	RK_TRACE (MISC);
 
-	RKGlobals::rInterface ()->issueCommand ("dev.set (" + QString::number (device_number) + ')', RCommand::App, i18n ("Activate graphics device number %1", device_number), error_dialog);
+	RKGlobals::rInterface ()->issueCommand ("rk.activate.device (" + QString::number (device_number) + ")", RCommand::App, i18n ("Activate graphics device number %1", device_number), error_dialog);
 }
 
 void RKCaughtX11Window::copyDeviceToOutput () {


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