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

[tfry at users.sourceforge.net]

Revision: 2645
          http://rkward.svn.sourceforge.net/rkward/?rev=2645&view=rev
Author:   tfry
Date:     2009-09-09 10:52:33 +0000 (Wed, 09 Sep 2009)

Log Message:
-----------
Fix for re-run link not showing up (manchito).
(Actually the new output notification mechanism is broken, and will need to be changed, but this cures the symptoms for now.)

Modified Paths:
--------------
    trunk/rkward/rkward/plugin/rkstandardcomponentgui.cpp
    trunk/rkward/rkward/rbackend/rthread.cpp
    trunk/rkward/rkward/windows/rkhtmlwindow.cpp

Modified: trunk/rkward/rkward/plugin/rkstandardcomponentgui.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkstandardcomponentgui.cpp	2009-09-07 11:06:17 UTC (rev 2644)
+++ trunk/rkward/rkward/plugin/rkstandardcomponentgui.cpp	2009-09-09 10:52:33 UTC (rev 2645)
@@ -156,13 +156,10 @@
 	command.append (code_property->printout ());
 	command.append ("})\n");
 
-	RKGlobals::rInterface ()->issueCommand (new RCommand (command, RCommand::Plugin | RCommand::DirectToOutput | RCommand::ObjectListUpdate), component->commandChain ());
-
 	// re-run link
-	command.clear ();
 	RKComponentHandle *handle = component->getHandle ();
 	if (handle->isAccessible ()) {
-		command.append ("\n.rk.rerun.plugin.link(plugin=\"" + RKComponentMap::getComponentId (handle) + "\", settings=\"" + RKCommonFunctions::escape (component->serializeState ()) + "\", label=\"" + i18n ("Run again") + "\")\n");
+		command.append (".rk.rerun.plugin.link(plugin=\"" + RKComponentMap::getComponentId (handle) + "\", settings=\"" + RKCommonFunctions::escape (component->serializeState ()) + "\", label=\"" + i18n ("Run again") + "\")\n");
 		// NOTE: the serialized state is quote-escape *again* for passing to R.
 	}
 	// separator line

Modified: trunk/rkward/rkward/rbackend/rthread.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rthread.cpp	2009-09-07 11:06:17 UTC (rev 2644)
+++ trunk/rkward/rkward/rbackend/rthread.cpp	2009-09-09 10:52:33 UTC (rev 2645)
@@ -390,6 +390,8 @@
 
 void RThread::checkNotifyOutputTouched () {
 	RK_TRACE (RBACKEND);
+// TODO: instead of this, the output window(s) should simply watch the file for changes using
+// KDirWatch.
 
 	QFileInfo info (active_output_file);
 	if (info.exists ()) {

Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2009-09-07 11:06:17 UTC (rev 2644)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2009-09-09 10:52:33 UTC (rev 2645)
@@ -24,6 +24,7 @@
 #include <kmessagebox.h>
 #include <kparts/partmanager.h>
 #include <kactioncollection.h>
+#include <kdirwatch.h>
 
 #include <qfileinfo.h>
 #include <qwidget.h>


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