[Analogue-commits] r272 - in pkg: . R inst man tests/Examples

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

Author: gsimpson
Date: 2012-07-25 16:58:07 +0200 (Wed, 25 Jul 2012)
New Revision: 272

Modified:
   pkg/DESCRIPTION
   pkg/R/panel.Stratiplot.R
   pkg/inst/ChangeLog
   pkg/man/panel.Stratiplot.Rd
   pkg/tests/Examples/analogue-Ex.Rout.save
Log:
change lwd for type = 'h' to give thicker bars and draw these use lineend = 'butt' so they display more accurately and without the unsightly round ends

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-07-25 12:21:57 UTC (rev 271)
+++ pkg/DESCRIPTION	2012-07-25 14:58:07 UTC (rev 272)
@@ -1,7 +1,7 @@
 Package: analogue
 Type: Package
 Title: Analogue and weighted averaging methods for palaeoecology
-Version: 0.9-7
+Version: 0.9-8
 Date: $Date$
 Depends: R (>= 2.15.0), stats, graphics, vegan (>= 1.17-12), lattice, grid, 
          MASS, princurve, mgcv

Modified: pkg/R/panel.Stratiplot.R
===================================================================
--- pkg/R/panel.Stratiplot.R	2012-07-25 12:21:57 UTC (rev 271)
+++ pkg/R/panel.Stratiplot.R	2012-07-25 14:58:07 UTC (rev 272)
@@ -11,6 +11,7 @@
                                lwd = plot.line$lwd,
                                lty.smooth = plot.line$lty,
                                lwd.smooth = 2,
+                               lwd.h = 3,
                                fill = plot.symbol$fill,
                                zones = NULL,
                                col.zones = plot.line$col,
@@ -44,7 +45,7 @@
                      col = col.symbol, pch = pch, ...)
     if ("h" %in% type) {
         panel.lines(x = x, y = y, type = "H", col = col.line, lty = lty,
-                    lwd = lwd, ...)
+                    lwd = lwd.h, lineend = "butt", ...)
     }
     if("poly" %in% type)
         panel.polygon(x = c(0, x, 0), y = c(y[1], y, y[length(y)]),

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2012-07-25 12:21:57 UTC (rev 271)
+++ pkg/inst/ChangeLog	2012-07-25 14:58:07 UTC (rev 272)
@@ -1,5 +1,11 @@
 analogue Change Log
 
+Version 0.9-8
+
+	* panel.Stratiplot: `type = "h"` now drawn using `lwd = 3` and with
+	`lineend = "butt"`. The line width can be controled by new argument
+	`lwd.h`.
+
 Version 0.9-7
 
 	* Stratiplot: In 0.9-5 a change was made to stop stripping NAs

Modified: pkg/man/panel.Stratiplot.Rd
===================================================================
--- pkg/man/panel.Stratiplot.Rd	2012-07-25 12:21:57 UTC (rev 271)
+++ pkg/man/panel.Stratiplot.Rd	2012-07-25 14:58:07 UTC (rev 272)
@@ -22,6 +22,7 @@
                  lwd = plot.line$lwd,
                  lty.smooth = plot.line$lty,
                  lwd.smooth = 2,
+                 lwd.h = 3,
                  fill = plot.symbol$fill,
                  zones = NULL,
                  col.zones = plot.line$col,
@@ -70,7 +71,8 @@
   \item{lty.smooth}{line type for the loess smoother. The default is
     obtained from \code{plot.line} using
     \code{\link[lattice]{trellis.par.get}}.}
-  \item{lwd.smooth}{The line width for the loess smoother.}
+  \item{lwd.smooth,lwd.h}{The line width for the loess smoother and
+    histogram-like bars respectively.}
   \item{zones}{numeric; vector of zone boundary positions on scale of
     the depth/time (y-)axis.}
   \item{lty.zones, lwd.zones}{line type and width for the zone
@@ -100,6 +102,14 @@
   Note that all the arguments controlling the display can be supplied
   directly to a high-level call of the function \code{\link{Stratiplot}}.
 }
+
+\note{
+  Histogram-like bars (\code{type = "h"}) are drawn with \code{lineend =
+  "butt"} to improve their appearance. This can not be changed by the
+  user and you can't include that grid parameter in any call to
+  \code{panel.Stratiplot} that uses \code{type = "h"}.
+}
+
 \author{Gavin L. Simpson}
 
 \seealso{\code{\link{Stratiplot}}, \code{\link{panel.Loess}},

Modified: pkg/tests/Examples/analogue-Ex.Rout.save
===================================================================
--- pkg/tests/Examples/analogue-Ex.Rout.save	2012-07-25 12:21:57 UTC (rev 271)
+++ pkg/tests/Examples/analogue-Ex.Rout.save	2012-07-25 14:58:07 UTC (rev 272)
@@ -31,7 +31,7 @@
 Loading required package: princurve
 Loading required package: mgcv
 This is mgcv 1.7-18. For overview type 'help("mgcv-package")'.
-This is analogue 0.9-7
+This is analogue 0.9-8
 > 
 > assign(".oldSearch", search(), pos = 'CheckExEnv')
 > cleanEx()
@@ -7450,7 +7450,7 @@
 > ### * <FOOTER>
 > ###
 > cat("Time elapsed: ", proc.time() - get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed:  16.322 0.207 16.69 0 0 
+Time elapsed:  16.335 0.22 16.705 0 0 
 > grDevices::dev.off()
 null device 
           1