[rkward-cvs] SF.net SVN: rkward: [1345] trunk/rkward/rkward/plugins/plots
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Wed Feb 7 12:23:46 UTC 2007
Revision: 1345
http://svn.sourceforge.net/rkward/?rev=1345&view=rev
Author: tfry
Date: 2007-02-07 04:23:46 -0800 (Wed, 07 Feb 2007)
Log Message:
-----------
Change the confusing isexp options to isquote
Modified Paths:
--------------
trunk/rkward/rkward/plugins/plots/plot_options.php
trunk/rkward/rkward/plugins/plots/plot_options.rkh
trunk/rkward/rkward/plugins/plots/plot_options.xml
Modified: trunk/rkward/rkward/plugins/plots/plot_options.php
===================================================================
--- trunk/rkward/rkward/plugins/plots/plot_options.php 2007-02-07 11:55:24 UTC (rev 1344)
+++ trunk/rkward/rkward/plugins/plots/plot_options.php 2007-02-07 12:23:46 UTC (rev 1345)
@@ -35,7 +35,7 @@
$log .= getRK_val ("xlog");
$xlab = getRK_val ("xlab");
- if (($xlab != "") && (getRK_val ("xlabisexp") != "1")) {
+ if (($xlab != "") && (getRK_val ("xlabisquote") == "1")) {
$xlab = "\"" . $xlab . "\"";
}
if ($xlab != "") $xlab = ", xlab=" . $xlab;
@@ -61,7 +61,7 @@
$log .= getRK_val ("ylog");
$ylab = getRK_val ("ylab");
- if (($ylab != "") && (getRK_val ("ylabisexp") != "1")) {
+ if (($ylab != "") && (getRK_val ("ylabisquote") == "1")) {
$ylab = "\"" . $ylab . "\"";
}
if ($ylab != "") $ylab = ", ylab=" . $ylab;
@@ -93,14 +93,14 @@
//add a main (on top) to the plot
$main = getRK_val ("main");
- if (($main != "") && (getRK_val ("mainisexp") != "1")) {
+ if (($main != "") && (getRK_val ("mainisquote") == "1")) {
$main = "\"" . $main . "\"";
}
if ($main != "") $main = ", main=" . $main;
//add a subtitle (at bottom) to the plot
$sub = getRK_val ("sub");
- if (($sub != "") && (getRK_val ("subisexp") != "1")) {
+ if (($sub != "") && (getRK_val ("subisquote") == "1")) {
$sub = "\"" . $sub . "\"";
}
if ($sub != "") $sub = ", sub=" . $sub;
Modified: trunk/rkward/rkward/plugins/plots/plot_options.rkh
===================================================================
--- trunk/rkward/rkward/plugins/plots/plot_options.rkh 2007-02-07 11:55:24 UTC (rev 1344)
+++ trunk/rkward/rkward/plugins/plots/plot_options.rkh 2007-02-07 12:23:46 UTC (rev 1345)
@@ -11,9 +11,9 @@
<settings>
<caption id="titlepage"/>
<setting id="main">This is the <i>main</i> argument to plot.default. See R reference on <b>plot.default</b>.</setting>
- <setting id="mainisexp">Check this box to evaluate the <i>main</i> title as an R expression.</setting>
+ <setting id="mainisquote">If this box is checked, the <i>main</i> title will be used literally (quoted). Otherwise is will be interpreted as an R statement</setting>
<setting id="sub">This is the <i>sub</i> argument to plot.default. See R reference on <b>plot.default</b>. </setting>
- <setting id="subisexp">Check this box to evaluate the <i>sub</i> title as an R expression.</setting>
+ <setting id="subisquote">If this box is checked, the <i>sub</i> title will be used literally (quoted). Otherwise is will be interpreted as an R statement</setting>
<caption id="axespage"/>
<setting id="xaxt">Uncheck this box to avoid drawing the X axis. This is the <i>xaxt</i> argument to par. See R reference on <b>par</b>.</setting>
@@ -21,13 +21,12 @@
<setting id="xlog">This specifies the <i>log</i> argument to plot.default. Check this box to set <i>log="x"</i>. See R reference on <b>plot.default</b>.</setting>
<setting id="ylog">This specifies the <i>log</i> argument to plot.default. Check this box to set <i>log="y"</i>. Check both the boxes to set <i>log="xy"</i>. See R reference on <b>plot.default</b>.</setting>
- <setting id="axislabels">The X and Y axis labels. These are the <i>xlab</i> and <i>ylab</i> arguments to <b>plot.default</b>, respectively. The checkboxes enable or disable the labels being evaluated as R expressions.</setting>
+ <setting id="axislabels">The X and Y axis labels. These are the <i>xlab</i> and <i>ylab</i> arguments to <b>plot.default</b>, respectively. The checkboxes enable or disable the labels being evaluated as literal (quoted) strings.</setting>
<setting id="scale">The X and Y axis limits. These are the <i>xlim</i> and <i>ylim</i> arguments to <b>plot.default</b> respectively. For automatic evaluation of the limits, leave these blank.</setting>
<caption id="pointtypepage"/>
<setting id="pointtype">Choose one of the listed point/line types for the plot. To let the calling function use its default plotting type, choose the 'default' option. This is the <i>type</i> argument to <b>plot.default</b>.</setting>
- <caption id="pointcolorpage"/>
<setting id="pointcolor">Choose one of the listed point/line colors for the plot. To let the calling function use its default plotting color, choose the 'default' option. This is the <i>col</i> argument to <b>plot.default</b>.</setting>
<caption id="aspectratio"/>
Modified: trunk/rkward/rkward/plugins/plots/plot_options.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/plot_options.xml 2007-02-07 11:55:24 UTC (rev 1344)
+++ trunk/rkward/rkward/plugins/plots/plot_options.xml 2007-02-07 12:23:46 UTC (rev 1345)
@@ -41,13 +41,13 @@
<connect client="ymaxvalue.required" governor="ymax_required" />
<convert id="xlabfilled" mode="notequals" sources="xlab.text" standard="" />
- <connect client="xlabisexp.enabled" governor="xlabfilled" />
+ <connect client="xlabisquote.enabled" governor="xlabfilled" />
<convert id="ylabfilled" mode="notequals" sources="ylab.text" standard="" />
- <connect client="ylabisexp.enabled" governor="ylabfilled" />
+ <connect client="ylabisquote.enabled" governor="ylabfilled" />
<convert id="mainfilled" mode="notequals" sources="main.text" standard="" />
- <connect client="mainisexp.enabled" governor="mainfilled" />
+ <connect client="mainisquote.enabled" governor="mainfilled" />
<convert id="subfilled" mode="notequals" sources="sub.text" standard="" />
- <connect client="subisexp.enabled" governor="subfilled" />
+ <connect client="subisquote.enabled" governor="subfilled" />
<connect client="xlog.visible" governor="allow_log"/>
<connect client="ylog.visible" governor="allow_log"/>
@@ -57,15 +57,15 @@
</logic>
<dialog label="Default plot options" >
<tabbook>
- <tab id="titlepage" label="Title">
+ <tab id="titlepage" label="Title">
<column>
<frame label="Main title">
<input id="main" label="Main title (on top). Leave empty for default title" />
- <checkbox id="mainisexp" label="Interpret this label as an R expression (as opposed to a literal string)?" value="1" />
+ <checkbox id="mainisquote" label="Interpret this label as literal (quoted) string" checked="true" value="1" />
</frame>
<frame label="Subtitle">
<input id="sub" label="Sub-title (at bottom). Leave empty for default title" />
- <checkbox id="subisexp" label="Interpret this label as an R expression (as opposed to a literal string)?" value="1" />
+ <checkbox id="subisquote" label="Interpret this label as literal (quoted) string" checked="true" value="1" />
</frame>
<stretch/>
</column>
@@ -87,10 +87,10 @@
<input id="xlab" label="X axis label" />
<input id="ylab" label="Y axis label" />
</row>
- <text>Interpret these labels be as R expressions (as opposed to string literals)?</text>
+ <text>Interpret these labels as literal (quoted) strings?</text>
<row>
- <checkbox id="xlabisexp" label="interpret as expression" value="1" />
- <checkbox id="ylabisexp" label="interpret as expression" value="1" />
+ <checkbox id="xlabisquote" label="interpret as string" value="1" checked="true" />
+ <checkbox id="ylabisquote" label="interpret as string" value="1" checked="true" />
</row>
</frame>
<frame id="scale" label="Scale (Minimum/Maximum values for X/Y). Leave blank for automatic">
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