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

[tfry at users.sourceforge.net]

Revision: 1859
          http://svn.sourceforge.net/rkward/?rev=1859&view=rev
Author:   tfry
Date:     2007-05-04 03:36:53 -0700 (Fri, 04 May 2007)

Log Message:
-----------
Fix 'Plugins are needed' warning

Modified Paths:
--------------
    trunk/rkward/rkward/plugin/rkcomponentmap.cpp
    trunk/rkward/rkward/plugins/plots.pluginmap
    trunk/rkward/rkward/rbackend/rembedinternal.cpp

Modified: trunk/rkward/rkward/plugin/rkcomponentmap.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkcomponentmap.cpp	2007-05-01 07:24:12 UTC (rev 1858)
+++ trunk/rkward/rkward/plugin/rkcomponentmap.cpp	2007-05-04 10:36:53 UTC (rev 1859)
@@ -257,7 +257,7 @@
 	pluginmapfiles.insert (QFileInfo (plugin_map_file).absFilePath (), pluginmap_file_desc);
 
 	// step 1: include required files
-	int counter;
+	int counter = 0;
 	QStringList includelist;
 	list = xml->getChildElements (document_element, "require", DL_INFO);
 	for (XMLChildList::const_iterator it=list.constBegin (); it != list.constEnd (); ++it) {
@@ -299,7 +299,7 @@
 
 	// step 3: create / insert into menus
 	QDomElement xmlgui_menubar_element = xml->getChildElement (gui_xml.documentElement (), "MenuBar", DL_ERROR);
-	counter = createMenus (xmlgui_menubar_element, xml->getChildElement (document_element, "hierarchy", DL_INFO), cnamespace);
+	counter += createMenus (xmlgui_menubar_element, xml->getChildElement (document_element, "hierarchy", DL_INFO), cnamespace);
 
 	// step 4: create and register contexts
 	list = xml->getChildElements (document_element, "context", DL_INFO);
@@ -315,6 +315,7 @@
 	}
 
 	setXMLGUIBuildDocument (gui_xml);
+	qDebug ("%s: %d", plugin_map_file.latin1(), counter);
 	return counter;
 }
 

Modified: trunk/rkward/rkward/plugins/plots.pluginmap
===================================================================
--- trunk/rkward/rkward/plugins/plots.pluginmap	2007-05-01 07:24:12 UTC (rev 1858)
+++ trunk/rkward/rkward/plugins/plots.pluginmap	2007-05-04 10:36:53 UTC (rev 1859)
@@ -31,5 +31,5 @@
 		</menu>
 	</hierarchy>
 
-	<require file="../embedded.pluginmap"/>
+	<require file="embedded.pluginmap"/>
 </document>

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-05-01 07:24:12 UTC (rev 1858)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-05-04 10:36:53 UTC (rev 1859)
@@ -836,8 +836,15 @@
 	- Also, in case the command was too long to fit inside the buffer at once (repldll_buffer_transfer_finished)
 - Some more state variables are used for figuring out, which type of error occurred, if any, since we don't get any decent return value
 
-This is the logic spread out over the following section, runUserCommandInternal (), and RReadConsole (). */
+This is the logic spread out over the following section, runUserCommandInternal (), and RReadConsole (). 
 
+NOTE from Deepayan Sarkar: Another possible simplification (which may not be worth doing
+ultimately): you distinguish between two types of calls to
+R_ReadConsole based on R_busy calls, but you may be able to use the
+second 'hist' argument. I didn't look too carefully, but it seems like
+hist == 1 iff R wants a parse-able input.
+*/
+
 		R_ReplDLLinit ();		// resets the parse buffer (things might be left over from a previous incomplete parse)
 		bool prev_iteration_was_incomplete = false;
 


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