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

[tfry at users.sourceforge.net]

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

Log Message:
-----------
local() adjustments, and disable ellipse and smooth by default in scatterplot matrix plugin, as it may fail sometimes

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

Modified: trunk/rkward/rkward/plugins/plots/scatterplot_matrix.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/scatterplot_matrix.php	2007-03-21 19:52:28 UTC (rev 1689)
+++ trunk/rkward/rkward/plugins/plots/scatterplot_matrix.php	2007-03-21 20:08:59 UTC (rev 1690)
@@ -12,30 +12,23 @@
 	doPrintout (true);
 }
 
-function cleanup () {
-?>
-rm(rk.temp.x)
-<?
-}
-
 function preview () {
 	preprocess ();
 	calculate ();
 	doPrintout (false);
-	cleanup ();
 }
 
 function doPrintout ($final) {
 	$vars = str_replace ("\n", ",", trim (getRK_val ("x"))) ;
 ?>
-rk.temp.x <- data.frame (<? echo ($vars); ?>)
+data <- data.frame (<? echo ($vars); ?>)
 
 <? 	if ($final) { ?>
 rk.header ("Scatterplot Matrix", parameters=list ("Diagonal Panels", "<? getRK("diag") ?>", "Plot points", "<? getRK ("plot_points"); ?>", "Smooth", "<? getRK ("smooth"); ?>", "Ellipses", "<? getRK ("ellipse"); ?> at 0.5 and 0.9 levels."))
 
 rk.graph.on ()
 <?	} ?>
-try (scatterplot.matrix(rk.temp.x, diagonal="<? getRK("diag") ?>", plot.points=<? getRK ("plot_points"); ?>, smooth=<? getRK ("smooth"); ?>, ellipse=<? getRK ("ellipse"); ?>))
+try (scatterplot.matrix(data, diagonal="<? getRK("diag") ?>", plot.points=<? getRK ("plot_points"); ?>, smooth=<? getRK ("smooth"); ?>, ellipse=<? getRK ("ellipse"); ?>))
 <?	if ($final) { ?>
 rk.graph.off ()
 <?	}

Modified: trunk/rkward/rkward/plugins/plots/scatterplot_matrix.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/scatterplot_matrix.xml	2007-03-21 19:52:28 UTC (rev 1689)
+++ trunk/rkward/rkward/plugins/plots/scatterplot_matrix.xml	2007-03-21 20:08:59 UTC (rev 1690)
@@ -23,8 +23,8 @@
 					<option value="none" label="No plot"/>
 				</radio>
 				<checkbox id="plot_points" label="Plot points" value="TRUE" value_unchecked="FALSE" checked="true"/>
-				<checkbox id="smooth" label="Smooth" value="TRUE" value_unchecked="FALSE" checked="true"/>
-				<checkbox id="ellipse" label="Ellipse" value="TRUE" value_unchecked="FALSE" checked="true"/>
+				<checkbox id="smooth" label="Smooth" value="TRUE" value_unchecked="FALSE" checked="false"/>
+				<checkbox id="ellipse" label="Ellipse" value="TRUE" value_unchecked="FALSE" checked="false"/>
 			</tab>
 		</tabbook>
 	</dialog>


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