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

tfry at users.sourceforge.net tfry at users.sourceforge.net
Mon Feb 5 11:19:07 UTC 2007


Revision: 1320
          http://svn.sourceforge.net/rkward/?rev=1320&view=rev
Author:   tfry
Date:     2007-02-05 03:19:07 -0800 (Mon, 05 Feb 2007)

Log Message:
-----------
Allow setting default pointtype in plot_options

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.php
    trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.xml
    trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.php
    trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.xml
    trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.php
    trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.xml
    trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.php
    trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.xml
    trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.php
    trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.xml
    trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.php
    trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.xml
    trunk/rkward/rkward/plugins/plots/plot_options.php
    trunk/rkward/rkward/plugins/plots/plot_options.xml

Modified: trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.php	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.php	2007-02-05 11:19:07 UTC (rev 1320)
@@ -45,9 +45,6 @@
 	$max = getRK_val ("max");
 	if (getRK_val ("log") == "1") $log_label="logarithmic";
 	else $log_label="normal";
-// 	$type = getRK_val ("plotoptions.pointtype.string");
-	$type_tag = "";
-// 	if ($type == "")  $type_tag = ", type=\"p\"";
 
 	if ($final) { ?>
 rk.header ("Binomial <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Number of trials", "<? echo ($size); ?>", "Probability of success on each trial", "<? echo ($prob); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -55,7 +52,7 @@
 rk.graph.on ()
 <? }
 ?>
-try (curve (<? echo ($fun); ?> (x, size = <? echo ($size); ?>, prob=<? echo ($prob); ?><? echo ($log_option); ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
+try (curve (<? echo ($fun); ?> (x, size = <? echo ($size); ?>, prob=<? echo ($prob); ?><? echo ($log_option); ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?>))
 
 <?	if ($final) { ?>
 rk.graph.off ()

Modified: trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.xml	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_binomial_distribution.xml	2007-02-05 11:19:07 UTC (rev 1320)
@@ -7,7 +7,7 @@
 		<convert id="dodist" mode="equals" sources="function.string" standard="pbinom" />
 		<connect client="lower.enabled" governor="dodist" />
 		<set id="plotoptions.allow_log" to="false"/>
-		<set id="plotoptions.pointtype.string" to="p"/>
+		<set id="plotoptions.default_pointtype" to="p"/>
 	</logic>
 	<dialog label="Plot binomial probabilities" >
 		<tabbook>

Modified: trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.php	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.php	2007-02-05 11:19:07 UTC (rev 1320)
@@ -44,9 +44,6 @@
 	$max = getRK_val ("max");
 	if (getRK_val ("log") == "1") $log_label="logarithmic";
 	else $log_label="normal";
-	$type = getRK_val ("plotoptions.pointtype.string");
-	$type_tag = "";
-	if ($type == "")  $type_tag = ", type=\"p\"";
 
 	if ($final) { ?>
 rk.header ("Geometric <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Probability of success on each trial", "<? echo ($prob); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -54,7 +51,7 @@
 rk.graph.on ()
 <? }
 ?>
-try (curve (<? echo ($fun); ?> (x, prob=<? echo ($prob); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
+try (curve (<? echo ($fun); ?> (x, prob=<? echo ($prob); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?>))
 
 <?	if ($final) { ?>
 rk.graph.off ()

Modified: trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.xml	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_geometric_distribution.xml	2007-02-05 11:19:07 UTC (rev 1320)
@@ -7,6 +7,7 @@
 		<convert id="dodist" mode="equals" sources="function.string" standard="pgeom" />
 		<connect client="lower.enabled" governor="dodist" />
 		<set id="plotoptions.allow_log" to="false"/>
+		<set id="plotoptions.default_pointtype" to="p"/>
 	</logic>
 	<dialog label="Plot geometric probabilities" >
 		<tabbook>

Modified: trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.php	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.php	2007-02-05 11:19:07 UTC (rev 1320)
@@ -46,9 +46,6 @@
 	$n = getRK_val ("n");
 	$m = getRK_val ("m");
 	$k = getRK_val ("k");
-	$type = getRK_val ("plotoptions.pointtype.string");
-	$type_tag = "";
-	if ($type == "")  $type_tag = ", type=\"p\"";
 
 	if ($final) { ?>
 rk.header ("Hypergeometric <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Number of white balls", "<? echo ($m); ?>",  "Number of black balls", "<? echo ($n); ?>", "Number of balls drawn", "<? echo ($k); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));

Modified: trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.xml	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_hypergeometric_distribution.xml	2007-02-05 11:19:07 UTC (rev 1320)
@@ -7,6 +7,7 @@
 		<convert id="dodist" mode="equals" sources="function.string" standard="phyper" />
 		<connect client="lower.enabled" governor="dodist" />
 		<set id="plotoptions.allow_log" to="false"/>
+		<set id="plotoptions.default_pointtype" to="p"/>
 	</logic>
 	<dialog label="Plot hypergeometric probabilities" >
 		<tabbook>

Modified: trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.php	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.php	2007-02-05 11:19:07 UTC (rev 1320)
@@ -55,9 +55,6 @@
 	}
 	if (getRK_val ("log") == "1") $log_label="logarithmic";
 	else $log_label="normal";
-	$type = getRK_val ("plotoptions.pointtype.string");
-	$type_tag = "";
-	if ($type == "")  $type_tag = ", type=\"p\"";
 
 	if ($final) { ?>
 rk.header ("Negative Binomial <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Target for number of successful trials", "<? echo ($size); ?>", "<? echo ($paramLabel); ?>", "<? echo ($paramVal); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -65,7 +62,7 @@
 rk.graph.on ()
 <? }
 ?>
-try (curve (<? echo ($fun); ?> (x, size = <? echo ($size); ?><? echo ($paramTag); ?><? echo ($paramVal); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
+try (curve (<? echo ($fun); ?> (x, size = <? echo ($size); ?><? echo ($paramTag); ?><? echo ($paramVal); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?>))
 
 <?	if ($final) { ?>
 rk.graph.off ()

Modified: trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.xml	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_negbinomial_distribution.xml	2007-02-05 11:19:07 UTC (rev 1320)
@@ -11,6 +11,7 @@
 		<convert id="usemu" mode="equals" sources="param.string" standard="pmu" />
 		<connect client="mu.enabled" governor="usemu" />
 		<set id="plotoptions.allow_log" to="false"/>
+		<set id="plotoptions.default_pointtype" to="p"/>
 	</logic>
 	<dialog label="Plot negative binomial probabilities" >
 		<tabbook>

Modified: trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.php	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.php	2007-02-05 11:19:07 UTC (rev 1320)
@@ -44,9 +44,6 @@
 	if (getRK_val ("log") == "1") $log_label="logarithmic";
 	else $log_label="normal";
 	$mean = getRK_val ("mean");
-	$type = getRK_val ("plotoptions.pointtype.string");
-	$type_tag = "";
-	if ($type == "")  $type_tag = ", type=\"p\"";
 
 	if ($final) { ?>
 rk.header ("Poisson <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>", "Upper quantile", "<? echo ($max); ?>", "Mean", "<? echo ($mean); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -54,7 +51,7 @@
 rk.graph.on ()
 <? }
 ?>
-try (curve (<? echo ($fun); ?> (x, lambda = <? echo ($mean); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
+try (curve (<? echo ($fun); ?> (x, lambda = <? echo ($mean); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($max - $min + 1); ?><? getRK ("plotoptions.code.printout"); ?>))
 
 <?	if ($final) { ?>
 rk.graph.off ()

Modified: trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.xml	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_poisson_distribution.xml	2007-02-05 11:19:07 UTC (rev 1320)
@@ -6,6 +6,7 @@
 		<convert id="dodist" mode="equals" sources="function.string" standard="ppois" />
 		<connect client="lower.enabled" governor="dodist" />
 		<set id="plotoptions.allow_log" to="false"/>
+		<set id="plotoptions.default_pointtype" to="p"/>
 	</logic>
 	<dialog label="Plot Poisson probabilities" >
 		<tabbook>

Modified: trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.php	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.php	2007-02-05 11:19:07 UTC (rev 1320)
@@ -46,9 +46,6 @@
 	$n = $max - $min + 1;
 	if (getRK_val ("log") == "1") $log_label="logarithmic";
 	else $log_label="normal";
-	$type = getRK_val ("plotoptions.pointtype.string");
-	$type_tag = "";
-	if ($type == "")  $type_tag = ", type=\"p\"";
 
 	if ($final) { ?>
 rk.header ("Wilcoxon <? echo ($label); ?> function", list ("Lower quantile", "<? echo ($min); ?>","Upper quantile", "<? echo ($max); ?>", "First sample size", "<? echo ($nm); ?>", "Second sample size", "<? echo ($nn); ?>", "Scaling", "<? echo ($log_label); ?>"<? echo ($tail_tag); ?>, "Function", "<? echo ($fun); ?>"));
@@ -56,7 +53,7 @@
 rk.graph.on ()
 <? }
 ?>
-try (curve (<? echo ($fun); ?> (x, m = <? echo ($nm); ?>, n = <? echo ($nn); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?><? echo ($type_tag); ?>))
+try (curve (<? echo ($fun); ?> (x, m = <? echo ($nm); ?>, n = <? echo ($nn); ?><? echo ($log_option) ?><? echo ($lower_tag); ?>), from=<? echo ($min); ?>, to=<? echo ($max); ?>, n=<? echo ($n); ?><? getRK ("plotoptions.code.printout"); ?>))
 
 <?	if ($final) { ?>
 rk.graph.off ()

Modified: trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.xml	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/distributions/plot_wilcoxon_distribution.xml	2007-02-05 11:19:07 UTC (rev 1320)
@@ -6,6 +6,7 @@
 		<convert id="dodist" mode="equals" sources="function.string" standard="pwilcox" />
 		<connect client="lower.enabled" governor="dodist" />
 		<set id="plotoptions.allow_log" to="false"/>
+		<set id="plotoptions.default_pointtype" to="p"/>
 	</logic>
 	<dialog label="Plot Wilcoxon Rank Sum statistic probabilities" >
 		<tabbook>

Modified: trunk/rkward/rkward/plugins/plots/plot_options.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/plot_options.php	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/plots/plot_options.php	2007-02-05 11:19:07 UTC (rev 1320)
@@ -82,6 +82,7 @@
 	if ($log != "") $log = ", log=\"" . $log . "\"";
 
 	$type = getRK_val ("pointtype");
+	if (empty ($type)) $type = getRK_val ("default_pointtype");
 	if (!empty ($type)) $type = ", type=\"" . $type . "\"";
 
 	///Begin of Additions by Stefan Roediger

Modified: trunk/rkward/rkward/plugins/plots/plot_options.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/plot_options.xml	2007-02-05 11:09:11 UTC (rev 1319)
+++ trunk/rkward/rkward/plugins/plots/plot_options.xml	2007-02-05 11:19:07 UTC (rev 1320)
@@ -5,6 +5,9 @@
 	<logic>
 		<external id="xvar" default="" />
 		<external id="yvar" default="" />
+		
+		<external id="default_pointtype" default="" />
+		
 		<external id="allow_log" default="true" />
 		<external id="allow_type" default="true" />
 		<external id="allow_aspect" default="false" />
@@ -47,6 +50,7 @@
 		<connect client="ylog.visible" governor="allow_log"/>
 		<connect client="aspectratio.visible" governor="allow_aspect"/>
 		<connect client="pointtypepage.visible" governor="allow_type"/>
+		<connect client="pointtype.string" governor="default_pointtype" />
 	</logic>
 	<dialog label="Default plot options" >
 		<tabbook>


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