[rkward-cvs] SF.net SVN: rkward:[4412] trunk/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Tue Nov 6 09:20:01 UTC 2012
Revision: 4412
http://rkward.svn.sourceforge.net/rkward/?rev=4412&view=rev
Author: tfry
Date: 2012-11-06 09:20:00 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
If none of the previous plugin maps can be found, re-add the default (important on Windows, where installation paths are likely to change)
Modified Paths:
--------------
trunk/rkward/ChangeLog
trunk/rkward/doc/rkwardplugins/index.docbook
trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp
Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog 2012-11-05 22:02:18 UTC (rev 4411)
+++ trunk/rkward/ChangeLog 2012-11-06 09:20:00 UTC (rev 4412)
@@ -1,3 +1,4 @@
+- Fixed: If none of the previous plugin maps could be found on startup, re-add the default
- Added GUI element for entering matrix or vector data in plugins TODO: cut / copy / paste, cursor placement
- Added utiltity function rk.flush.output() TODO: Output Window->Flush Output should use this
- RKWard is now categorized as Science/Math/Numerical Analysis in its .desktop file
Modified: trunk/rkward/doc/rkwardplugins/index.docbook
===================================================================
--- trunk/rkward/doc/rkwardplugins/index.docbook 2012-11-05 22:02:18 UTC (rev 4411)
+++ trunk/rkward/doc/rkwardplugins/index.docbook 2012-11-06 09:20:00 UTC (rev 4412)
@@ -1592,7 +1592,8 @@
<sect3 id="automated_plugin_testing">
<title>Automated plugin testing (optional)</title>
<para>
- Another optional directory is "tests", which is meant to provide files needed for <ulink url="http://sourceforge.net/apps/mediawiki/rkward/index.php?title=Automated_Plugin_Testing">automated plugin testing</ulink>. These tests are helpful to quickly check if your plugins still work with new versions of &r; or &rkward;. If you want to include tests, you should really restrain yourself to the naming scheme and hierarchy shown here. That is, tests should reside in a directory called <filename>tests</filename>, which includes a file <filename>testsuite.R</filename> and a folder with tests standards named after the appropriate test suite. You can, however, provide more than one test suite; in that case, if you don’t want to append them all in the one <filename>testsuite.R</filename> file, you can split them in e.g. one file for each test suite and create one <filename>testsuite.R</filename> with <function>source()</function> calls for each suite file. In either case, create separate subdirectories with test standards for each defined suite.
+ Another optional directory is "tests", which is meant to provide files needed for <ulink url="http://sourceforge.net/apps/mediawiki/rkward/index.php?title=Automated_Plugin_Testing">automated plugin testing</ulink>. These tests are helpful to quickly check if your plugins still work with new versions of &r; or &rkward;. If you want to include tests, you should really restrain yourself to the naming scheme and hierarchy shown here. That is, tests should reside in a directory called <filename>tests</filename>, which includes a file <filename>testsuite.R</filename> and a folder with tests standards named after the appropriate test suite. You can, however, provide more than one test suite; in that case, if you don’t want to append them all in the one <filename>testsuite.R</filename> file, you can split them in e.g. one file for each test suite and create one <filename>testsuite.R</filename> with <function>source()</function> calls for each suite file. In either case, create separate subdirectories with test
+standards for each defined suite.
</para>
<para>
The benefits of upholding to this structure is that plugin tests can be run simply by calling <function>rktests.makplugintests()</function> from the <ulink url="rkward://rhelp/rkwardtests">rkwardtests</ulink> package without additional arguments. Have a look at the online documentation on <ulink url="http://sourceforge.net/apps/mediawiki/rkward/index.php?title=Automated_Plugin_Testing">Automated Plugin Testing</ulink> for further details.
@@ -2866,15 +2867,15 @@
</varlistentry>
<varlistentry>
<term>tsv</term>
- <listitem><para>Data in the matrix in tsv format (string). Note that compared to the usual tsv layout, <emphasis>columns</emphasis>, not rows, are separated by newline characters, and cells within a column are separated by tabulator characters.</para></listitem>
+ <listitem><para>Data in the matrix in tsv format (string; read-write). Note that compared to the usual tsv layout, <emphasis>columns</emphasis>, not rows, are separated by newline characters, and cells within a column are separated by tabulator characters.</para></listitem>
</varlistentry>
<varlistentry>
<term>0,1,2...</term>
- <listitem><para>The data from a single column (0 for leftmost column), separated by tabulator characters (string).</para></listitem>
+ <listitem><para>The data from a single column (0 for leftmost column), separated by tabulator characters (string; read-only).</para></listitem>
</varlistentry>
<varlistentry>
<term>cbind</term>
- <listitem><para>Data in a format suitable for pasting to R, wrapped in a cbind statement (string).</para></listitem>
+ <listitem><para>Data in a format suitable for pasting to R, wrapped in a cbind statement (string; read-only).</para></listitem>
</varlistentry>
</variablelist></para></listitem>
</varlistentry>
Modified: trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp 2012-11-05 22:02:18 UTC (rev 4411)
+++ trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp 2012-11-06 09:20:00 UTC (rev 4412)
@@ -2,7 +2,7 @@
rksettingsmoduleplugins - description
-------------------
begin : Wed Jul 28 2004
- copyright : (C) 2004, 2006, 2007, 2010 by Thomas Friedrichsmeier
+ copyright : (C) 2004, 2006, 2007, 2010, 2012 by Thomas Friedrichsmeier
email : tfry at users.sourceforge.net
***************************************************************************/
@@ -175,10 +175,11 @@
KConfigGroup cg = config->group ("Plugin Settings");
plugin_maps = cg.readEntry ("Plugin Maps", QStringList ());
known_plugin_maps = cg.readEntry ("All known plugin maps", QStringList ());
+ fixPluginMapLists (); // removes any maps which don't exist any more
if (plugin_maps.isEmpty ()) {
plugin_maps.append (RKCommonFunctions::getRKWardDataDir () + "/all.pluginmap");
+ fixPluginMapLists (); // in case the default one is missing, somehow, too
}
- fixPluginMapLists ();
interface_pref = static_cast<PluginPrefs> (cg.readEntry ("Interface Preferences", static_cast<int> (PreferRecommended)));
show_code = cg.readEntry ("Code display default", false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list