[rkward-cvs] SF.net SVN: rkward:[2726] trunk/rkward/rkward/plugins
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Thu Dec 17 08:35:09 UTC 2009
Revision: 2726
http://rkward.svn.sourceforge.net/rkward/?rev=2726&view=rev
Author: tfry
Date: 2009-12-17 08:35:09 +0000 (Thu, 17 Dec 2009)
Log Message:
-----------
Final is a reserved word in JS. Replacing with 'full' where needed.
Modified Paths:
--------------
trunk/rkward/rkward/plugins/analysis/crosstab.js
trunk/rkward/rkward/plugins/distributions/clt/plot_clt_common.js
trunk/rkward/rkward/plugins/distributions/plot_dist_common.js
trunk/rkward/rkward/plugins/plots/barplot.js
trunk/rkward/rkward/plugins/plots/box_plot.js
trunk/rkward/rkward/plugins/plots/cor_graph.js
trunk/rkward/rkward/plugins/plots/density_plot.js
trunk/rkward/rkward/plugins/plots/dotchart.js
trunk/rkward/rkward/plugins/plots/ecdf_plot.js
trunk/rkward/rkward/plugins/plots/histogram.js
trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_ltm.js
trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_rasch.js
trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_tpm.js
trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_grm.js
trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_pcm.js
trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_rsm.js
trunk/rkward/rkward/plugins/plots/irt/tests/eRm_plotLR.js
trunk/rkward/rkward/plugins/plots/pareto.js
trunk/rkward/rkward/plugins/plots/piechart.js
trunk/rkward/rkward/plugins/plots/plot.js
trunk/rkward/rkward/plugins/plots/scatterplot.js
trunk/rkward/rkward/plugins/plots/scatterplot_matrix.js
trunk/rkward/rkward/plugins/plots/sieve_plot.js
trunk/rkward/rkward/plugins/plots/stripchart_plot.js
Modified: trunk/rkward/rkward/plugins/analysis/crosstab.js
===================================================================
--- trunk/rkward/rkward/plugins/analysis/crosstab.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/analysis/crosstab.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -53,8 +53,8 @@
doPrintout (false);
}
-function doPrintout (final) {
- if (final) {
+function doPrintout (full) {
+ if (full) {
echo ('rk.header ("Crosstabs (n to 1)", level=1)\n');
echo ('for (i in 1:length (results)) {\n');
echo (' rk.header ("Crosstabs (n to 1)", parameters=list ("Dependent", descriptions[[i]][[\'Dependent\']], "Independent", descriptions[[i]][[\'Independent\']]), level=2)\n');
Modified: trunk/rkward/rkward/plugins/distributions/clt/plot_clt_common.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/clt/plot_clt_common.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/distributions/clt/plot_clt_common.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -24,7 +24,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var fun = "";
var scalenorm = "";
var drawnorm = "";
@@ -101,7 +101,7 @@
yLim = ', ylim=ylim';
}
}
- if (final) {
+ if (full) {
echo ('rk.graph.on ()\n');
echo ('try ({\n');
@@ -120,7 +120,7 @@
echo (' lines (x=normX, y=normY, type="' + getValue ("normpointtype") + '"' + getValue ("normlinecol.code.printout") + ')\n');
}
if (!empty (plotadds)) printIndented ("\t", plotadds);
- if (final) {
+ if (full) {
echo ('})\n');
echo ('rk.graph.off ()\n');
Modified: trunk/rkward/rkward/plugins/distributions/plot_dist_common.js
===================================================================
--- trunk/rkward/rkward/plugins/distributions/plot_dist_common.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/distributions/plot_dist_common.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -37,7 +37,7 @@
options['n'] = options['max'] - options['min'] + 1;
}
-function doPrintout (final) {
+function doPrintout (full) {
var fun = "";
var log = "";
var log_option = "";
@@ -81,7 +81,7 @@
getParameters ();
- if (final) {
+ if (full) {
doHeader ();
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -98,7 +98,7 @@
printIndented ("\t", plot_adds);
}
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/barplot.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/barplot.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/barplot.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -19,7 +19,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var var = "";
var names_mode = "";
var tabulate = "";
@@ -55,7 +55,7 @@
echo ("names(x) <- c (\"" + str_replace (";", "\", \"", trim (getValue ("names_custom"))) + "\")\n");
}
- if (final) {
+ if (full) {
echo ('rk.header ("Barplot", parameters=list ("Variable", rk.get.description (' + var + '), ' + tabulate_header + barplot_header + '))\n');
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -66,7 +66,7 @@
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/box_plot.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/box_plot.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/box_plot.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -19,7 +19,7 @@
doPrintout (true);
}
-function doPrintout (final) {
+function doPrintout (full) {
var xvarsstring = "";
var names_mode = "";
var mean = "";
@@ -47,7 +47,7 @@
echo ("names(data_list) <- c (\"" + str_replace (";", "\", \"", trim (getValue ("names_custom"))) + "\")\n");
}
- if (final) {
+ if (full) {
echo ('rk.header ("Boxplot", list ("Variable(s)", rk.get.description (' + xvarsstring + ', paste.sep=", ")))\n');
echo ('rk.graph.on()\n');
@@ -79,7 +79,7 @@
printIndented ("\t", plot_adds);
}
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/cor_graph.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/cor_graph.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/cor_graph.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -41,14 +41,14 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var vars = "";
vars = str_replace ("\n", ",", trim (getValue ("x"))) ;
echo ('data <- data.frame (' + vars + ')\n');
echo ('\n');
- if (final) {
+ if (full) {
echo ('rk.header ("Correlation Matrix Plot", parameters=list ("Method", "' + getValue ("method") + '", "Exclusion", "' + getValue ("use") + '", "Precision", "' + getValue ("digits") + ' digits", "Scale text", "' + getValue ("scale") + '"))\n');
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -57,7 +57,7 @@
echo (' cor.graph (data)\n');
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
echo ('\n');
echo ('rk.print("Legend:\\t\'***\': p < 0.001 -- \'**\': p < 0.01 -- \'*\': p < 0.05 -- \'.\'\': p < 0.1")\n');
Modified: trunk/rkward/rkward/plugins/plots/density_plot.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/density_plot.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/density_plot.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -29,7 +29,7 @@
doPrintout (true);
}
-function doPrintout (final) {
+function doPrintout (full) {
var adjust = "";
var x = "";
var resolution = "";
@@ -56,7 +56,7 @@
if (dodensity_plot) title = "Density Plot";
else title = "Highest density regions";
- if (final) {
+ if (full) {
echo ('rk.header ("' + title + '", list ("Variable", rk.get.description (' + x + ')');
if (!empty (bw)) {
echo (', "Band Width", "');
@@ -78,7 +78,7 @@
echo (' rug(' + x + ', ' + getValue ("rug_ticksize") + ', ' + getValue ("rug_lwd") + ', ' + getValue ("rug_side") + getValue ("rug_col.code.printout") + ')\n');
}
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/dotchart.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/dotchart.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/dotchart.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -21,7 +21,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var vars = "";
var names_mode = "";
var tabulate = "";
@@ -54,7 +54,7 @@
echo ('}\n');
}
echo ('\n');
- if (final) {
+ if (full) {
echo ('rk.header ("Dot chart", parameters=list ("Variable", rk.get.description (' + vars + '), ' + tabulate_header + '))\n');
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -70,7 +70,7 @@
echo (' dotchart(x' + options + ')\n');
if (!empty (plotpost)) printIndented ("\t", plotpost);
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/ecdf_plot.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/ecdf_plot.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/ecdf_plot.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -30,11 +30,11 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var x = "";
x = getValue ("x");
- if (final) {
+ if (full) {
echo ('rk.header ("Empirical Cumulative Distribution Function", list ("Variable", rk.get.description (' + x + '), "Minimum", yrange[1], "Maximum", yrange[2]))\n');
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -50,7 +50,7 @@
echo (' rug (' + x + ', ' + getValue ("ticksize") + ', ' + getValue ("lwd") + ', ' + getValue ("side") + getValue ("col_rug.code.printout") + ')\n');
}
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/histogram.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/histogram.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/histogram.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -20,7 +20,7 @@
}
// internal helper functions
-function doPrintout (final) {
+function doPrintout (full) {
var densityscaled = "";
var bw = "";
var adjust = "";
@@ -37,7 +37,7 @@
plot_adds = getValue ("plotoptions.code.calculate");
- if (final) {
+ if (full) {
echo ('rk.header ("Histogram", list ("Variable", rk.get.description (' + x + ') ');
if ((densityscaled) && getValue ("density")) {
echo (', "Density bandwidth", "');
@@ -67,7 +67,7 @@
}
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_ltm.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_ltm.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_ltm.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -32,7 +32,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var plot_type = "";
var plot_type_item = "";
var inp_items = "";
@@ -46,8 +46,8 @@
var plot_ops_ylab = "";
var options = "";
var arr_items = "";
- // this function takes care of generating the code for the printout() section. If $final is set to true,
- // it generates the full code, including headers. If $final is set to false, only the essentials will
+ // this function takes care of generating the code for the printout() section. If $full is set to true,
+ // it generates the full code, including headers. If $full is set to false, only the essentials will
// be generated.
// let's read all values into php variables for the sake of readable code
@@ -102,12 +102,12 @@
if (annotation == "plain")
options[] = "annot=FALSE" ;
- if (final) {
+ if (full) {
echo ('rk.header("Two parameter logistic model plot")\n');
echo ('\n');
echo ('rk.graph.on()\n');
}
- // only the following section will be generated for $final==false
+ // only the following section will be generated for $full==false
// first we'll check wheter standard error curves should be plotted,
// because it takes two steps to draw them:
@@ -135,7 +135,7 @@
if (plot_options) echo(plot_options);
echo ('))\n');
}
- if (final) {
+ if (full) {
echo ('rk.graph.off()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_rasch.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_rasch.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_rasch.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -32,7 +32,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var plot_type = "";
var plot_type_item = "";
var inp_items = "";
@@ -46,8 +46,8 @@
var plot_ops_ylab = "";
var options = "";
var arr_items = "";
- // this function takes care of generating the code for the printout() section. If $final is set to true,
- // it generates the full code, including headers. If $final is set to false, only the essentials will
+ // this function takes care of generating the code for the printout() section. If $full is set to true,
+ // it generates the full code, including headers. If $full is set to false, only the essentials will
// be generated.
// let's read all values into php variables for the sake of readable code
@@ -99,12 +99,12 @@
if (annotation == "plain")
options[] = "annot=FALSE" ;
- if (final) {
+ if (full) {
echo ('rk.header("Rasch model plot")\n');
echo ('\n');
echo ('rk.graph.on()\n');
}
- // only the following section will be generated for $final==false
+ // only the following section will be generated for $full==false
// first we'll check wheter standard error curves should be plotted,
// because it takes two steps to draw them:
@@ -132,7 +132,7 @@
if (plot_options) echo(plot_options);
echo ('))\n');
}
- if (final) {
+ if (full) {
echo ('rk.graph.off()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_tpm.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_tpm.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/irt/dichotomous/plot_tpm.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -32,7 +32,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var plot_type = "";
var plot_type_item = "";
var inp_items = "";
@@ -46,8 +46,8 @@
var plot_ops_ylab = "";
var options = "";
var arr_items = "";
- // this function takes care of generating the code for the printout() section. If $final is set to true,
- // it generates the full code, including headers. If $final is set to false, only the essentials will
+ // this function takes care of generating the code for the printout() section. If $full is set to true,
+ // it generates the full code, including headers. If $full is set to false, only the essentials will
// be generated.
// let's read all values into php variables for the sake of readable code
@@ -99,12 +99,12 @@
if (annotation == "plain")
options[] = "annot=FALSE" ;
- if (final) {
+ if (full) {
echo ('rk.header("Birnbaum three parameter model plot")\n');
echo ('\n');
echo ('rk.graph.on()\n');
}
- // only the following section will be generated for $final==false
+ // only the following section will be generated for $full==false
// first we'll check wheter standard error curves should be plotted,
// because it takes two steps to draw them:
@@ -132,7 +132,7 @@
if (plot_options) echo(plot_options);
echo ('))\n');
}
- if (final) {
+ if (full) {
echo ('rk.graph.off()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_grm.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_grm.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_grm.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -33,7 +33,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var plot_type = "";
var plot_type_item = "";
var inp_items = "";
@@ -48,8 +48,8 @@
var plot_ops_ylab = "";
var options = "";
var arr_items = "";
- // this function takes care of generating the code for the printout() section. If $final is set to true,
- // it generates the full code, including headers. If $final is set to false, only the essentials will
+ // this function takes care of generating the code for the printout() section. If $full is set to true,
+ // it generates the full code, including headers. If $full is set to false, only the essentials will
// be generated.
// let's read all values into php variables for the sake of readable code
@@ -109,12 +109,12 @@
if (annotation == "plain")
options[] = "annot=FALSE" ;
- if (final) {
+ if (full) {
echo ('rk.header("Graded response model plot")\n');
echo ('\n');
echo ('rk.graph.on()\n');
}
- // only the following section will be generated for $final==false
+ // only the following section will be generated for $full==false
// first we'll check wheter standard error curves should be plotted,
// because it takes two steps to draw them:
@@ -142,7 +142,7 @@
if (plot_options) echo(plot_options);
echo ('))\n');
}
- if (final) {
+ if (full) {
echo ('rk.graph.off()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_pcm.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_pcm.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_pcm.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -26,7 +26,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var inp_items = "";
var spin_abilfrom = "";
var spin_abilto = "";
@@ -42,8 +42,8 @@
var plot_ops_ylab = "";
var options = "";
var arr_items = "";
- // this function takes care of generating the code for the printout() section. If $final is set to true,
- // it generates the full code, including headers. If $final is set to false, only the essentials will
+ // this function takes care of generating the code for the printout() section. If $full is set to true,
+ // it generates the full code, including headers. If $full is set to false, only the essentials will
// be generated.
// let's read all values into php variables for the sake of readable code
@@ -89,19 +89,19 @@
if (annotation == "plain")
options[] = "legpos=FALSE" ;
- if (final) {
+ if (full) {
echo ('rk.header("Partial credit model plot")\n');
echo ('\n');
echo ('rk.graph.on()\n');
}
- // only the following section will be generated for $final==false
+ // only the following section will be generated for $full==false
echo ('try(plotICC(' + getValue("x"));
if (options) echo(", "+join(", ", options));
if (plot_options) echo(plot_options);
echo ('))\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_rsm.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_rsm.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/irt/polytomous/plot_rsm.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -26,7 +26,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var inp_items = "";
var spin_abilfrom = "";
var spin_abilto = "";
@@ -42,8 +42,8 @@
var plot_ops_ylab = "";
var options = "";
var arr_items = "";
- // this function takes care of generating the code for the printout() section. If $final is set to true,
- // it generates the full code, including headers. If $final is set to false, only the essentials will
+ // this function takes care of generating the code for the printout() section. If $full is set to true,
+ // it generates the full code, including headers. If $full is set to false, only the essentials will
// be generated.
// let's read all values into php variables for the sake of readable code
@@ -89,19 +89,19 @@
if (annotation == "plain")
options[] = "legpos=FALSE" ;
- if (final) {
+ if (full) {
echo ('rk.header("Rating scale model plot")\n');
echo ('\n');
echo ('rk.graph.on()\n');
}
- // only the following section will be generated for $final==false
+ // only the following section will be generated for $full==false
echo ('try(plotICC(' + getValue("x"));
if (options) echo(", "+join(", ", options));
if (plot_options) echo(plot_options);
echo ('))\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/irt/tests/eRm_plotLR.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/irt/tests/eRm_plotLR.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/irt/tests/eRm_plotLR.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -32,7 +32,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var rad_splitcr = "";
var splitvector = "";
var inp_items = "";
@@ -54,8 +54,8 @@
var arr_items = "";
var = "";
var options = "";
- // this function takes care of generating the code for the printout() section. If $final is set to true,
- // it generates the full code, including headers. If $final is set to false, only the essentials will
+ // this function takes care of generating the code for the printout() section. If $full is set to true,
+ // it generates the full code, including headers. If $full is set to false, only the essentials will
// be generated.
// let's read all values into php variables for the sake of readable code
@@ -123,12 +123,12 @@
if (annotation == "number" || annotation == "none" || annotation == "identify")
options_plotgof[] = "tlab=\"$annotation\"" ;
- if (final) {
+ if (full) {
echo ('rk.header("Andersen\'s LR test")\n');
echo ('\n');
echo ('rk.graph.on()\n');
}
- // only the following section will be generated for $final==false
+ // only the following section will be generated for $full==false
echo ('lr.res <- LRtest(' + getValue("x"));
@@ -138,7 +138,7 @@
if (options_plotgof) echo(", "+join(", ", options_plotgof));
if (plot_options) echo(plot_options);
echo ('))\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/pareto.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/pareto.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/pareto.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -25,7 +25,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var vars = "";
var descriptives = "";
var tabulate = "";
@@ -43,7 +43,7 @@
echo ('}\n');
}
echo ('\n');
- if (final) {
+ if (full) {
echo ('rk.header ("Pareto chart")\n');
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -51,11 +51,11 @@
echo ('try ({\n');
echo (' descriptives <- pareto.chart(x' + getValue ("plotoptions.code.printout") + ')\n');
- if (final && descriptives) {
+ if (full && descriptives) {
echo (' rk.results(xtable(descriptives))\n');
}
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/piechart.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/piechart.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/piechart.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -29,7 +29,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var vars = "";
var tabulate = "";
var tabulate_header = "";
@@ -92,7 +92,7 @@
echo ('}\n');
}
echo ('\n');
- if (final) {
+ if (full) {
echo ('rk.header ("Pie chart", parameters=list ("Variable", rk.get.description (' + vars + '), ' + tabulate_header + ', ' + clockwise_header + '))\n');
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -109,7 +109,7 @@
echo (' pie(x' + options + ')\n');
if (!empty (plotpost)) printIndented ("\t", plotpost);
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/plot.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/plot.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/plot.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -19,7 +19,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var x = "";
var y = "";
var plot_adds = "";
@@ -31,7 +31,7 @@
// get additional code (as of now grid) from the calculate section
plot_adds = getValue ("plotoptions.code.calculate");
- if (final) {
+ if (full) {
echo ('rk.header ("Generic Plot")\n');
echo ('rk.graph.on ()\n');
@@ -46,7 +46,7 @@
}
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
Modified: trunk/rkward/rkward/plugins/plots/scatterplot.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/scatterplot.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/scatterplot.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -57,8 +57,8 @@
doPrintout (false);
}
-function doPrintout (final) {
- if (final) {
+function doPrintout (full) {
+ if (full) {
echo ('rk.header ("Scatterplot", parameters = list (\n');
echo (' "X variables"=paste (rk.get.description (' + x + '), collapse=", "),\n');
echo (' "Y variables"=paste (rk.get.description (' + y + '), collapse=", ")))\n');
@@ -82,7 +82,7 @@
echo (' )\n');
echo (' }\n');
echo ('})\n');
- if (final) {
+ if (full) {
echo ('\n');
echo ('rk.graph.off()\n');
}
Modified: trunk/rkward/rkward/plugins/plots/scatterplot_matrix.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/scatterplot_matrix.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/scatterplot_matrix.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -22,19 +22,19 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var vars = "";
vars = str_replace ("\n", ",", trim (getValue ("x"))) ;
echo ('data <- data.frame (' + vars + ')\n');
echo ('\n');
- if (final) {
+ if (full) {
echo ('rk.header ("Scatterplot Matrix", parameters=list ("Diagonal Panels", "' + getValue("diag")) echo ('", "Plot points", "' + getValue ("plot_points") + '", "Smooth", "' + getValue ("smooth") + '", "Ellipses", "' + getValue ("ellipse") + ' at 0.5 and 0.9 levels."))\n');
echo ('\n');
echo ('rk.graph.on ()\n');
}
echo ('try (scatterplot.matrix(data, diagonal="' + getValue("diag")) echo ('", plot.points=' + getValue ("plot_points") + ', smooth=' + getValue ("smooth") + ', ellipse=' + getValue ("ellipse") + '))\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/sieve_plot.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/sieve_plot.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/sieve_plot.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -24,7 +24,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var vars = "";
var shade = "";
var sievetype = "";
@@ -37,7 +37,7 @@
echo ('x <- ' + vars);
}
echo ('\n');
- if (final) {
+ if (full) {
echo ('rk.header ("Extended Sieve Plot", parameters=list ("Variable", rk.get.description (' + vars + '), "shade", ' + shade + '))\n');
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -50,7 +50,7 @@
echo (' sieve(x, shade = ' + shade + ', sievetype = "' + sievetype + '" ' + getValue ("plotoptions.code.printout") + ')\n');
if (!empty (plotpost)) printIndented ("\t", plotpost);
echo ('})\n');
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
Modified: trunk/rkward/rkward/plugins/plots/stripchart_plot.js
===================================================================
--- trunk/rkward/rkward/plugins/plots/stripchart_plot.js 2009-12-09 15:34:15 UTC (rev 2725)
+++ trunk/rkward/rkward/plugins/plots/stripchart_plot.js 2009-12-17 08:35:09 UTC (rev 2726)
@@ -20,7 +20,7 @@
doPrintout (false);
}
-function doPrintout (final) {
+function doPrintout (full) {
var x = "";
var g = "";
var method = "";
@@ -42,7 +42,7 @@
if (orientation == "Vertical") opts += ", vertical = TRUE";
plot_adds = getValue ("plotoptions.code.calculate"); //add grid and alike
- if (final) {
+ if (full) {
echo ('rk.header ("Stripchart", list ("Variable"=rk.get.description (' + x + '), "Group"=rk.get.description (' + g + '), "Method"=' + method + params + ', "Orientation"="' + orientation + '"))\n');
echo ('\n');
echo ('rk.graph.on ()\n');
@@ -54,7 +54,7 @@
printIndented ("\t", plot_adds);
}
- if (final) {
+ if (full) {
echo ('rk.graph.off ()\n');
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list