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

sjar at users.sourceforge.net sjar at users.sourceforge.net
Mon Feb 5 19:36:42 UTC 2007


Revision: 1332
          http://svn.sourceforge.net/rkward/?rev=1332&view=rev
Author:   sjar
Date:     2007-02-05 11:36:42 -0800 (Mon, 05 Feb 2007)

Log Message:
-----------
added points/lines color option (Sorry Thomas, I couldn't resist ;) When I saw names like tomato, salmon or limegreen I had to include them). 

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/plots/plot_options.php
    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-05 19:16:05 UTC (rev 1331)
+++ trunk/rkward/rkward/plugins/plots/plot_options.php	2007-02-05 19:36:42 UTC (rev 1332)
@@ -85,7 +85,12 @@
 	if (empty ($type)) $type = getRK_val ("default_pointtype");
 	if (!empty ($type)) $type = ", type=\"" . $type . "\"";
 
-	///Begin of Additions by Stefan Roediger
+	//color of points / lines
+	$col = getRK_val ("pointcolor");
+	if (empty ($col)) $col = getRK_val ("default_pointcolor");
+	if (!empty ($col)) $col = ", col=\"" . $col . "\"";
+	
+
 	//add a main (on top) to the plot
 	$main = getRK_val ("main");
 	if (($main != "") && (getRK_val ("mainisexp") != "1")) {
@@ -104,10 +109,9 @@
 	$asp = getRK_val ("asp");
 	if ($asp != 0) $asp = ", asp=" . $asp;
 	else $asp = "";
-	///End of Additions by Stefan Roediger
 
 	// make option string
-	$options = $type . $xaxt . $yaxt . $log . $xlim . $ylim . $xlab . $ylab . $main . $sub . $asp;
+	$options = $type . $col . $xaxt . $yaxt . $log . $xlim . $ylim . $xlab . $ylab . $main . $sub . $asp;
 
 	echo ($options);
 }

Modified: trunk/rkward/rkward/plugins/plots/plot_options.xml
===================================================================
--- trunk/rkward/rkward/plugins/plots/plot_options.xml	2007-02-05 19:16:05 UTC (rev 1331)
+++ trunk/rkward/rkward/plugins/plots/plot_options.xml	2007-02-05 19:36:42 UTC (rev 1332)
@@ -7,6 +7,7 @@
 		<external id="yvar" default="" />
 		
 		<external id="default_pointtype" default="" />
+		<external id="default_pointcolor" default="" />
 		
 		<external id="allow_log" default="true" />
 		<external id="allow_type" default="true" />
@@ -106,7 +107,7 @@
 				</column>
 			</tab>
 			<tab id="pointtypepage" label="Points / Lines">
-				<radio id="pointtype" label="Type of points/lines" >
+				<dropdown 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 " />
@@ -115,7 +116,83 @@
 					<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>
+				</dropdown>
+				<dropdown id="pointcolor" label="Color of points/lines">
+					<option value="" label="default" checked="true" />
+					<option value="azure" label="Azure" />
+					<option value="black" label="Black" />
+					<option value="blue" label="Blue" />
+					<option value="blue1" label="Blue1" />
+					<option value="blue2" label="Blue2" />
+					<option value="blue3" label="Blue3" />
+					<option value="blue4" label="Blue4" />
+					<option value="brown" label="Brown" />
+					<option value="cyan" label="Cyan" />
+					<option value="darkviolet" label="Darkviolet" />
+					<option value="gold" label="Gold" />
+					<option value="gray" label="Gray" />
+					<option value="gray1" label="Gray1" />
+					<option value="gray2" label="Gray2" />
+					<option value="gray3" label="Gray3" />
+					<option value="gray4" label="Gray4" />
+					<option value="green" label="Green" />
+					<option value="green1" label="Green1" />
+					<option value="green2" label="Green2" />
+					<option value="green3" label="Green3" />
+					<option value="green4" label="Green4" />
+					<option value="grey" label="Grey" />
+					<option value="grey1" label="Grey1" />
+					<option value="grey2" label="Grey2" />
+					<option value="grey3" label="Grey3" />
+					<option value="grey4" label="Grey4" />
+					<option value="lawngreen" label="Lawngreen" />
+					<option value="limegreen" label="Limegreen" />
+					<option value="linen" label="Linen" />
+					<option value="magenta" label="Magenta" />
+					<option value="magenta1" label="Magenta1" />
+					<option value="magenta2" label="Magenta2" />
+					<option value="magenta3" label="Magenta3" />
+					<option value="magenta4" label="Magenta4" />
+					<option value="mintcream" label="Mintcream" />
+					<option value="mistyrose" label="Mistyrose" />
+					<option value="navajowhite" label="Navajowhite" />
+					<option value="orange" label="Orange" />
+					<option value="orchid" label="Orchid" />
+					<option value="palegreen" label="Palegreen" />
+					<option value="papayawhip" label="Papayawhip" />
+					<option value="peachpuff" label="Peachpuff" />
+					<option value="pink" label="Pink" />
+					<option value="red" label="Red" />
+					<option value="red1" label="Red1" />
+					<option value="red2" label="Red1" />
+					<option value="red3" label="Red3" />
+					<option value="red4" label="Red4" />
+					<option value="royalblue" label="Royalblue" />
+					<option value="salmon" label="Salmon" />
+					<option value="sandybrown" label="Sandybrown" />
+					<option value="seagreen" label="Seagreen" />
+					<option value="sienna" label="Sienna" />
+					<option value="skyblue" label="Skyblue" />
+					<option value="slategrey" label="Slategrey" />
+					<option value="snow" label="Snow" />
+					<option value="springgreen" label="Springgreen" />
+					<option value="steelblue" label="Steelblue" />
+					<option value="tan" label="Tan" />
+					<option value="thistle" label="Thistle" />
+					<option value="tomato" label="Tomato" />
+					<option value="violet" label="Violet" />
+					<option value="violetred1" label="Violetred1" />
+					<option value="violetred2" label="Violetred2" />
+					<option value="violetred3" label="Violetred3" />
+					<option value="violetred4" label="Violetred4" />
+					<option value="wheat" label="Wheat" />
+					<option value="yellow" label="Yellow" />
+					<option value="yellow1" label="Yellow1" />
+					<option value="yellow2" label="Yellow2" />
+					<option value="yellow3" label="Yellow3" />
+					<option value="yellow4" label="Yellow4" />
+					<option value="yellowgreen" label="Yellowgreen" />
+				</dropdown>
 			<stretch/>
 			</tab>
 			<tab id="aspectratio" label="Aspect ratio y/x">


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