[rkward-cvs] SF.net SVN: rkward: [1550] trunk/rkward/rkward/plugins/distributions/clt

[kapatp at users.sourceforge.net]

Revision: 1550
          http://svn.sourceforge.net/rkward/?rev=1550&view=rev
Author:   kapatp
Date:     2007-03-07 22:28:28 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------

* Removed rug options from binomial_clt
* Use default_ instead of setting the text fields directly

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.php
    trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.xml

Modified: trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.php
===================================================================
--- trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.php	2007-03-07 23:02:40 UTC (rev 1549)
+++ trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.php	2007-03-08 06:28:28 UTC (rev 1550)
@@ -59,14 +59,6 @@
 			$ecdfoptions .= ", col.01line={$col_y0}{$col_y1}";
 		} // col.01line option to plot.ecdf()
 
-		$addRugtoplot = getRK_val ("addRugtoplot");
-		if ($addRugtoplot) {
-			$rugoptions  = ', ticksize=' . round(getRK_val ("rug_ticksize"),2);
-			$rugoptions .= ', lwd=' . round(getRK_val ("rug_lwd"),2);
-			$rugoptions .= ', side=' . getRK_val ("rug_side");
-			$rugoptions .= getRK_val ("col_rug.code.printout");
-		}
-
 		$normFun = "pnorm"; // draw normal cdf on the ecdf plot
 		$plotoptions .= $ecdfoptions . getRK_val ("dist_stepfun.code.printout"); // plot.ecdf() and plot.stepfun() options
 	}
@@ -121,10 +113,6 @@
 ?>
 try( plot(ecdf(rk.temp.cltdistrib$avg)<? echo ($plotoptions); ?>) );
 <?
-		if ($addRugtoplot) {
-?>
-try (rug (rk.temp.cltdistrib$avg<? echo ($rugoptions); ?>));
-<?
 		}
 	}
 	if ($drawnorm) {

Modified: trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.xml
===================================================================
--- trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.xml	2007-03-07 23:02:40 UTC (rev 1549)
+++ trunk/rkward/rkward/plugins/distributions/clt/plot_binomial_clt.xml	2007-03-08 06:28:28 UTC (rev 1550)
@@ -5,8 +5,8 @@
 	<logic>
 		<set id="plotoptions.allow_log" to="false"/>
 		<set id="plotoptions.allow_type" to="false"/>
-		<set id="plotoptions.main.text" to="Binomial"/>
-		<set id="plotoptions.xlab.text" to="Sample Averages"/>
+		<set id="plotoptions.default_main" to="Binomial"/>
+		<set id="plotoptions.default_xlab" to="Sample Averages"/>
 
 		<set id="normlinecol.default_color" to="red" />
 
@@ -51,8 +51,8 @@
 					</column>
 					<column>
 						<radio id="function" label="Choose type of function plot" >
-							<option value="hist" label="Histogram and Density" />
-							<option value="dist" label="ECDF and Distribution" checked="true"/>
+							<option value="hist" label="Histogram and Density"  checked="true"/>
+							<option value="dist" label="ECDF and Distribution"/>
 						</radio>
 						<checkbox id="scalenorm" label="Use normalised random variable" value="1" value_unchecked="0"/>
 						<frame id="frame_lineoptions" label="Nomral Curve Options">
@@ -84,30 +84,12 @@
 			<tab id="tab_distfunction" label="ECDF options">
 				<embed id="dist_stepfun" component="rkward::plot_stepfun_options" label=""/>
 				<row>
-					<frame id="frame_rug" label="Rug options">
-						<row>
-							<column>
-								<checkbox id="addRugtoplot" label="Add Rug" />
-								<radio id="rug_side" label="Side of Rug">
-									<option value="1" label="Bottom" />
-									<option value="3" label="Top" />
-								</radio>
-							</column>
-							<column>
-								<spinbox id="rug_ticksize" min="0" initial="0.03" label="Tick size"/>
-								<spinbox id="rug_lwd" min="0" initial="0.5" label="Tick width" />
-								<embed id="col_rug" component="rkward::color_chooser" label="Color"/>
-							</column>
-						</row>
-					</frame>
-					<column>
 						<frame id="frame_col_y0" label="For y = 0 line">
 							<embed id="col_y0" component="rkward::color_chooser" label="Color"/>
 						</frame>
 						<frame id="frame_col_y1" label="For y = 1 line">
 							<embed id="col_y1" component="rkward::color_chooser" label="Color"/>
 						</frame>
-					</column>
 				</row>
 				<stretch/>
 			</tab>


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