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

[kapatp at users.sourceforge.net]

Revision: 3043
          http://rkward.svn.sourceforge.net/rkward/?rev=3043&view=rev
Author:   kapatp
Date:     2010-09-17 06:55:29 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
some more cleanup

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-09-17 06:49:51 UTC (rev 3042)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-09-17 06:55:29 UTC (rev 3043)
@@ -204,7 +204,6 @@
 		devId <- as.character (devId)
 		histPositions [[devId]]$plot <<- trellis.last.object ()
 		histPositions [[devId]]$tlo.ls <<- get ("lattice.status", envir = lattice:::.LatticeEnv)
-		.my.hP.print (devId)
 		invisible ()
 	}
 	.prep.new.device <- function (devId, pkg, .cstr)
@@ -514,7 +513,6 @@
 		histPositions [[devId]] <<- modifyList (.hP.template, 
 			list (is.this.plot.new = FALSE, is.this.dev.new = FALSE, pos.prev = n, pos.cur = n, pkg = pkg, 
 				call = savedPlots [[st]]$call, plot = savedPlots [[st]]$plot, tlo.ls = savedPlots [[st]]$tlo.ls))
-		.my.hP.print (devId)
 		.rk.dev.set.default (cur.devId)
 		invisible()
 	}
@@ -636,7 +634,7 @@
 	.get.plot.info.str <- function (devId = dev.cur (), l=0)
 	{
 		devId <- as.character (devId)
-		if (!(devId %in% .hP.names)) return (invisible (rk.show.message (paste ("Device", devId, "is not managed."), wait = FALSE)))
+		if (!(devId %in% .hP.names)) return (paste ("Device", devId, "is not managed."))
 		
 		n <- histPositions [[devId]]$pos.cur
 		if (is.na (n)) {

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-09-17 06:49:51 UTC (rev 3042)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-09-17 06:55:29 UTC (rev 3043)
@@ -394,7 +394,6 @@
 void RKCaughtX11Window::duplicateDevice () {
 	RK_TRACE (MISC);
 
-// 	RKGlobals::rInterface ()->issueCommand ("dev.set (" + QString::number (device_number) + ")\ndev.copy (device=x11)", RCommand::App, i18n ("Duplicate graphics device number %1", device_number), error_dialog);
 	RKGlobals::rInterface ()->issueCommand ("rk.duplicate.device (" + QString::number (device_number) + ")", RCommand::App, i18n ("Duplicate graphics device number %1", device_number), error_dialog);
 }
 
@@ -442,7 +441,6 @@
 	RK_TRACE (MISC);
 
 	RKGlobals::rInterface ()->issueCommand ("rk.force.append.plot (" + QString::number (device_number) + ')', RCommand::App, i18n ("Append this plot to history (device number %1)", device_number), error_dialog);
-	//updateHistoryActions (history_length+1, history_length+1);
 }
 
 void RKCaughtX11Window::removeCurrentPlot () {
@@ -457,7 +455,6 @@
 	if (KMessageBox::warningContinueCancel (this, i18n ("This will clear the plot history for all device windows, not just this one. If this is not your intent, press cancel, below.")) != KMessageBox::Continue) return;
 
 	RKGlobals::rInterface ()->issueCommand ("rk.clear.plot.history ()", RCommand::App, i18n ("Clear plot history"), error_dialog);
-	//updateHistoryActions (0, 0);
 }
 
 void RKCaughtX11Window::showPlotInfo () {


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