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

[sjar at users.sourceforge.net]

Revision: 1015
          http://svn.sourceforge.net/rkward/?rev=1015&view=rev
Author:   sjar
Date:     2006-12-17 16:37:18 -0800 (Sun, 17 Dec 2006)

Log Message:
-----------
rug is now an option for ECDF plot
rug can handle now lwd, ticksize, col and side
GUI changes/improvements

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

Modified: trunk/rkward/rkward/plugins/plots/ecdf_plot.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/ecdf_plot.php	2006-12-17 23:00:49 UTC (rev 1014)
+++ trunk/rkward/rkward/plugins/plots/ecdf_plot.php	2006-12-18 00:37:18 UTC (rev 1015)
@@ -8,6 +8,7 @@
 	rk.max <- max (<? getRK("x"); ?>);
 	rk.length <- length (<? getRK ("x"); ?>);
 	doth_pnrom <- <? getRK ("th_pnorm"); ?>;
+	dorug <- <? getRK ("rug"); ?>;
 <?
 	}
 	
@@ -18,8 +19,8 @@
 rk.header ("ECDF", list ("Variable", rk.get.description (<? echo ($x); ?>), "Minimum", rk.min, "Maximum", rk.max, "Length", rk.length))
 rk.graph.on ()
 plot.ecdf (<? echo ($x); ?>, <? getRK ("dopoints"); ?>, <? getRK ("verticals"); ?> <? getRK ("plotoptions.code.printout"); ?>)
-if (doth_pnrom) cat (paste (curve(pnorm, from= rk.min, to= rk.max, add=TRUE, col="<? echo ($col); ?>")))
-rug (<? getRK ("x"); ?>)
+if (doth_pnrom) curve(pnorm, from= rk.min, to= rk.max, add=TRUE, col="<? echo ($col); ?>")
+if (dorug) rug(<? echo ($x); ?>, <? getRK ("ticksize"); ?>, <? getRK ("lwd"); ?>, <? getRK ("side"); ?>, col ="<? getRK ("col_rug"); ?>")
 rk.graph.off ()
 <?
 	}
@@ -29,6 +30,7 @@
 	rm (rk.max)
 	rm (rk.length)
 	rm (doth_pnrom)
+	rm (dorug)
 <?
 	}
 ?>

Modified: trunk/rkward/rkward/plugins/plots/ecdf_plot.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/ecdf_plot.xml	2006-12-17 23:00:49 UTC (rev 1014)
+++ trunk/rkward/rkward/plugins/plots/ecdf_plot.xml	2006-12-18 00:37:18 UTC (rev 1015)
@@ -30,18 +30,35 @@
 						<radio id="verticals" label="vertical">
 							<option value="verticals = FALSE" label="Verticals False"/>
 							<option value="verticals = TRUE" label="Verticals TRUE"/>
-						</radio>
-						<checkbox value_unchecked="0" value="1" checked="true" id="th_pnorm" label="Theoretical Normal Distribution" />
-						<input id="col" initial="red" label="Color of Theoretical Normal Distribution"/>
-						<text>R provides you a broad range of colors to use. To change the current just type another like 'blue'. Please refere to the R-help for others than the default (red).
-						</text>
+						</radio>						
+						<frame label="Theoretical Normal Distribution">
+							<checkbox value_unchecked="0" value="1" checked="true" id="th_pnorm" label="Theoretical Normal Distribution" />
+							<input id="col" initial="red" label="Color of Theoretical Normal Distribution"/>
+							<text>To change the coulor type another like 'blue' (please refere to R-help for more information).
+							</text>
+						</frame>
+						<stretch/>
 					</column>
 					<column>
-						<embed id="plotoptions" component="rkward::plot_options" as_button="false" label="Plot Options" />
+						<frame label="Add Rug to Plot">
+							<checkbox value_unchecked="0" value="1" checked="true" id="rug" label="Rug" />
+							<spinbox initial="0.03" id="ticksize" label="Ticksize" />
+							<spinbox initial="0.5" id="lwd" label="Line width of ticks" />
+							<radio label="Side of Rug" id="side">
+								<option value="side = 1" label="Rug on Bottom" />
+								<option value="side = 3" label="Rug on Top" />
+							</radio>
+							<input id="col_rug" initial="black" label="Color of ticks"/>
+						</frame>
+						<stretch/>
 					</column>
-					<stretch/>
 				</row>
 			</tab>
+			<tab label="Title/Axis">
+				<column>
+					<embed id="plotoptions" component="rkward::plot_options" as_button="false" label="Plot Options" />
+				</column>
+			</tab>
 		</tabbook>
 	</dialog>
 </document>


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