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

[tfry at users.sourceforge.net]

Revision: 1903
          http://svn.sourceforge.net/rkward/?rev=1903&view=rev
Author:   tfry
Date:     2007-05-10 17:15:11 -0700 (Thu, 10 May 2007)

Log Message:
-----------
small corrections

Modified Paths:
--------------
    trunk/rkward/TODO
    trunk/rkward/rkward/plugins/plots/barplot.php
    trunk/rkward/rkward/plugins/plots/barplot.xml
    trunk/rkward/rkward/plugins/plots/barplot_options.xml

Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO	2007-05-11 00:08:16 UTC (rev 1902)
+++ trunk/rkward/TODO	2007-05-11 00:15:11 UTC (rev 1903)
@@ -185,8 +185,6 @@
 			- static members should be moved to the respective classes. Much cleaner!
 
 R plugins:
-	- modularization of the xml using includes or snippets
-		- see https://sourceforge.net/mailarchive/message.php?msg_name=200703230012.26765.kapatp%40gmail.com . Note that <tags> are not displayed in the mail archive. Might have to look at the HTML source.
 	- distribution plugins (probabilities and quantiles)
 		- probably all these could use an option "Store result (to name) / Print result / print and store"
 		- when changing this, they should first be changed to use common base functionality:

Modified: trunk/rkward/rkward/plugins/plots/barplot.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/barplot.php	2007-05-11 00:08:16 UTC (rev 1902)
+++ trunk/rkward/rkward/plugins/plots/barplot.php	2007-05-11 00:15:11 UTC (rev 1903)
@@ -17,7 +17,14 @@
 	
 function doPrintout ($final) {
 	$var = getRK_val ("x");
+	$tabulate = getRK_val ("tabulate");
 
+	if ($tabulate) {
+		$tabulate_header = '"Tabulate:", "No"';
+	} else {
+		$tabulate_header = '"Tabulate:", "Yes"';
+	}
+
 	$barplot_header = getRK_val ("barplot_options.code.preprocess");
 	$barplot_main = getRK_val ("barplot_options.code.printout");
 
@@ -32,7 +39,7 @@
 <? }
 
 	if ($final) { ?>
-rk.header ("Barplot", parameters=list ("dummy", "dummy"<? echo ($barplot_header); ?>))
+rk.header ("Barplot", parameters=list (<? echo ($tabulate_header . $barplot_header); ?>))
 
 rk.graph.on ()
 <?	}

Modified: trunk/rkward/rkward/plugins/plots/barplot.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/barplot.xml	2007-05-11 00:08:16 UTC (rev 1902)
+++ trunk/rkward/rkward/plugins/plots/barplot.xml	2007-05-11 00:15:11 UTC (rev 1903)
@@ -12,7 +12,7 @@
 					<varselector id="vars"/>
 					<column>
 					<varslot min_vars="1" id="x" source="vars" required="true" label="Matrix, Vector or Factor"/>
-					<checkbox id="tabulate" label="Tabulate" value="TRUE" value_unchecked="FALSE" checked="false" />
+					<checkbox id="tabulate" label="Tabulate" value="1" value_unchecked="0" checked="false" />
 					<stretch/>
 					<preview id="preview"/>
 					</column>

Modified: trunk/rkward/rkward/plugins/plots/barplot_options.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/barplot_options.xml	2007-05-11 00:08:16 UTC (rev 1902)
+++ trunk/rkward/rkward/plugins/plots/barplot_options.xml	2007-05-11 00:15:11 UTC (rev 1903)
@@ -4,6 +4,7 @@
 	<help file="barplot_options.rkh" />
 	<logic>
 		<external id="xvar" default=""/>
+		<!-- when adding plot_options, here, the pre and post could be connected to "external" variables -->
 
 		<convert id="juxtaposed" mode="equals" sources="type.string" standard="juxtaposed" />
 		<connect client="labels.enabled" governor="juxtaposed" />


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