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

[tfry at users.sourceforge.net]

Revision: 1448
          http://svn.sourceforge.net/rkward/?rev=1448&view=rev
Author:   tfry
Date:     2007-02-22 13:30:17 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
Make default main title work.
Allow specification of ylim.
require xtable only when needed.
Some small cleanups

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

Modified: trunk/rkward/rkward/plugins/plots/pareto.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/pareto.php	2007-02-22 21:09:02 UTC (rev 1447)
+++ trunk/rkward/rkward/plugins/plots/pareto.php	2007-02-22 21:30:17 UTC (rev 1448)
@@ -1,29 +1,30 @@
 <?
-function preprocess () {
-?> require(qcc) 
+function preprocess () { ?>
+require(qcc)
+<?	if (getRK_val ("descriptives")=="TRUE") { ?>
 require(xtable)
-<?
+<?	}
 }
-	
+
 function calculate () {
 }
 
 function printout () {
 	doPrintout (true);
 }
-	
+
 function cleanup () { ?>
 rm (list=grep ("^rk.temp", ls (), value=TRUE))
 <?
 }
-	
+
 function preview () {
 	preprocess ();
 	calculate ();
 	doPrintout (false);
 	cleanup ();
 }
-	
+
 function doPrintout ($final) {
 	$vars = getRK_val ("x");
 	$descriptives = getRK_val ("descriptives")=="TRUE";
@@ -33,20 +34,21 @@
 	rk.temp.x <- summary(rk.temp.x)
 } 
 
-<? 
-	if ($final) { ?>
+<?	if ($final) { ?>
 rk.header ("Pareto chart")
 
 rk.graph.on ()
 <?	}
 ?>
-try (
-<?
-if ($final && $descriptives) { ?>
-rk.print(xtable(<?}?>pareto.chart(rk.temp.x <? getRK ("plotoptions.code.printout"); ?>)<? if ($final && $descriptives){ ?>))
-<?}
-?>
-)
+try ({
+<?	if ($final && $descriptives) { ?>
+	rk.temp.descriptives <- <?
+	} else echo ("\t"); ?>
+pareto.chart(rk.temp.x<? getRK ("plotoptions.code.printout"); ?>)
+<?	if ($final && $descriptives) { ?>
+	rk.print(xtable(rk.temp.descriptives))
+<?	} ?>
+})
 <?	if ($final) { ?>
 rk.graph.off ()
 <? }

Modified: trunk/rkward/rkward/plugins/plots/pareto.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/pareto.xml	2007-02-22 21:09:02 UTC (rev 1447)
+++ trunk/rkward/rkward/plugins/plots/pareto.xml	2007-02-22 21:30:17 UTC (rev 1448)
@@ -3,13 +3,12 @@
 	<code file="pareto.php" />
 	<help file="pareto.rkh" />
 	<logic>
-		<connect client="plotoptions.default_main" governor="x" />
+		<connect client="plotoptions.default_main" governor="x.available" />
 		<set id="plotoptions.allow_type" to="false"/>
 		<set id="plotoptions.allow_xlim" to="false"/>
-		<set id="plotoptions.allow_ylim" to="false"/>
 		<set id="plotoptions.allow_log" to="false"/>
 	</logic>
-	<dialog label="Pareto chart" >		
+	<dialog label="Pareto chart" >
 		<tabbook>
 			<tab label="Variables" id="tab_variables">
 				<row>


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