[rkward-cvs] SF.net SVN: rkward: [1749] trunk/rkward/rkward/plugins/x11device

[kapatp at users.sourceforge.net]

Revision: 1749
          http://svn.sourceforge.net/rkward/?rev=1749&view=rev
Author:   kapatp
Date:     2007-03-28 21:42:30 -0700 (Wed, 28 Mar 2007)

Log Message:
-----------
A quick-n-dirty fix to avoid grid() on trellis issue.

Modified Paths:
--------------
    trunk/rkward/rkward/plugins/x11device/grid.php
    trunk/rkward/rkward/plugins/x11device/grid.rkh
    trunk/rkward/rkward/plugins/x11device/grid.xml

Modified: trunk/rkward/rkward/plugins/x11device/grid.php
===================================================================
--- trunk/rkward/rkward/plugins/x11device/grid.php	2007-03-28 18:42:43 UTC (rev 1748)
+++ trunk/rkward/rkward/plugins/x11device/grid.php	2007-03-29 04:42:30 UTC (rev 1749)
@@ -26,7 +26,8 @@
 
 	if (!getRK_val("equilogs")) $gridoptions .= ', equilogs=FALSE';
 ?>
-grid(<? echo ($gridoptions); ?>);
+# add grid only to standard graphics:
+if (!length(grid::getNames())) grid(<? echo ($gridoptions); ?>);
 <?
 }
 ?>
\ No newline at end of file

Modified: trunk/rkward/rkward/plugins/x11device/grid.rkh
===================================================================
--- trunk/rkward/rkward/plugins/x11device/grid.rkh	2007-03-28 18:42:43 UTC (rev 1748)
+++ trunk/rkward/rkward/plugins/x11device/grid.rkh	2007-03-29 04:42:30 UTC (rev 1749)
@@ -1,10 +1,10 @@
 <!DOCTYPE rkhelp>
 <document>
 	<summary>
-		Various parameters for the <b>grid</b>. For detailed description of the individual parameters see the R reference on 'grid'.
+		Various parameters for the <b>grid</b>. For detailed description of the individual parameters see the R reference on 'grid'. Note that this works only when standard (traditional S) graphics functions (see library(help="graphics")) are used to construct the plot. This does not work for trellis graphics devices (see <link href="rkward://rhelp/Lattice"/> for some information).
 	</summary>
 	<usage>
-		This may or may not be used as an embeded plugin.
+		This may or may not be used as an embeded plugin. When used on a trellis device nothing happens.
 	</usage>
 	<settings>
 		<setting id="nx">This is the <i>nx</i> argument. The default is NULL, in which case, the vertical lines are drawn at the xaxis ticks. Select None to not draw the vertical lines. Select 'Specify below' to provide a specified (to be specified below) number of vertical lines in the grid.</setting>

Modified: trunk/rkward/rkward/plugins/x11device/grid.xml
===================================================================
--- trunk/rkward/rkward/plugins/x11device/grid.xml	2007-03-28 18:42:43 UTC (rev 1748)
+++ trunk/rkward/rkward/plugins/x11device/grid.xml	2007-03-29 04:42:30 UTC (rev 1749)
@@ -14,6 +14,7 @@
 		<connect client="ny_cells.enabled" governor="ny_other"/>
 
 		<connect client="lwd.enabled" governor="custlwd.state"/>
+		<connect client="trellis_note.visible" governor="is_embed" />
 	</logic>
 	<dialog label="Grid options">
 		<row>
@@ -52,5 +53,6 @@
 				<embed id="col" component="rkward::color_chooser" label="Color"/>
 		</row>
 	<stretch/>
+	<text id="trellis_note">Note: Not applicable for Trellis type devices! </text>
 	</dialog>
 </document>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.