[rkward-cvs] SF.net SVN: rkward: [2286] branches/KDE4_port/rkward/plugins

tfry at users.sourceforge.net tfry at users.sourceforge.net
Sun Dec 30 14:23:10 UTC 2007


Revision: 2286
          http://rkward.svn.sourceforge.net/rkward/?rev=2286&view=rev
Author:   tfry
Date:     2007-12-30 06:23:10 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
Merge plugin changes into KDE 4 branch

Modified Paths:
--------------
    branches/KDE4_port/rkward/plugins/00saveload/import/import_csv.php
    branches/KDE4_port/rkward/plugins/00saveload/import/import_csv.xml
    branches/KDE4_port/rkward/plugins/00saveload/import/import_spss.php
    branches/KDE4_port/rkward/plugins/analysis.pluginmap
    branches/KDE4_port/rkward/plugins/plots/histogram.php
    branches/KDE4_port/rkward/plugins/plots/histogram.rkh
    branches/KDE4_port/rkward/plugins/plots/histogram.xml
    branches/KDE4_port/rkward/plugins/plots/stripchart_plot.php
    branches/KDE4_port/rkward/plugins/plots/stripchart_plot.xml
    branches/KDE4_port/rkward/plugins/under_development.pluginmap

Modified: branches/KDE4_port/rkward/plugins/00saveload/import/import_csv.php
===================================================================
--- branches/KDE4_port/rkward/plugins/00saveload/import/import_csv.php	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/00saveload/import/import_csv.php	2007-12-30 14:23:10 UTC (rev 2286)
@@ -8,14 +8,23 @@
 }
 
 function calculate () {
-	$dec = getRK_val ("dec");
-	if ($dec == "other") $dec = quoteString (getRK_val ("custom_dec"));
-	$sep = getRK_val ("sep");
-	if ($sep == "other") $sep = quoteString (getRK_val ("custom_sep"));
-	$quote = getRK_val ("quote");
-	if ($quote == "other") $quote = quoteString (getRK_val ("custom_quote"));
-
-getRK("name"); ?> <<- read.table (file="<? getRK("file"); ?>", header=<? getRK("header"); ?>, sep=<? echo ($sep); ?>, quote=<? echo ($quote); ?>, dec=<? echo ($dec); ?>, <? # doing row names (what a pity...) 
+	$quick = getRK_val ("quick");
+	if ($quick == "table") {
+		$dec = getRK_val ("dec");
+		if ($dec == "other") $dec = quoteString (getRK_val ("custom_dec"));
+		$sep = getRK_val ("sep");
+		if ($sep == "other") $sep = quoteString (getRK_val ("custom_sep"));
+		$quote = getRK_val ("quote");
+		if ($quote == "other") $quote = quoteString (getRK_val ("custom_quote"));
+		$header = getRK_val ("header");
+		$fill = getRK_val ("fill");
+		$comchar = quoteString (getRK_val ("commentchar"));
+		$tableOptions = ", header={$header}, sep={$sep}, quote={$quote}, dec={$dec}, fill={$fill}, comment.char={$comchar}";
+	} else {
+		$tableOptions = "";
+	}
+// Other method is to use read.table and show all the options - more transparent
+getRK("name"); ?> <<- read.<? echo ($quick); ?> (file="<? getRK("file"); ?>"<? echo ($tableOptions); ?>, <? # doing row names (what a pity...) 
 	if (getRK_val("rowname")!="NULL") {
 		echo( "row.names = ");
 		if (getRK_val("rowname")=="rowcol") echo (getRK("nomrow") . ",");
@@ -26,7 +35,7 @@
 	# doing col class (what a pity...)
 	if (getRK_val("colclass") == "custoClass") echo( "colClasses = " . getRK_val ("custoClasses") . ",");
 	#doing what is left
-?> na.strings = "<? getRK("na")  ?>", nrows = <? getRK("nrows") ; ?>, skip = <? getRK("skip") ; ?>, check.names = <? getRK("checkname") ; ?>, fill = <? getRK("fill") ; ?>, strip.white = <? getRK("stripwhite") ; ?>, blank.lines.skip = <? getRK("blanklinesskip") ; ?>, comment.char=<? echo (quoteString (getRK_val("commentchar"))); ?><? getRK("allow_escapes"); ?><? getRK("flush"); ?><? getRK("strings_as_factors"); ?>)
+?> na.strings = "<? getRK("na")  ?>", nrows = <? getRK("nrows") ; ?>, skip = <? getRK("skip") ; ?>, check.names = <? getRK("checkname") ; ?>, strip.white = <? getRK("stripwhite") ; ?>, blank.lines.skip = <? getRK("blanklinesskip") ; ?><? getRK("allow_escapes"); ?><? getRK("flush"); ?><? getRK("strings_as_factors"); ?>)
 <?	if (getRK_val ("doedit")) { ?>
 
 rk.edit (<? getRK ("name"); ?>)

Modified: branches/KDE4_port/rkward/plugins/00saveload/import/import_csv.xml
===================================================================
--- branches/KDE4_port/rkward/plugins/00saveload/import/import_csv.xml	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/00saveload/import/import_csv.xml	2007-12-30 14:23:10 UTC (rev 2286)
@@ -6,20 +6,54 @@
 		<external id="filename" />
 		<connect governor="filename" client="file.selection"/>
 
-		<connect client="rowname.enabled" governor="isrow.state" />
-
-		<convert id="customsep" mode="equals" sources="sep.string" standard="other" />
-		<connect client="custom_sep.enabled" governor="customsep" />
-		<connect client="custom_sep.required" governor="custom_sep.enabled" />
-
+		<convert id="quickNone" mode="equals" sources="quick.string" standard="table" />
+		<convert id="quickCSV" mode="equals" sources="quick.string" standard="csv" />
+		<convert id="quickCSV2" mode="equals" sources="quick.string" standard="csv2" />
+		<convert id="quickTAB" mode="equals" sources="quick.string" standard="delim" />
+		<convert id="quickTAB2" mode="equals" sources="quick.string" standard="delim2" />
+		<convert id="quickCC2TT2" mode="notequals" sources="quick.string" standard="table" />
+		
+		<connect client="header.enabled" governor="quickNone" />
+		<connect client="header.state" governor="quickCC2TT2" />
+		<connect client="fill.state" governor="quickCC2TT2" />
+		<connect client="commentchar.enabled" governor="quickNone" />
+		<connect client="fill.enabled" governor="quickNone" />
+		
+		<convert id="quickNCT" mode="or" sources="quickNone;quickCSV;quickTAB"/>
+		<connect client="dec.decPeriod.enabled" governor="quickNCT" />
+		<convert id="quickNC2T2" mode="or" sources="quickNone;quickCSV2;quickTAB2"/>
+		<connect client="dec.decComma.enabled" governor="quickNC2T2" />
+		<connect client="dec.decOther.enabled" governor="quickNone" />
+		
 		<convert id="customdec" mode="equals" sources="dec.string" standard="other" />
 		<connect client="custom_dec.enabled" governor="customdec" />
 		<connect client="custom_dec.required" governor="custom_dec.enabled" />
 		
+		<convert id="quickNTT2" mode="or" sources="quickNone;quickTAB;quickTAB2"/>
+		<connect client="sep.sepTab.enabled" governor="quickNTT2" />
+		
+		<convert id="quickNC2" mode="or" sources="quickNone;quickCSV2"/>
+		<connect client="sep.sepSemiC.enabled" governor="quickNC2" />
+		<convert id="quickNC" mode="or" sources="quickNone;quickCSV"/>
+		<connect client="sep.sepComma.enabled" governor="quickNC" />
+		<connect client="sep.sepSpace.enabled" governor="quickNone" />
+		<connect client="sep.sepOther.enabled" governor="quickNone" />
+		
+		<convert id="customsep" mode="equals" sources="sep.string" standard="other" />
+		<connect client="custom_sep.enabled" governor="customsep" />
+		<connect client="custom_sep.required" governor="custom_sep.enabled" />
+		
+		<connect client="quote.quoteSingQ.enabled" governor="quickNone" />
+		<connect client="quote.quoteDoubQSingQ.enabled" governor="quickNone" />
+		<connect client="quote.quoteNone.enabled" governor="quickNone" />
+		<connect client="quote.quoteOther.enabled" governor="quickNone" />
+		
 		<convert id="customquote" mode="equals" sources="quote.string" standard="other" />
 		<connect client="custom_quote.enabled" governor="customquote" />
 		<connect client="custom_quote.required" governor="custom_quote.enabled" />
 
+		<connect client="rowname.enabled" governor="isrow.state" />
+		
 		<convert id="userow" mode="equals" sources="rowname.string" standard="rowcol" />
 		<convert id="customizerow" mode="equals" sources="rowname.string" standard="custoRow" />
 		<convert id="customizerow2" mode="and" sources="isrow.state;customizerow" standard="custoRow" />
@@ -38,90 +72,104 @@
 	<dialog label="Import Text / CSV data" >
 		<tabbook>
 			<tab id="tab_general" label="General" >
-				<browser id="file" type="file" label="File name" />
+				<browser id="file" type="file" label="File name"/>
 				<row>
 					<saveobject id="name" initial="my.csv.data" label="Object to save to"/>
 					<checkbox id="doedit" value="1" value_unchecked="0" label="Edit Object" checked="true" />
 				</row>
-				<checkbox id="header" value="TRUE" value_unchecked="FALSE" checked="true" label="First row contains column names"/>
 				<row>
 					<column>
+						<radio id="quick" label="Quick mode" >
+							<option value="table" label="None" checked="true"/>
+							<option value="csv" label="CSV" />
+							<option value="csv2" label="CSV2" />
+							<option value="delim" label="TAB" />
+							<option value="delim2" label="TAB2" />
+						</radio>
+					</column>
+					<column>
+						<checkbox id="header" value="TRUE" value_unchecked="FALSE" checked="false" label="Column names in first row"/>
 						<radio id="dec" label="Decimal point character" >
-							<option value="'.'" label="'.'" />
-							<option value="','" label="','" />
-							<option value="other" label="Other (specify below)" />
+							<option id="decPeriod" value="'.'" label="'.' (Period)" />
+							<option id="decComma" value="','" label="',' (Comma)" />
+							<option id="decOther" value="other" label="Other (specify below)" />
 						</radio>
 						<input id="custom_dec" label="Specify decimal point character" />
 					</column>
 					<column>
 						<radio id="sep" label="Field separator character" >
-							<option value="'\t'" label="Tab" />
-							<option value="';'" label="';'" />
-							<option value="','" label="','" />
-							<option value="' '" label="Space" />
-							<option value="other" label="Other (specify below)" />
+							<option id="sepTab" value="'\t'" label="Tab" />
+							<option id="sepSemiC" value="';'" label="';' (Semicolon)" />
+							<option id="sepComma" value="','" label="',' (Comma)" />
+							<option id="sepSpace" value="' '" label="Space" />
+							<option id="sepOther" value="other" label="Other (specify below)" />
 						</radio>
 						<input id="custom_sep" label="Specify field separator character" />
 					</column>
 				</row>
 			</tab>
-			<tab id="tab_rows" label="Rows" >
-				<checkbox value_unchecked="false" checked="false" value="true" id="isrow" label="Customize row names" />
-				<radio id="rowname" label="Rows names" >
-					<option value="NULL" label="Number" />
-					<option value="rowcol" label="As specified in column x:" />
-					<option value="custoRow" label="Use a vector" />
-				</radio>
-				<input size="small" id="nomrow" initial="1" label="Column number or variable name" />
-				<input id="rownames" label="Vector of row names (quoted)" />
+			<tab id="tab_rows" label="Rows and Columns" >
+				<row>
+					<column>
+						<frame label="Row Specifications">
+							<checkbox value_unchecked="false" checked="false" value="true" id="isrow" label="Customize row names" />
+							<radio id="rowname" label="Rows names" >
+								<option value="NULL" label="Number" />
+								<option value="rowcol" label="As specified in column x:" />
+								<option value="custoRow" label="Use a vector" />
+							</radio>
+							<input size="small" id="nomrow" initial="1" label="Column number or variable name" />
+							<input id="rownames" label="Vector of row names (quoted)" />
+						</frame>
+					</column>
+					<column>
+						<frame label="Column Specifications">
+							<radio id="colname" label="Column names" >
+								<option value="" label="Default" />
+								<option value="custoCol" label="Use a character vector" />
+							</radio>
+							<input id="colnames" label="Vector of column names (quoted)" />
+						<checkbox id="flush" label="Skip any further fields" value=", flush=TRUE" value_unchecked="" />
+							<radio id="colclass" label="Classes of columns" >
+								<option value="" label="Default" />
+								<option value="custoClass" label="Use a character vector" />
+							</radio>
+							<input id="custoClasses" label="Vector of column classes (quoted)" />
+						</frame>
+					</column>
+				</row>
 			</tab>
-			<tab id="tab_columns"  label="Columns" >
-				<frame label="Column names">
-					<radio id="colname" label="Column names" >
-						<option value="" label="Default" />
-						<option value="custoCol" label="Use a character vector" />
+			
+			<tab id="tab_further_options" label="Further Options" >
+				<row>
+				<column>
+					<checkbox id="allow_escapes" label="Allow escaped characters" value=", allowEscapes=TRUE" value_unchecked="" />
+					<radio id="strings_as_factors" label="Convert character columns to factors" >
+						<option value=", stringsAsFactors=TRUE" label="Convert to factor" />
+						<option value="" label="Default" checked="true" />
+						<option value=", stringsAsFactors=FALSE" label="Do not convert" />
 					</radio>
-					<input id="colnames" label="Vector of column names (quoted)" />
-				</frame>
-				<checkbox id="flush" label="Skip any further fields" value=", flush=TRUE" value_unchecked="" />
-				<frame label="Column classes">
-					<radio id="colclass" label="Classes of columns" >
-						<option value="" label="Default" />
-						<option value="custoClass" label="Use a character vector" />
+					<radio id="quote" label="String delimiter" >
+						<option id="quoteDoubQ" value="'\"'" label="" only" />
+						<option id="quoteSingQ" value="'\''" label="' only" />
+						<option id="quoteDoubQSingQ" value="'"\''" label="" and '" checked="true"/>
+						<option id="quoteNone" value="''" label="None / disabled" />
+						<option id="quoteOther" value="other" label="Other (specify below)" />
 					</radio>
-					<input id="custoClasses" label="Vector of column classes (quoted)" />
-				</frame>
+					<input id="custom_quote" label="Specify quoting character(s)" />
+				</column>
+				<column>
+						<input size="small" initial="0" id="skip" label="Skip x lines at the start of the file" />
+						<input size="small" initial="-1" id="nrows" label="Max number of lines to read (-1 for no limit)" />
+						<input size="small" initial="NA" id="na" label="Character for missing values" />
+						<input size="small" initial="#" id="commentchar" label="Character for comments" />
+					<checkbox id="fill" checked="false" value="TRUE" value_unchecked="FALSE" label="Fill the rows if unequal length" />
+					<checkbox value_unchecked="FALSE" checked="true" value="TRUE" id="checkname" label="Check syntax of the variables names" />
+					<checkbox value_unchecked="FALSE" checked="false" value="TRUE" id="stripwhite" label="Strip white values" />
+					<checkbox value_unchecked="FALSE" checked="true" value="TRUE" id="blanklinesskip" label="Skip blank lines" />
+				</column>
+			</row>
 			</tab>
-			<tab id="tab_strings"  label="Strings" >
-				<checkbox id="allow_escapes" label="Allow escaped characters" value=", allowEscapes=TRUE" value_unchecked="" />
-				<radio id="strings_as_factors" label="Convert character columns to factors" >
-					<option value=", stringsAsFactors=TRUE" label="Convert to factor" />
-					<option value="" label="Default" checked="true" />
-					<option value=", stringsAsFactors=FALSE" label="Do not convert" />
-				</radio>
-				<radio id="quote" label="String delimiter" >
-					<option value="'"'" label="" only" />
-					<option value="'\''" label="' only" />
-					<option value="'"\''" label="" and '" checked="true"/>
-					<option value="''" label="None / disabled" />
-					<option value="other" label="Other (specify below)" />
-				</radio>
-				<input id="custom_quote" label="Specify quoting character(s)" />
-			</tab>
-			<tab id="tab_further_options" label="Further Options" >
-				<row>
-					<input size="small" initial="0" id="skip" label="Skip x lines at the start of the file" />
-					<input size="small" initial="-1" id="nrows" label="Max number of lines to read (-1 for no limit)" />
-				</row>
-				<row>
-					<input size="small" initial="NA" id="na" label="Character for missing values" />
-					<input size="small" initial="#" id="commentchar" label="Character for comments" />
-				</row>
-				<checkbox id="fill" checked="false" value="TRUE" value_unchecked="FALSE" label="Fill the rows if unequal length" />
-				<checkbox value_unchecked="FALSE" checked="true" value="TRUE" id="checkname" label="Check syntax of the variables names" />
-				<checkbox value_unchecked="FALSE" checked="false" value="TRUE" id="stripwhite" label="Strip white values" />
-				<checkbox value_unchecked="FALSE" checked="true" value="TRUE" id="blanklinesskip" label="Skip blank lines" />
-			</tab>
 		</tabbook>
 	</dialog>
 </document>

Modified: branches/KDE4_port/rkward/plugins/00saveload/import/import_spss.php
===================================================================
--- branches/KDE4_port/rkward/plugins/00saveload/import/import_spss.php	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/00saveload/import/import_spss.php	2007-12-30 14:23:10 UTC (rev 2286)
@@ -25,14 +25,15 @@
 	}
 
 	if (getRK_val ("use_labels")) {
-		$labels_opt = ", use.value.labels=TRUE";
 		$labels_opt .= ", max.value.labels=" . getRK_val ("labels_limit");
 		if (getRK_val ("trim_labels")) $labels_opt .= ", trim.factor.names=TRUE";
-	}
+	} else {
+		$labels_opt = ", use.value.labels=FALSE";
+        }
 
 	$object = getRK_val ("saveto");
 ?>
-<? echo ($object); ?> <- read.spss ("<? getRK ("file"); ?>"<? echo ($data_frame_opt); echo ($labels_opt); ?>)
+data <- read.spss ("<? getRK ("file"); ?>"<? echo ($data_frame_opt); echo ($labels_opt); ?>)
 <?	if (getRK_val ("do_locale_conversion")) {
 		$from_locale = getRK_val ("encoding");
 		if ($from_locale == "other") {
@@ -40,24 +41,25 @@
 		} ?>
 
 # convert all strings to the current encoding
-<? echo ($object); ?> <- iconv.recursive (<? echo ($object); ?>, from="<? echo ($from_locale); ?>")
+data <- iconv.recursive (data, from="<? echo ($from_locale); ?>")
 <?	}
 	if (getRK_val ("convert_var_labels")) { ?>
 
 # set variable labels for use in RKWard
-labels <- attr (<? echo ($object); ?>, "variable.labels");
+labels <- attr (data, "variable.labels");
 if (!is.null (labels)) {
 	for (i in 1:length (labels)) {
 		col <- make.names (names (labels[i]))
 		if (!is.null (col)) {
-			rk.set.label (<? echo ($object); ?>[[col]], labels[i])
+			rk.set.label (data[[col]], labels[i])
 		}
 	}
 }
-<?	}
+<?	} ?>
+
+<? echo ($object); ?> <<- data		# assign to globalenv()
+<?
 	if (getRK_val ("doedit") && $data_frame) { ?>
-
-<? echo ($object); ?> <<- <? echo ($object); ?>		# assign to globalenv()
 rk.edit (<? echo ($object); ?>)
 <?	}
 }

