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

[tfry at users.sourceforge.net]

Revision: 1691
          http://svn.sourceforge.net/rkward/?rev=1691&view=rev
Author:   tfry
Date:     2007-03-21 13:14:05 -0700 (Wed, 21 Mar 2007)

Log Message:
-----------
local() adjustments and minor cleanups

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/plots/stem.php
    trunk/rkward/rkward/plugins/plots/stripchart_plot.php

Modified: trunk/rkward/rkward/plugins/plots/stem.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/stem.php	2007-03-21 20:08:59 UTC (rev 1690)
+++ trunk/rkward/rkward/plugins/plots/stem.php	2007-03-21 20:14:05 UTC (rev 1691)
@@ -3,28 +3,18 @@
 }
 
 function calculate () {
-?>
-rk.temp.x <- substitute (<? getRK ("x"); ?>)
-<?
-	}
-?>
+}
 
-<?
-
-
 function printout () {
+	$x = getRK_val ("x");
+	$scale = getRK_val ("scale");
+	$width = getRK_val ("width");
+	$atom = getRK_val ("atom");
 ?>
 rk.header ("Stem-and-Leaf Plot",
-	parameters=list ("Variable", paste (rk.get.description (rk.temp.x, is.substitute=TRUE)), "Plot Length", "<? getRK ("scale"); ?>","Plot Width", "<? getRK ("width"); ?>", "Tolerance", "<? getRK ("atom"); ?>"))
+	parameters=list ("Variable", paste (rk.get.description (<? echo ($x); ?>)), "Plot Length", "<? echo ($scale); ?>","Plot Width", "<? echo ($width); ?>", "Tolerance", "<? echo ($atom); ?>"))
 
-rk.print.literal(capture.output(stem(<? getRK ("x"); ?>, scale = <? getRK ("scale"); ?>, width = <? getRK ("width"); ?>, atom = <? getRK ("atom"); ?>)))
-
+rk.print.literal(capture.output(stem(<? echo ($x); ?>, scale = <? echo ($scale); ?>, width = <? echo ($width); ?>, atom = <? echo ($atom); ?>)))
 <?
 }
-
-function cleanup () {
 ?>
-rm (list=grep ("^rk.temp", ls (), value=TRUE))
-<?
-}
-?>

Modified: trunk/rkward/rkward/plugins/plots/stripchart_plot.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/stripchart_plot.php	2007-03-21 20:08:59 UTC (rev 1690)
+++ trunk/rkward/rkward/plugins/plots/stripchart_plot.php	2007-03-21 20:14:05 UTC (rev 1691)
@@ -9,14 +9,10 @@
 	doPrintout (true);
 }
 
-function cleanup () {
-}
-
 function preview () {
 	preprocess ();
 	calculate ();
 	doPrintout (false);
-	cleanup ();
 }
 
 function doPrintout ($final) {
@@ -32,7 +28,7 @@
 
 rk.graph.on ()
 <?	} ?>
-try (stripchart (<? echo ($x); ?> ~ (<? echo ($g); ?>), vertical=<? echo ($vertical); ?>, method = <? echo ($method); ?>, jitter = <? echo ($jitter); ?>, offset = <? echo ($offset); ?> <? getRK ("plotoptions.code.printout"); ?>))
+try (stripchart (<? echo ($x); ?> ~ (<? echo ($g); ?>), vertical=<? echo ($vertical); ?>, method = <? echo ($method); ?>, jitter = <? echo ($jitter); ?>, offset = <? echo ($offset); ?><? getRK ("plotoptions.code.printout"); ?>))
 <?	if ($final) { ?>
 rk.graph.off ()
 <?	}


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