[rkward-cvs] rkward/rkward/plugins/plots plot_options.php,1.2,1.3 plot_options.xml,1.3,1.4

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/plugins/plots
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1831/plots

Modified Files:
	plot_options.php plot_options.xml 
Log Message:
Updates, cleanups and bugfixes for plugins

Index: plot_options.php
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugins/plots/plot_options.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** plot_options.php	23 Mar 2006 15:09:51 -0000	1.2
--- plot_options.php	5 Apr 2006 10:10:04 -0000	1.3
***************
*** 74,79 ****
  	if ($log != "") $log = ", log=\"" . $log . "\"";
  
  	// make option string
! 	$options = $xaxt . $yaxt . $log . $xlim . $ylim . $xlab . $ylab;
  
  	echo ($options);
--- 74,82 ----
  	if ($log != "") $log = ", log=\"" . $log . "\"";
  
+ 	$type = getRK_val ("pointtype");
+ 	if (!empty ($type)) $type = ", type=\"" . $type . "\"";
+ 
  	// make option string
! 	$options = $type . $xaxt . $yaxt . $log . $xlim . $ylim . $xlab . $ylab;
  
  	echo ($options);

Index: plot_options.xml
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/plugins/plots/plot_options.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plot_options.xml	23 Mar 2006 15:09:51 -0000	1.3
--- plot_options.xml	5 Apr 2006 10:10:04 -0000	1.4
***************
*** 3,21 ****
  	<code file="plot_options.php" />
  	<logic>
- 		<connect client="xlog.enabled" governor="xaxt.state" />
- 		<connect client="xlab.enabled" governor="xaxt.state" />
  		<convert id="xlabfilled" mode="notequals" sources="xlab.text" standard="" />
! 		<convert id="xlabspecified" mode="and" sources="xlabfilled;xlab.enabled" />
! 		<connect client="xlabisexp.enabled" governor="xlabspecified" />
! 		<connect client="xminvalue.enabled" governor="xaxt.state" />
! 		<connect client="xmaxvalue.enabled" governor="xaxt.state" />
  
- 		<connect client="ylog.enabled" governor="yaxt.state" />
- 		<connect client="ylab.enabled" governor="yaxt.state" />
  		<convert id="ylabfilled" mode="notequals" sources="ylab.text" standard="" />
! 		<convert id="ylabspecified" mode="and" sources="ylabfilled;ylab.enabled" />
! 		<connect client="ylabisexp.enabled" governor="ylabspecified" />
! 		<connect client="yminvalue.enabled" governor="yaxt.state" />
! 		<connect client="ymaxvalue.enabled" governor="yaxt.state" />
  
  		<external id="xvar" />
--- 3,11 ----
  	<code file="plot_options.php" />
  	<logic>
  		<convert id="xlabfilled" mode="notequals" sources="xlab.text" standard="" />
! 		<connect client="xlabisexp.enabled" governor="xlabfilled" />
  
  		<convert id="ylabfilled" mode="notequals" sources="ylab.text" standard="" />
! 		<connect client="ylabisexp.enabled" governor="ylabfilled" />
  
  		<external id="xvar" />
***************
*** 59,103 ****
  				</column>
  			</tab>
  		</tabbook>
  	</dialog>
- 	<wizard>
- 		<page>
- 			<text>This wizard is for test purposes only! Remove it!</text>
- 		</page>
- 		<page>
- 			<column>
- 				<frame id="axistypes" label="Axis types">
- 					<row>
- 						<checkbox id="xaxt" label="Draw X axis" checked="true" value="" value_unchecked="n" />
- 						<checkbox id="yaxt" label="Draw Y axis" checked="true" value="" value_unchecked="n" />
- 					</row>
- 					<row>
- 						<checkbox id="xlog" label="X axis logarithmic" checked="false" value="x" value_unchecked="" />
- 						<checkbox id="ylog" label="Y axis logarithmic" checked="false" value="y" value_unchecked="" />
- 					</row>
- 				</frame>
- 				<frame id="axislabels" label="Labels (leave empty for default)">
- 					<row>
- 						<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>
- 					<row>
- 						<checkbox id="xlabisexp" label="interpret as expression" value="1" />
- 						<checkbox id="ylabisexp" label="interpret as expression" value="1" />
- 					</row>
- 				</frame>
- 				<frame id="scale" label="Scale (Minimum/Maximum values for X/Y). Leave blank for automatic">
- 					<row>
- 						<input id="xminvalue" label="Min X value" />
- 						<input id="yminvalue" label="Min Y value" />
- 					</row>
- 					<row>
- 						<input id="xmaxvalue" label="Max X value" />
- 						<input id="ymaxvalue" label="Max Y value" />
- 					</row>
- 				</frame>
- 			</column>
- 		</page>
- 	</wizard>
  </document>
--- 49,66 ----
  				</column>
  			</tab>
+ 			<tab label="Points / Lines">
+ 				<radio id="pointtype" label="Type of points/lines" >
+ 					<option value="" label="default" checked="true" />
+ 					<option value="p" label="Plot individual points " />
+ 					<option value="l" label="Plot lines " />
+ 					<option value="b" label="Plot points connected by lines (both)" />
+ 					<option value="o" label="Plot points overlaid by lines " />
+ 					<option value="h" label="Plot vertical lines from points to the zero axis (high-density)" />
+ 					<option value="s" label="Step-function plots: the left edge defines the point" />
+ 					<option value="S" label="Step-function plots: the right edge defines the point" />
+ 				</radio>
+ 			<stretch/>
+ 			</tab>
  		</tabbook>
  	</dialog>
  </document>