Modified: branches/KDE4_port/rkward/plugins/analysis.pluginmap
===================================================================
--- branches/KDE4_port/rkward/plugins/analysis.pluginmap	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/analysis.pluginmap	2007-12-30 14:23:10 UTC (rev 2286)
@@ -88,9 +88,9 @@
 				<entry component="linear_regression"/>
 			</menu>
 			<menu id="variances" label="Variances" index="10">
-				<entry component="bartlett_test"/>
-				<entry component="F_test"/>
-				<entry component="fligner_test"/>
+				<entry component="bartlett_test" index="0"/>
+				<entry component="F_test" index="1"/>
+				<entry component="fligner_test" index="2"/>
 			</menu>
 			<menu id="time_series" label="Time Series" index="10">
 				<entry component="Box_test"/>

Modified: branches/KDE4_port/rkward/plugins/plots/histogram.php
===================================================================
--- branches/KDE4_port/rkward/plugins/plots/histogram.php	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/plots/histogram.php	2007-12-30 14:23:10 UTC (rev 2286)
@@ -21,10 +21,13 @@
 	$bw =  getRK_val ("bw");
 	$adjust = getRK_val ("adjust");
 	$narm = getRK_val ("narm");
+	$n = getRK_val ("n"); //calls "resolution"
 	$x = getRK_val ("x");
