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

[kapatp at users.sourceforge.net]

Revision: 3012
          http://rkward.svn.sourceforge.net/rkward/?rev=3012&view=rev
Author:   kapatp
Date:     2010-09-11 09:03:20 +0000 (Sat, 11 Sep 2010)

Log Message:
-----------
For consistency and easier handling, remove direct calls to rk.record.plot$... from C++ code

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
    trunk/rkward/rkward/settings/rksettingsmoduleoutput.cpp
    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-11 08:23:40 UTC (rev 3011)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-09-11 09:03:20 UTC (rev 3012)
@@ -598,10 +598,8 @@
 	}
 	showPlotInfo <- function (devId = dev.cur ())
 	{
-		.my.message ("------- call begin -----------")
 		.my.message ("in: showPlotInfo")
 		rk.show.message (.get.plot.info.str (devId), caption = "Plot properties")
-		.my.message ("------- call end   -----------")
 	}
 	
 	## Utility / print functions:
@@ -770,13 +768,9 @@
 	}
 	.verify.hist.limits <- function (len.max)
 	{
-		.my.message ("------- call begin -----------")
 		.my.message ("in: verify.hist.limits")
 		# this is called from settings/rksettingsmoduleoutput.cpp ~199
 		# Length restriction:
-		len.max <- as.integer (len.max)
-		#len.max <- getOption ('rk.graphics.hist.max.length')
-		
 		if (len.max < sP.length) {
 			ans <- rk.show.question (paste ("Current plot history has more plots than the specified limit.\nIf you continue then _",
 				sP.length - len.max, "_ of the foremost plots will be removed.\nInstead, if you ignore then the new limit will be effective only after restarting RKWard.", sep =""), 
@@ -794,7 +788,6 @@
 		# Size restriction:
 		#s <- getOption ('rk.graphics.hist.max.plotsize')
 		# Existing plots are not checked for their sizes, only the new ones are.
-		.my.message ("------- call end   -----------")
 	}
 
 	env
@@ -854,3 +847,21 @@
 	rk.record.plot$getDevSummary ()
 	rk.record.plot$.my.message ("------- call end   -----------")
 }
+"rk.clear.plot.history" <- function ()
+{
+	rk.record.plot$.my.message ("------- call begin -----------")
+	rk.record.plot$clearHistory ()
+	rk.record.plot$.my.message ("------- call end   -----------")
+}
+"rk.show.plot.info" <- function (devId = dev.cur ())
+{
+	rk.record.plot$.my.message ("------- call begin -----------")
+	rk.record.plot$showPlotInfo (devId)
+	rk.record.plot$.my.message ("------- call end   -----------")
+}
+"rk.verify.plot.hist.limits" <- function (lmax)
+{
+	rk.record.plot$.my.message ("------- call begin -----------")
+	rk.record.plot$.verify.hist.limits (as.integer (lmax))
+	rk.record.plot$.my.message ("------- call end   -----------")
+}

Modified: trunk/rkward/rkward/settings/rksettingsmoduleoutput.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduleoutput.cpp	2010-09-11 08:23:40 UTC (rev 3011)
+++ trunk/rkward/rkward/settings/rksettingsmoduleoutput.cpp	2010-09-11 09:03:20 UTC (rev 3012)
@@ -196,7 +196,7 @@
 	if (graphics_type == "\"JPG\"") command.append (", \"rk.graphics.jpg.quality\"=" + QString::number (graphics_jpg_quality));
 	//command.append (", \"rk.graphics.hist.max.length\"=" + QString::number (graphics_hist_max_length));
 	command.append (", \"rk.graphics.hist.max.plotsize\"=" + QString::number (graphics_hist_max_plotsize));
-	list.append (command + ")\nrk.record.plot$.verify.hist.limits (" + QString::number (graphics_hist_max_length) + ")\n");
+	list.append (command + ")\nrk.verify.plot.hist.limits (" + QString::number (graphics_hist_max_length) + ")\n");
 	
 	return (list);
 }

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-09-11 08:23:40 UTC (rev 3011)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-09-11 09:03:20 UTC (rev 3012)
@@ -439,14 +439,14 @@
 
 	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.record.plot$clearHistory ()", RCommand::App, i18n ("Clear plot history"), error_dialog);
+	RKGlobals::rInterface ()->issueCommand ("rk.clear.plot.history ()", RCommand::App, i18n ("Clear plot history"), error_dialog);
 	//updateHistoryActions (0, 0);
 }
 
 void RKCaughtX11Window::showPlotInfo () {
 	RK_TRACE (MISC);
 
-	RKGlobals::rInterface ()->issueCommand ("rk.record.plot$showPlotInfo (" + QString::number (device_number) + ")", RCommand::App, i18n ("Plot properties (device number %1)", device_number), error_dialog);
+	RKGlobals::rInterface ()->issueCommand ("rk.show.plot.info (" + QString::number (device_number) + ")", RCommand::App, i18n ("Plot properties (device number %1)", device_number), error_dialog);
 }
 
 void RKCaughtX11Window::updateHistoryActions (int history_length, int position, const QStringList &labels) {


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