From noreply at r-forge.r-project.org  Wed Jan  7 14:06:32 2015
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Wed,  7 Jan 2015 14:06:32 +0100 (CET)
Subject: [CHNOSZ-commits] r74 - in pkg/CHNOSZ: . R inst
Message-ID: <20150107130632.16F84183B95@r-forge.r-project.org>

Author: jedick
Date: 2015-01-07 14:06:31 +0100 (Wed, 07 Jan 2015)
New Revision: 74

Modified:
   pkg/CHNOSZ/DESCRIPTION
   pkg/CHNOSZ/R/diagram.R
   pkg/CHNOSZ/inst/NEWS
Log:
diagram() calls image() with useRaster=TRUE


Modified: pkg/CHNOSZ/DESCRIPTION
===================================================================
--- pkg/CHNOSZ/DESCRIPTION	2014-12-21 07:31:42 UTC (rev 73)
+++ pkg/CHNOSZ/DESCRIPTION	2015-01-07 13:06:31 UTC (rev 74)
@@ -1,6 +1,6 @@
-Date: 2014-12-21
+Date: 2015-01-07
 Package: CHNOSZ
-Version: 1.0.3-11
+Version: 1.0.3-12
 Title: Chemical Thermodynamics and Activity Diagrams
 Author: Jeffrey Dick
 Maintainer: Jeffrey Dick <j3ffdick at gmail.com>

Modified: pkg/CHNOSZ/R/diagram.R
===================================================================
--- pkg/CHNOSZ/R/diagram.R	2014-12-21 07:31:42 UTC (rev 73)
+++ pkg/CHNOSZ/R/diagram.R	2015-01-07 13:06:31 UTC (rev 74)
@@ -274,7 +274,7 @@
         for(i in 1:nrow(zs)) zs[i,] <- out[nrow(zs)+1-i,]
         zs <- t(zs)
         breaks <- c(0,1:nspecies) + 0.5
-        image(x=xs,y=ys,z=zs,col=fill,add=TRUE,breaks=breaks)
+        image(x=xs, y=ys, z=zs, col=fill, add=TRUE, breaks=breaks, useRaster=TRUE)
       }
       ## curve plot function
       # 20091116 replaced plot.curve with plot.line; different
@@ -296,7 +296,7 @@
           return(list(xs=xs, ys=ys))
         }
         hline <- function(out, iy) {
-          nx <- nrow(out)
+          nx <- ncol(out)
           ys <- rep(iy, nx*2+1)
           xs <- c(0, rep(1:nx, each=2))
           x1 <- out[iy, ]

Modified: pkg/CHNOSZ/inst/NEWS
===================================================================
--- pkg/CHNOSZ/inst/NEWS	2014-12-21 07:31:42 UTC (rev 73)
+++ pkg/CHNOSZ/inst/NEWS	2015-01-07 13:06:31 UTC (rev 74)
@@ -1,4 +1,4 @@
-CHANGES IN CHNOSZ 1.0.3-11 (2014-12-21)
+CHANGES IN CHNOSZ 1.0.3-12 (2015-01-07)
 ---------------------------------------
 
 - Add files with average amino acid compositions of proteins from Bison
@@ -27,6 +27,11 @@
 - Add mosaic() function for affinity calculations with changing basis
   species.
 
+- When making filled color diagrams, diagram() calls image() with
+  useRaster=TRUE. This speeds up plotting, eliminates artifacts at
+  some resolutions (i.e. blank lines), and greatly reduces the size
+  of PDF files.
+
 CHANGES IN CHNOSZ 1.0.3 (2014-01-12)
 ------------------------------------