[Analogue-commits] r183 - in pkg: R inst

[noreply at r-forge.r-project.org]

Author: gsimpson
Date: 2010-07-02 18:36:12 +0200 (Fri, 02 Jul 2010)
New Revision: 183

Modified:
   pkg/R/Stratiplot.R
   pkg/inst/ChangeLog
Log:
fixes to Stratiplot ylims, y-axis padding and variable labels when 'strip = FALSE'

Modified: pkg/R/Stratiplot.R
===================================================================
--- pkg/R/Stratiplot.R	2010-06-29 12:34:40 UTC (rev 182)
+++ pkg/R/Stratiplot.R	2010-07-02 16:36:12 UTC (rev 183)
@@ -19,11 +19,11 @@
         if(isTRUE(all.equal(side, "top"))) {
             M <- function(lims) min(lims) + (diff(lims) / 2)
             xlim <- current.panel.limits()$xlim
-            panel.axis(side = side, outside = TRUE, at = M(xlim),
+            panel.axis(side = side, outside = TRUE, at = 0, #M(xlim),
                        tck = 1, line.col = "black",
                        text.col = "black",
                        labels = levels(sx$ind)[which.packet()],
-                       rot = 45)
+                       rot = 60)
         } else {
             axis.default(side = side, ...)
         }
@@ -71,11 +71,20 @@
     ## plot parameters
     maxy <- max(y)
     miny <- min(y)
+    ## add padYlim * range as per base graphics
+    padY <- 0.01
     if(missing(ylim)) {
-        ylim <- c(miny - (0.03*maxy), maxy + (0.03*maxy))
+        diffy <- padY * (maxy - miny)
+        ylim <- c(miny - diffy, maxy + diffy)
     } else {
-        ylim <- c(min(ylim) - (0.03*max(ylim)),
-                  max(ylim) + (0.03*max(ylim)))
+        minLim <- min(ylim)
+        maxLim <- max(ylim)
+        ## add padY * range as per base graphics
+        diffy <- abs(diff(minLim, maxLim))
+        ylim <- if(minLim > maxLim)
+            c(minLim + (padY * diffy), maxLim - (padY * diffy))
+        else
+            c(minLim - (padY * diffy), maxLim + (padY * diffy))
     }
     if(rev)
         ylim <- rev(ylim)
@@ -87,10 +96,13 @@
     par.strip.text <- list(cex = 0.75)
     str.max <- 1
     if(!isTRUE(strip)) {
-        str.max <- max(convertWidth(grobWidth(textGrob(levels(sx$ind),
-                                                       gp = gpar())),
-                                    "lines", valueOnly = TRUE))
-        str.max <- ceiling(str.max) + 4
+        gp <- gpar()
+        convWidth <- function(x, gp) {
+            convertWidth(grobWidth(textGrob(x, gp = gp)), "lines",
+                         valueOnly = TRUE)
+        }
+        str.max <- max(sapply(levels(sx$ind), convWidth, gp))
+        str.max <- ceiling(str.max) + 6
     }
     ## plotting
     xyplot(y ~ values | ind,
@@ -102,10 +114,6 @@
            scales = scales,
            xlim = xlimits,
            ylim = ylim,
-           #prepanel = function(x, y, ...) {
-           #    list(xlim = c(0, max(x)),
-           #         ylim = rev(c(0, max(y))))
-           #},
            panel = "panel.Stratiplot",
            layout = c(n.vars, 1, pages),
            par.settings = list(layout.widths = list(panel = max.abun),

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2010-06-29 12:34:40 UTC (rev 182)
+++ pkg/inst/ChangeLog	2010-07-02 16:36:12 UTC (rev 183)
@@ -5,9 +5,15 @@
 	* abernethy: New data set containing the classic Abernethy Forest
 	data of Birks and Mathewes (1978).
 
-	* Stratiplot.formula: Preserves the names component as far as is
+	* Stratiplot: Preserves the names component as far as is
 	possible.
 
+	Bug in padding of the y-axis now fixed; default is to add 1% of
+	the range y-axis to the y-axis limits specified.
+
+	Bug in computing length of variable labels when 'strip = FALSE'
+	now fixed.
+
 	* chooseTaxa: Explicitly preserves row and column names.
 
 	* DESCRIPTION: prematurely added princurve as a dependency in