+	$plot_adds = getRK_val ("plotoptions.code.calculate");
 
+
 	if ($final) { ?>
-rk.header ("Histogram", list ("Variable", rk.get.description (<? echo ($x); ?>)<? getRK ("histogram_opt.code.preprocess"); ?>))
+rk.header ("Histogram", list ("Variable", rk.get.description (<? echo ($x); ?>) <? if (($densityscaled) && getRK_val ("density")) { ?>, "Density bandwidth", "<? echo ($bw); ?>", "Density adjust", <? echo ($adjust); ?>, "Density resolution", <? echo ($n); ?>, "Density Remove missing values", <? echo ($narm); ?> <? } ?> <? getRK ("histogram_opt.code.preprocess"); ?>))
 
 rk.graph.on ()
 <?	}
@@ -34,6 +37,12 @@
 <?	if (($densityscaled) && getRK_val ("density")) { ?>
 	lines(density(<? echo ($x); ?>, bw="<? echo ($bw); ?>", adjust = <? echo ($adjust); ?>, <? echo ($narm); ?>, n = <? getRK ("n"); ?>)<? getRK ("col_density.code.printout"); ?>)
 <?	} ?>
+<?	if (!empty ($plot_adds)) { ?>
+
+<?		// print the grid() related code
+		printIndented ("\t", $plot_adds);
+	}
+?>
 })
 <?	if ($final) { ?>
 rk.graph.off ()

Modified: branches/KDE4_port/rkward/plugins/plots/histogram.rkh
===================================================================
--- branches/KDE4_port/rkward/plugins/plots/histogram.rkh	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/plots/histogram.rkh	2007-12-30 14:23:10 UTC (rev 2286)
@@ -4,7 +4,7 @@
 		Plot a histogram.
 	</summary>
 	<usage>
-		Select a variable to plot a histogram for. For available options, see below.
+		Select a variable to plot a histogram. For available options, see below.
 	</usage>
 	<settings>
 		<caption id="tab_variables"/>

Modified: branches/KDE4_port/rkward/plugins/plots/histogram.xml
===================================================================
--- branches/KDE4_port/rkward/plugins/plots/histogram.xml	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/plots/histogram.xml	2007-12-30 14:23:10 UTC (rev 2286)
@@ -21,6 +21,8 @@
 		<connect client="adjust.enabled" governor="dodensity"/>
 		<connect client="narm.enabled" governor="dodensity"/>
 		<connect client="n.enabled" governor="dodensity"/>
+		
+		<set id="plotoptions.allow_grid" to="true"/>
 	</logic>
 	<dialog label="Histogram" >
 		<tabbook>

Modified: branches/KDE4_port/rkward/plugins/plots/stripchart_plot.php
===================================================================
--- branches/KDE4_port/rkward/plugins/plots/stripchart_plot.php	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/plots/stripchart_plot.php	2007-12-30 14:23:10 UTC (rev 2286)
@@ -22,6 +22,7 @@
 	$jitter = getRK_val ("jitter");
 	$offset = getRK_val ("offset");
 	$vertical = getRK_val ("vertical");
+	$plot_adds = getRK_val ("plotoptions.code.calculate"); //add grid and alike
 
 	if ($final) { ?>
 rk.header ("Stripchart", list ("Variable", rk.get.description (<? echo ($x); ?>), "Group", rk.get.description (<? echo ($g); ?>), "Method", <? echo ($method); ?>, "Jitter", <? echo ($jitter); ?>, "Plot drawn vertically", <? echo ($vertical); ?>, "Offset", <? echo ($offset); ?>))
@@ -29,6 +30,12 @@
 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"); ?>))
+<?	if (!empty ($plot_adds)) { ?>
+
+<?		// print the grid() related code
+		printIndented ("\t", $plot_adds);
+	}
+?>
 <?	if ($final) { ?>
 rk.graph.off ()
 <?	}

Modified: branches/KDE4_port/rkward/plugins/plots/stripchart_plot.xml
===================================================================
--- branches/KDE4_port/rkward/plugins/plots/stripchart_plot.xml	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/plots/stripchart_plot.xml	2007-12-30 14:23:10 UTC (rev 2286)
@@ -6,6 +6,8 @@
 		<set id="plotoptions.allow_log" to="true"/>
 		<set id="plotoptions.allow_type" to="false"/>
 		<set id="plotoptions.allow_asp" to="true"/>
+		
+		<set id="plotoptions.allow_grid" to="true"/>
 	</logic>
 	<dialog label="Stripchart" >
 		<tabbook>

Modified: branches/KDE4_port/rkward/plugins/under_development.pluginmap
===================================================================
--- branches/KDE4_port/rkward/plugins/under_development.pluginmap	2007-12-19 18:00:11 UTC (rev 2285)
+++ branches/KDE4_port/rkward/plugins/under_development.pluginmap	2007-12-30 14:23:10 UTC (rev 2286)
@@ -4,6 +4,8 @@
 	<components>
 		<component type="standard" id="simple_anova" file="simple_anova/description.xml" label="Simple Anova" />
 		<component type="standard" id="jb_test" file="distributions/tests/jb_test.xml" label="Jarque-Bera Normality Test" />
+
+		<component type="standard" id="levene_test" file="analysis/variances/levene_test.xml" label="Levene's Test" />
 	</components>
 
 	<hierarchy>
@@ -15,6 +17,9 @@
 		</menu>
 		<menu id="analysis" label="Analysis" index="4">
 			<entry component="simple_anova" index="9"/>
+			<menu id="variances" label="Variances" index="10">
+				<entry component="levene_test" index="3"/>
+			</menu>
 		</menu>
 		<menu id="plots" label="Plots" index="5">
 		</menu>


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