[rkward-cvs] SF.net SVN: rkward: [1994] trunk/rkward/rkward/plugins/plots

[sjar at users.sourceforge.net]

Revision: 1994
          http://rkward.svn.sourceforge.net/rkward/?rev=1994&view=rev
Author:   sjar
Date:     2007-09-25 12:23:04 -0700 (Tue, 25 Sep 2007)

Log Message:
-----------
FOR 0.4.8 : added parameters (tabulate & clockwise). I'm not sure if clockwise should be given in the output since it does not really "affect" the result.

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/plots/piechart.php
    trunk/rkward/rkward/plugins/plots/piechart.xml

Modified: trunk/rkward/rkward/plugins/plots/piechart.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/piechart.php	2007-09-25 10:40:32 UTC (rev 1993)
+++ trunk/rkward/rkward/plugins/plots/piechart.php	2007-09-25 19:23:04 UTC (rev 1994)
@@ -17,7 +17,12 @@
 
 function doPrintout ($final) {
 	$vars = getRK_val ("x");
-	$tabulate= getRK_val ("tabulate")=="TRUE";
+	$tabulate= getRK_val ("tabulate");
+	if ($tabulate) {
+		$tabulate_header = '"Tabulate", "Yes"';
+	} else {
+		$tabulate_header = '"Tabulate", "No"';
+	}
 	$radius = getRK_val ("radius");
 	$angle = getRK_val ("angle");
 	$angle_inc = getRK_val ("angle_inc");
@@ -25,6 +30,11 @@
 	$density_inc = getRK_val ("density_inc");
 	$col = getRK_val ("colors");
 	$clockwise = getRK_val ("clockwise");
+	if ($clockwise) {
+		$clockwise_header = '"Clockwise", "Yes"';
+	} else {
+		$clockwise_header = '"Clockwise", "No"';
+	}
 	$names_mode = getRK_val ("names_mode");
 
 	$options = "";
@@ -54,7 +64,7 @@
 <?      } ?>
 
 <?	if ($final) { ?>
-rk.header ("Pie chart", list ("Variable", rk.get.description (<? echo ($vars); ?>)))
+rk.header ("Pie chart", parameters=list ("Variable", rk.get.description (<? echo ($vars); ?>), <? echo ($tabulate_header); ?>, <? echo ($clockwise_header); ?>))
 
 rk.graph.on ()
 <?	}

Modified: trunk/rkward/rkward/plugins/plots/piechart.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/piechart.xml	2007-09-25 10:40:32 UTC (rev 1993)
+++ trunk/rkward/rkward/plugins/plots/piechart.xml	2007-09-25 19:23:04 UTC (rev 1994)
@@ -26,7 +26,7 @@
 					<varselector id="vars"/>
 					<column>
 					<varslot min_vars="1" id="x" source="vars" required="true" label="Variable"/>
-					<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>
@@ -49,7 +49,7 @@
 						<input id="names_custom" label="Labels (separated by ';')" initial="First label;Second label"/>
 					</column>
 				</row>
-				<checkbox id="clockwise" label="clockwise" value="TRUE" value_unchecked="FALSE" checked="false" />
+				<checkbox id="clockwise" label="clockwise" value="1" value_unchecked="0" checked="false" />
 				<spinbox id="radius" type="real" min="0.01" max="1" initial="0.8" label="Radius"/>
 				<frame label="Shading">
 					<row>


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