[Soiltexture-commits] r15 - / pkg pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst/doc pkg/soiltexture/inst/doc2 pkg/soiltexture/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu May 27 15:06:02 CEST 2010
Author: jmoeys
Date: 2010-05-27 15:06:01 +0200 (Thu, 27 May 2010)
New Revision: 15
Modified:
R_CMD_wrapper.R
pkg/soiltexture.Rcheck.zip
pkg/soiltexture/DESCRIPTION
pkg/soiltexture/R/soiltexture.r
pkg/soiltexture/inst/doc/soiltexture_vignette.pdf
pkg/soiltexture/inst/doc2/soiltexture_vignette.tex
pkg/soiltexture/inst/doc2/version.txt
pkg/soiltexture/man/DJ.col.Rd
pkg/soiltexture/man/TT.add.Rd
pkg/soiltexture/man/TT.axis.arrows.Rd
pkg/soiltexture/man/TT.baseplot.Rd
pkg/soiltexture/man/TT.blr.ps.lim.Rd
pkg/soiltexture/man/TT.blr.tx.check.Rd
pkg/soiltexture/man/TT.check.ps.lim.Rd
pkg/soiltexture/man/TT.chemometrics.alr.Rd
pkg/soiltexture/man/TT.classes.Rd
pkg/soiltexture/man/TT.classes.tbl.Rd
pkg/soiltexture/man/TT.col2hsv.Rd
pkg/soiltexture/man/TT.contour.Rd
pkg/soiltexture/man/TT.css2xy.Rd
pkg/soiltexture/man/TT.data.test.Rd
pkg/soiltexture/man/TT.data.test.X.Rd
pkg/soiltexture/man/TT.dataset.Rd
pkg/soiltexture/man/TT.deg2rad.Rd
pkg/soiltexture/man/TT.edges.Rd
pkg/soiltexture/man/TT.env.Rd
pkg/soiltexture/man/TT.geo.get.Rd
pkg/soiltexture/man/TT.geo.set.Rd
pkg/soiltexture/man/TT.get.Rd
pkg/soiltexture/man/TT.grid.Rd
pkg/soiltexture/man/TT.ifelse.Rd
pkg/soiltexture/man/TT.image.Rd
pkg/soiltexture/man/TT.iwd.Rd
pkg/soiltexture/man/TT.kde2d.Rd
pkg/soiltexture/man/TT.lines.Rd
pkg/soiltexture/man/TT.locator.Rd
pkg/soiltexture/man/TT.mahalanobis.Rd
pkg/soiltexture/man/TT.normalise.sum.Rd
pkg/soiltexture/man/TT.plot.Rd
pkg/soiltexture/man/TT.points.Rd
pkg/soiltexture/man/TT.points.in.classes.Rd
pkg/soiltexture/man/TT.set.Rd
pkg/soiltexture/man/TT.str.Rd
pkg/soiltexture/man/TT.switch.Rd
pkg/soiltexture/man/TT.text.Rd
pkg/soiltexture/man/TT.text.transf.Rd
pkg/soiltexture/man/TT.text.transf.X.Rd
pkg/soiltexture/man/TT.ticks.Rd
pkg/soiltexture/man/TT.ticks.lab.Rd
pkg/soiltexture/man/TT.vertices.plot.Rd
pkg/soiltexture/man/TT.vertices.tbl.Rd
pkg/soiltexture/man/TT.xy.grid.Rd
pkg/soiltexture/man/TT.xy2css.Rd
pkg/soiltexture/man/auto.set.Rd
pkg/soiltexture/man/dia2phi.Rd
pkg/soiltexture/man/gen.op.set.Rd
pkg/soiltexture/man/inv.par.Rd
pkg/soiltexture/man/nightC.Rd
pkg/soiltexture/man/par.op.set.Rd
pkg/soiltexture/man/phi2dia.Rd
pkg/soiltexture/man/soiltexture-package.Rd
pkg/soiltexture_1.0.tar.gz
pkg/soiltexture_1.0.zip
soiltexture_compile.R
Log:
Fixed a few "no visible binding for global variable" warnings during R CMD check.
Modified: R_CMD_wrapper.R
===================================================================
--- R_CMD_wrapper.R 2010-05-20 16:34:24 UTC (rev 14)
+++ R_CMD_wrapper.R 2010-05-27 13:06:01 UTC (rev 15)
@@ -235,7 +235,7 @@
### located
r.cmd= "R CMD build",
### Command send to windows shell. Default is "R CMD build"
- bat.suffix="RCMDchecks"
+ bat.suffix="RCMDbuild"
### Suffix of the batch (.bat) file create for this operation,
### without extension
){ #
@@ -330,26 +330,33 @@
-pkg.check.wrapper <- function
+pkg.check.wrapper <- function(
### A wrapper function for R CMD check, for checking a package
### sources
-( #
- pkg.name,
+
+ pkg.name,
### Name of the package, and of the package directory
- pkg.dir,
+
+ pkg.dir,
### Name of the directory in which the package directory is
### located
- r.cmd = "R CMD check",
+
+ r.cmd="R CMD check",
### Command send to windows shell. Default is "R CMD check"
- bat.suffix = "RCMDcheck"
+
+ r.cmd.op="",
+### Options to be passed after r.cmd, like "--no-tests"
+
+ bat.suffix="RCMDcheck"
### Suffix of the batch (.bat) file create for this operation,
### without extension
+
){ #
cmd.checks <- c(
"c:",
"cd \\",
paste( sep = "", "cd ", normalizePath( file.path( pkg.dir ) )),
- paste( sep = "", r.cmd, " ", pkg.name )
+ paste( sep = "", r.cmd, " ", r.cmd.op," ", pkg.name )
) #
#
cat( cmd.checks )
Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION 2010-05-20 16:34:24 UTC (rev 14)
+++ pkg/soiltexture/DESCRIPTION 2010-05-27 13:06:01 UTC (rev 15)
@@ -1,6 +1,6 @@
Package: soiltexture
Version: 1.0
-Date: 2010-05-13
+Date: 2010-05-27
Title: Functions for soil texture plot, classification and transformation
Author: Julien MOEYS <jules_m78-soiltexture at yahoo.fr>
Maintainer: Julien MOEYS <jules_m78-soiltexture at yahoo.fr>
Modified: pkg/soiltexture/R/soiltexture.r
===================================================================
--- pkg/soiltexture/R/soiltexture.r 2010-05-20 16:34:24 UTC (rev 14)
+++ pkg/soiltexture/R/soiltexture.r 2010-05-27 13:06:01 UTC (rev 15)
@@ -2384,7 +2384,9 @@
#
tri.sum.tst = NULL,
tri.pos.tst = NULL,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = NULL,
+ blr.clock = NULL
){ #
# +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
# Automatic takes the values in geo and
@@ -2538,7 +2540,9 @@
z.type = NULL,
z.col.hue = NULL,
z.cex.range = NULL,
- z.pch = NULL
+ z.pch = NULL,
+ text.sum = NULL,
+ blr.clock = NULL
){ #
# +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
# Automatic takes the values in geo and
@@ -2587,7 +2591,9 @@
geo = geo,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
if( !is.null(z.name) & z.type == "bubble" )
@@ -2669,7 +2675,9 @@
text.transf.fun = NULL,
trsf.add.opt1 = NULL, # Additionnal option 1
trsf.add.opt2 = NULL, # Additionnal option 2
- text.tol = NULL,
+ text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
#
fg = NULL,
col = NULL,
@@ -2735,7 +2743,9 @@
geo = geo,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
nobs <- dim(xy.coord)[1]
@@ -2764,6 +2774,8 @@
geo,
#
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
#
col.axis = NULL,
plot.axis = TRUE, # plot the axis (not only background)
@@ -2814,7 +2826,9 @@
css.names = css.names,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
xpos <- tri.TT$"xpos"
@@ -2852,6 +2866,8 @@
at.3.e = 1 - TT.get("at"), # at.3.e: (End values) logically equal to at.2.s
#
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
#
tri.sum.tst = NULL,
tri.pos.tst = NULL
@@ -2948,7 +2964,9 @@
text.tol = text.tol,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
} #
) #
@@ -2965,6 +2983,8 @@
at = NULL,
#
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
#
grid.col = NULL,
grid.lty = NULL,
@@ -3034,7 +3054,9 @@
at.2.e = at.0,
at.3.e = at.r,
tri.sum.tst = tri.sum.tst,
- tri.pos.tst = tri.pos.tst
+ tri.pos.tst = tri.pos.tst,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
invisible( lapply(
@@ -3062,6 +3084,8 @@
at = NULL,
#
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
#
tk.s = NULL,
#
@@ -3094,7 +3118,9 @@
at.2.e = at.2.e,
at.3.e = at.3.e,
tri.sum.tst = tri.sum.tst,
- tri.pos.tst = tri.pos.tst
+ tri.pos.tst = tri.pos.tst,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
# NEW NEW NEW
@@ -3133,6 +3159,8 @@
at = NULL,
#
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
#
tk.ls = NULL,
#
@@ -3168,7 +3196,9 @@
at.2.e = at.2.e,
at.3.e = at.3.e,
tri.sum.tst = tri.sum.tst,
- tri.pos.tst = tri.pos.tst
+ tri.pos.tst = tri.pos.tst,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
# NEW NEW NEW
@@ -3220,6 +3250,8 @@
a.b.s = TT.get("arrows.base.shift"),
#
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
#
tri.sum.tst = FALSE, # !!!! Set to FALSE because sums are not equal to 1 with right-triangles oblic-side
tri.pos.tst = FALSE, # !!!! Set to FALSE because values are outside the triangle
@@ -3327,7 +3359,9 @@
at.2.e = at.2.e,
at.3.e = at.3.e,
tri.sum.tst = tri.sum.tst,
- tri.pos.tst = tri.pos.tst
+ tri.pos.tst = tri.pos.tst,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
invisible( lapply(
@@ -3377,7 +3411,9 @@
at.2.e = at.2.e,
at.3.e = at.3.e,
tri.sum.tst = tri.sum.tst,
- tri.pos.tst = tri.pos.tst
+ tri.pos.tst = tri.pos.tst,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
if( any( !plot.TF ) )
@@ -3398,7 +3434,9 @@
at.2.e = at.2.e,
at.3.e = at.3.e,
tri.sum.tst = tri.sum.tst,
- tri.pos.tst = tri.pos.tst
+ tri.pos.tst = tri.pos.tst,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
grid.lns2[ !plot.TF ] <- grid.lnsX[ !plot.TF ]
@@ -3439,7 +3477,9 @@
at.2.e = at.2.e,
at.3.e = at.3.e,
tri.sum.tst = tri.sum.tst,
- tri.pos.tst = tri.pos.tst
+ tri.pos.tst = tri.pos.tst,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
if( any( !plot.TF ) )
@@ -3460,7 +3500,9 @@
at.2.e = at.2.e,
at.3.e = at.3.e,
tri.sum.tst = tri.sum.tst,
- tri.pos.tst = tri.pos.tst
+ tri.pos.tst = tri.pos.tst,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
grid.lns3[ !plot.TF ] <- grid.lnsX[ !plot.TF ]
@@ -3759,7 +3801,9 @@
text.tol = text.tol,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
# +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
@@ -3920,7 +3964,9 @@
family = family.op,
adj = adj,
pos = pos,
- offset = offset
+ offset = offset,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
return( invisible( TT.data ) )
@@ -3937,6 +3983,9 @@
trsf.add.opt1 = NULL, # Additionnal option 1
trsf.add.opt2 = NULL, # Additionnal option 2
text.tol = NULL,
+ text.sum = NULL,
+ base.css.ps.lim = NULL,
+ blr.tx = NULL,
tri.sum.tst = NULL,
tri.pos.tst = NULL,
bg = NULL,
@@ -4000,7 +4049,9 @@
text.tol = text.tol,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
poly.nm <- names( TT.data$"tt.polygons" )
@@ -4144,7 +4195,7 @@
# | FUNCTION: TT.plot() |
# +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
# [ TT.plot(): Produce a ternary plot, with full customisation and soil-texture tools.
-TT.plot <- function
+TT.plot <- function(# Plot soil texture triangles / diagrams.
### Plot a soil texture triangle (also called soil texture
### diagrams, or soil texture ternary plots), with or without
### background soil texture classes boundaries, and with or without
@@ -4186,8 +4237,6 @@
### For instance to change the default value of 'class.sys', type
### TT.set( "class.sys" = "USDA.TT" ).
-( #
-
# GENERAL Parameters:
geo=NULL,
@@ -4770,7 +4819,9 @@
lwd.axis = lwd.axis,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- bg = bg
+ bg = bg,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
} #
#
@@ -4800,7 +4851,10 @@
family.op = family.op,
lwd.axis = lwd.axis,
col.axis = col.axis,
- bg = bg
+ bg = bg,
+ text.sum = text.sum,
+ base.css.ps.lim = base.css.ps.lim,
+ blr.tx = blr.tx
) #
} #
#
@@ -4819,7 +4873,9 @@
class.p.bg.hue = class.p.bg.hue, # added 2009/05/18
frame.bg.col = frame.bg.col, # added 2009/05/19
bg = bg, # added 2009/05/22
- col.axis = col.axis # added 2009/05/22
+ col.axis = col.axis, # added 2009/05/22
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
} #
#
@@ -4849,20 +4905,25 @@
family.op = family.op,
lwd.axis = lwd.axis,
col.axis = col.axis,
- bg = bg
+ bg = bg,
+ text.sum = text.sum,
+ base.css.ps.lim = base.css.ps.lim,
+ blr.tx = blr.tx
) #
} #
#
# +----------------------------------------------------+
#
TT.ticks(
- geo = geo,
- at = at,
- text.tol = text.tol,
- tk.s = TT.get("ticks.shift"),
- tri.sum.tst = tri.sum.tst,
- lwd.axis = lwd.axis, # Added 2009/05/15
- col.axis = col.axis # Changed 2009/05/18
+ geo = geo,
+ at = at,
+ text.tol = text.tol,
+ tk.s = TT.get("ticks.shift"),
+ tri.sum.tst = tri.sum.tst,
+ lwd.axis = lwd.axis, # Added 2009/05/15
+ col.axis = col.axis, # Changed 2009/05/18
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
TT.ticks.lab(
@@ -4874,28 +4935,32 @@
col.axis = col.axis,
font.axis = font.axis,
cex.axis = cex.axis,
- family.op = family.op
+ family.op = family.op,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
if( arrows.show )
{ #
TT.axis.arrows(
- geo = geo,
- css.lab = css.lab,
- a.l = TT.get("arrows.lims"),
- a.h.s = TT.get("arrows.head.shift"),
- a.t.s = TT.get("arrows.text.shift"),
- a.b.s = TT.get("arrows.base.shift"),
- text.tol = text.tol, # useless
- lwd.lab = lwd.lab,
- arrows.lty = arrows.lty,
- col.lab = col.lab,
- font.lab = font.lab,
- cex.lab = cex.lab,
- family.op = family.op,
- unit.ps = unit.ps,
- unit.tx = unit.tx,
- lang = lang
+ geo = geo,
+ css.lab = css.lab,
+ a.l = TT.get("arrows.lims"),
+ a.h.s = TT.get("arrows.head.shift"),
+ a.t.s = TT.get("arrows.text.shift"),
+ a.b.s = TT.get("arrows.base.shift"),
+ text.tol = text.tol, # useless
+ lwd.lab = lwd.lab,
+ arrows.lty = arrows.lty,
+ col.lab = col.lab,
+ font.lab = font.lab,
+ cex.lab = cex.lab,
+ family.op = family.op,
+ unit.ps = unit.ps,
+ unit.tx = unit.tx,
+ lang = lang,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
} #
#
@@ -4909,7 +4974,9 @@
lwd.axis = lwd.axis,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- bg = bg
+ bg = bg,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
if( !is.null(tri.data) )
@@ -4938,7 +5005,9 @@
z.type = z.type,
z.col.hue = z.col.hue,
z.cex.range = z.cex.range,
- z.pch = z.pch
+ z.pch = z.pch,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
}else{
points.out <- NULL
@@ -5062,7 +5131,9 @@
#
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
data.points.xy <- TT.css2xy(
@@ -5074,7 +5145,9 @@
#
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = FALSE
+ set.par = FALSE,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
}else{
classes.points.xy <- data.frame(
@@ -5321,7 +5394,7 @@
# ypos <- tri.data[ , blr.tx[2] ] * sin(tlr.an[2])
tri.data[ , blr.tx[2] ] <- xy.data[,"ypos"] / sin(tlr.an[2])
# #
- if( blr.clock[1] == T )
+ if( blr.clock[1] == TRUE )
{ # # * This is the TTT case:
#xpos <- tri.data[ , blr.tx[1] ] - ypos/tan(tlr.an[3])
tri.data[ , blr.tx[1] ] <- xy.data[,"xpos"] + xy.data[,"ypos"]/tan(tlr.an[3])
@@ -5338,7 +5411,7 @@
#ypos <- tri.data[ , blr.tx[3] ] * sin(tlr.an[3])
tri.data[ , blr.tx[3] ] <- xy.data[,"ypos"] / sin(tlr.an[3])
#
- if( blr.clock[1] == F )
+ if( blr.clock[1] == FALSE )
{ # # * This is the FFF case:
#xpos <- tri.data[ , blr.tx[1] ] + ypos/tan(tlr.an[2])
tri.data[ , blr.tx[1] ] <- xy.data[,"xpos"] - xy.data[,"ypos"]/tan(tlr.an[2])
@@ -5555,6 +5628,8 @@
tri.data,
css.names = NULL,
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
tri.sum.tst = NULL,
tri.pos.tst = NULL,
set.par = FALSE,
@@ -5566,7 +5641,7 @@
inverted = FALSE,
...,
# Additional parameter related to Mahalanobis
- alr = FALSE, # If TRUE an additive log-ratio transformation
+ alr = FALSE, # If TRUE an additive log-ratio transformation
# # of the data is performed, and the Mahalanobis
# # distance is computed on all classes but css.names[divisorvar]
divisorvar = 2 # The Mahalanobis distance will be computed
@@ -5597,7 +5672,14 @@
#
xy.bound <- TT.css2xy(
tri.data = xy.bound,
- geo = geo
+ geo = geo,
+ text.tol = text.tol,
+ css.names = css.names,
+ tri.sum.tst = tri.sum.tst,
+ tri.pos.tst = tri.pos.tst,
+ set.par = set.par,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
xy.grid <- TT.xy.grid(
@@ -5705,6 +5787,8 @@
tri.data,
css.names = NULL,
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
tri.sum.tst = NULL,
tri.pos.tst = NULL,
set.par = FALSE,
@@ -5737,18 +5821,27 @@
colnames(xy.bound) <- css.names
#
xy.bound <- TT.css2xy(
- tri.data = xy.bound,
- geo = geo
+ tri.data = xy.bound,
+ geo = geo,
+ text.tol = text.tol,
+ css.names = css.names,
+ tri.sum.tst = tri.sum.tst,
+ tri.pos.tst = tri.pos.tst,
+ set.par = set.par,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
xy.data <- TT.css2xy(
tri.data = tri.data,
geo = geo,
+ text.tol = text.tol,
css.names = css.names,
- text.tol = text.tol,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = set.par
+ set.par = set.par,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
if( lims == "points" )
@@ -5811,6 +5904,8 @@
tri.pol.data = NULL, # edges data, same format as tri.data
#
text.tol = NULL,
+ text.sum = NULL,
+ blr.clock = NULL,
#
tri.sum.tst = NULL,
tri.pos.tst = NULL,
@@ -5839,18 +5934,27 @@
colnames( xy.bound ) <- css.names
#
xy.bound <- TT.css2xy(
- tri.data = xy.bound,
- geo = geo
+ tri.data = xy.bound,
+ geo = geo,
+ text.tol = text.tol,
+ css.names = css.names,
+ tri.sum.tst = tri.sum.tst,
+ tri.pos.tst = tri.pos.tst,
+ set.par = set.par,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
xy.data <- TT.css2xy(
tri.data = tri.data,
geo = geo,
+ text.tol = text.tol,
css.names = css.names,
- text.tol = text.tol,
tri.sum.tst = tri.sum.tst,
tri.pos.tst = tri.pos.tst,
- set.par = set.par
+ set.par = set.par,
+ text.sum = text.sum,
+ blr.clock = blr.clock
) #
#
if( lims == "points" )
@@ -5907,7 +6011,7 @@
if( any(sel) )
{ #
w.z <- 1/(X^pow)
- sum( z.vec * w.z, na.rm = T )/sum( w.z, na.rm = T )
+ sum( z.vec * w.z, na.rm = TRUE )/sum( w.z, na.rm = TRUE )
}else{ NA }
}, #
z.vec = xy.data[,"z"]
@@ -5991,6 +6095,11 @@
#col = par("fg"),
lty = NA,
lwd = NA,
+ blr.clock = NULL,
+ tlr.an = NULL,
+ blr.tx = NULL,
+ text.sum = NULL,
+ base.css.ps.lim = NULL,
...
){ #
if( !is.list( x ) )
@@ -6015,8 +6124,20 @@
) #
} #
#
- class.sys <- "none"
+ # +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
+ # Automatic takes the values in geo and
+ # attributes them to same name variables
+ TT.geo.set(
+ geo = geo
+ #p.env = environment()
+ ) #
#
+ # +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+
+ # Automatic sets remaining NULL varaibles
+ auto.set( set.par = set.par )
+ #
+ class.sys <- "none"
+ #
if( !add )
{ #
TT.baseplot(
@@ -6116,9 +6237,9 @@
# +-------------------------------------+
-# | FUN: TT.contour() |
+# | FUN: TT.image() |
# +-------------------------------------+
-# [ TT.contour() :: A wrapper for the contour() function
+# [ TT.image() :: A wrapper for the contour() function
# adapted to texture triangles (plot preparation).
# designed to plot the results of TT.mahalanobis() or
# TT.kde2d() [to be written], before or after plot.
Modified: pkg/soiltexture/inst/doc/soiltexture_vignette.pdf
===================================================================
--- pkg/soiltexture/inst/doc/soiltexture_vignette.pdf 2010-05-20 16:34:24 UTC (rev 14)
+++ pkg/soiltexture/inst/doc/soiltexture_vignette.pdf 2010-05-27 13:06:01 UTC (rev 15)
@@ -364,14 +364,14 @@
<< /S /GoTo /D [245 0 R /Fit ] >>
endobj
248 0 obj <<
-/Length 417
+/Length 414
/Filter /FlateDecode
>>
stream
-xÚuRÉnÛ0½ë+x” kÌŠ‹z,Ú
-C Ý‚ äµ¼¤²ŒÄýú9Rà1ô|oÞ̵Z+~dú“ÿ¯M6}0Z¡B[©f¥+0–”sPpªY¨ç¼)0ÿñ,J£1? 8ßpleß/9ïO¼v ¢ó·ˆøÇKÛ-xýR¼4ª žk«’j Rú·àW‘¼ç˜sô›Ã°;ŠÀŠÓxÔÉö5JÇ}ßoàz"uæÛ¨yŒÔx‰ç[Lßµcù»MB¤6ªë6GÆB:Hs¼nÇ? ˆ?ÛAíÞœèHÛ·Qlú€µB²ì9Ûï LåX;@¨Q´ OÉj±|¹çdó§CQ’Ë—çäRrWƒ5©Œ·B}j
-ùY(h;‘œ4çÈ¡#÷îað«ðª†Ú‘‹]•ÈMÁ‘Tž1÷$cŠ+Öçûx°ã˜–’G\Tœz¸RúÞdÈ ¿=…¶ôF!i0¬;ße3
-äɇ¹ÌÓåÈ ¦?w¨¾ ²_ü»d„–£Jy!“Þ¸”êŠ'åÑ5TføôxÛ÷6ﾓ
+xÚuRÉNÃ0½ç+|L¤fêÇK8"(‰(7Ä!]©Ô4”¯gl'¨‹P5îØ~oÞÌ‹¥X) ùÏÿm• GJ
+´@¨ QÍaJ“0¦ rFTSñ–V¦ ³,WÓý–ó%Ç*îÛçßí×&@dúå?¼ÔÍ”×›ì½z¹³\[ä„P¢‹¥_#~îÉŽ G»Üv»}˜sꚸÝyi¿oÛe\ bÉÊkî=Õ_yâñÓ6u_þ¯ðz¡M£@»â¼Íž1 „9v«¾@ÇÑŸU§vmŽw¤nk/6 a)…4{Îö[UÖvàJŒÚO‡`u´|¶á¤Óçm–“IgÇàRpW‚VŽ©
+”Õ‘ú\gäÒc¤eì Ë%çÈ!=÷êað«°¢„Òñ]åÈM)ÎP¬<fî!Ž]Ñ6Ýøƒ5Ç8Ó<jâEÁ©ƒ3¥û*ANøí Ô% UI‚bÝÉ:ùL$%ëä4—=³;>®QÜm“þ]NÒCó^%?‘ ïß JeÁ“òè
+Õ}z¼ìû> ¾™
endstream
endobj
245 0 obj <<
@@ -393,6 +393,7 @@
/ProcSet [ /PDF /Text ]
/Font << /F1 258 0 R/F3 259 0 R/F6 260 0 R>>
/ExtGState <<
+/GSais 261 0 R
>>>>
/Length 10830
>>
@@ -942,8 +943,8 @@
endobj
257 0 obj
<<
-/CreationDate (D:20100513195447)
-/ModDate (D:20100513195447)
+/CreationDate (D:20100527143009)
+/ModDate (D:20100527143009)
/Title (R Graphics Output)
/Producer (R 2.11.0)
/Creator (R)
@@ -963,7 +964,7 @@
/Subtype /Type1
/Name /F3
/BaseFont /Helvetica-Bold
-/Encoding 261 0 R
+/Encoding 262 0 R
>>
endobj
260 0 obj
@@ -976,6 +977,12 @@
endobj
261 0 obj
<<
+/Type /ExtGState
+/AIS false
+>>
+endobj
+262 0 obj
+<<
/Type /Encoding
/BaseEncoding /WinAnsiEncoding
/Differences [ 45/minus]
@@ -995,7 +1002,7 @@
/XObject << /Im1 246 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-301 0 obj <<
+302 0 obj <<
/Length 2030
/Filter /FlateDecode
>>
@@ -1022,312 +1029,312 @@
=4ò9±ÜKŠ¬½Ï'-»2¦¨°ËIoUßU h Ãé#“”EMMq·©CÁho ä0–Ü}¤é×=8Þù ¥ W“
endstream
endobj
-300 0 obj <<
+301 0 obj <<
/Type /Page
-/Contents 301 0 R
-/Resources 299 0 R
+/Contents 302 0 R
+/Resources 300 0 R
/MediaBox [0 0 595.276 841.89]
/Parent 256 0 R
-/Annots [ 262 0 R 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 306 0 R 268 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 307 0 R 278 0 R 279 0 R 280 0 R 308 0 R 281 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 309 0 R 288 0 R 310 0 R 289 0 R 290 0 R 291 0 R 292 0 R 311 0 R 293 0 R 312 0 R 294 0 R 295 0 R ]
+/Annots [ 263 0 R 264 0 R 265 0 R 266 0 R 267 0 R 268 0 R 307 0 R 269 0 R 270 0 R 271 0 R 272 0 R 273 0 R 274 0 R 275 0 R 276 0 R 277 0 R 278 0 R 308 0 R 279 0 R 280 0 R 281 0 R 309 0 R 282 0 R 283 0 R 284 0 R 285 0 R 286 0 R 287 0 R 288 0 R 310 0 R 289 0 R 311 0 R 290 0 R 291 0 R 292 0 R 293 0 R 312 0 R 294 0 R 313 0 R 295 0 R 296 0 R ]
>> endobj
-262 0 obj <<
+263 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 683.215 247.849 692.082]
/A << /S /GoTo /D (section.1) >>
>> endobj
-263 0 obj <<
+264 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 669.327 338.777 680.166]
/A << /S /GoTo /D (subsection.1.1) >>
>> endobj
-264 0 obj <<
+265 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 659.304 201.952 668.211]
/A << /S /GoTo /D (subsection.1.2) >>
>> endobj
-265 0 obj <<
+266 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 647.349 240.537 656.256]
/A << /S /GoTo /D (subsection.1.3) >>
>> endobj
-266 0 obj <<
+267 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 635.394 249.633 644.301]
/A << /S /GoTo /D (subsection.1.4) >>
>> endobj
-267 0 obj <<
+268 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 611.544 469.509 622.343]
/A << /S /GoTo /D (section.2) >>
>> endobj
-306 0 obj <<
+307 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 601.521 208.019 610.388]
/A << /S /GoTo /D (section.2) >>
>> endobj
-268 0 obj <<
+269 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 587.075 372.092 598.936]
/A << /S /GoTo /D (subsection.2.1) >>
>> endobj
-269 0 obj <<
+270 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 575.678 344.745 586.517]
/A << /S /GoTo /D (subsection.2.2) >>
>> endobj
-270 0 obj <<
+271 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 553.76 249.932 564.56]
/A << /S /GoTo /D (section.3) >>
>> endobj
-271 0 obj <<
+272 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 541.805 313.931 552.644]
/A << /S /GoTo /D (subsection.3.1) >>
>> endobj
-272 0 obj <<
+273 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 529.292 388.919 541.152]
/A << /S /GoTo /D (subsection.3.2) >>
>> endobj
-273 0 obj <<
+274 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 517.895 301.139 528.734]
/A << /S /GoTo /D (subsection.3.3) >>
>> endobj
-274 0 obj <<
+275 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 495.977 420.42 506.776]
/A << /S /GoTo /D (section.4) >>
>> endobj
-275 0 obj <<
+276 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 484.022 295.898 494.861]
/A << /S /GoTo /D (subsection.4.1) >>
>> endobj
-276 0 obj <<
+277 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 473.999 322.399 482.906]
/A << /S /GoTo /D (subsection.4.2) >>
>> endobj
-277 0 obj <<
+278 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 459.554 469.509 471.414]
/A << /S /GoTo /D (subsection.4.3) >>
>> endobj
-307 0 obj <<
+308 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 447.598 254.236 459.459]
/A << /S /GoTo /D (subsection.4.3) >>
>> endobj
-278 0 obj <<
+279 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 438.134 356.739 447.04]
/A << /S /GoTo /D (subsection.4.4) >>
>> endobj
-279 0 obj <<
+280 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 426.179 367.409 435.085]
/A << /S /GoTo /D (subsection.4.5) >>
>> endobj
-280 0 obj <<
+281 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 411.733 469.509 423.593]
/A << /S /GoTo /D (subsection.4.6) >>
>> endobj
-308 0 obj <<
+309 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 402.268 202.41 411.175]
/A << /S /GoTo /D (subsection.4.6) >>
>> endobj
-281 0 obj <<
+282 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 388.38 422.781 399.22]
/A << /S /GoTo /D (subsection.4.7) >>
>> endobj
-282 0 obj <<
+283 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 378.358 340.291 387.265]
/A << /S /GoTo /D (subsection.4.8) >>
>> endobj
-283 0 obj <<
+284 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 364.47 327.081 375.309]
/A << /S /GoTo /D (subsection.4.9) >>
>> endobj
-284 0 obj <<
+285 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 354.448 336.077 363.354]
/A << /S /GoTo /D (subsection.4.10) >>
>> endobj
-285 0 obj <<
+286 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 340.56 411.354 351.399]
/A << /S /GoTo /D (subsection.4.11) >>
>> endobj
-286 0 obj <<
+287 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 318.642 396.032 329.441]
/A << /S /GoTo /D (section.5) >>
>> endobj
-287 0 obj <<
+288 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 306.687 469.509 317.526]
/A << /S /GoTo /D (subsection.5.1) >>
>> endobj
-309 0 obj <<
+310 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 294.732 245.857 305.571]
/A << /S /GoTo /D (subsection.5.1) >>
>> endobj
-288 0 obj <<
+289 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 282.777 469.509 293.616]
/A << /S /GoTo /D (subsection.5.2) >>
>> endobj
-310 0 obj <<
+311 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 270.821 248.915 281.661]
/A << /S /GoTo /D (subsection.5.2) >>
>> endobj
-289 0 obj <<
+290 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 248.904 268.123 259.703]
/A << /S /GoTo /D (section.6) >>
>> endobj
-290 0 obj <<
+291 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 236.948 299.734 247.788]
/A << /S /GoTo /D (subsection.6.1) >>
>> endobj
-291 0 obj <<
+292 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 224.993 383.987 235.832]
/A << /S /GoTo /D (subsection.6.2) >>
>> endobj
-292 0 obj <<
+293 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 212.48 469.509 224.341]
/A << /S /GoTo /D (subsection.6.3) >>
>> endobj
-311 0 obj <<
+312 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 203.016 197.688 211.922]
/A << /S /GoTo /D (subsection.6.3) >>
>> endobj
-293 0 obj <<
+294 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 188.57 469.509 200.43]
/A << /S /GoTo /D (subsection.6.4) >>
>> endobj
-312 0 obj <<
+313 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [123.806 179.105 204.044 188.012]
/A << /S /GoTo /D (subsection.6.4) >>
>> endobj
-294 0 obj <<
+295 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 165.217 385.551 176.057]
/A << /S /GoTo /D (subsection.6.5) >>
>> endobj
-295 0 obj <<
+296 0 obj <<
/Type /Annot
/Subtype /Link
/Border[0 0 0]/H/I/C[1 0 0]
/Rect [138.75 153.262 310.882 164.101]
/A << /S /GoTo /D (subsection.6.6) >>
>> endobj
-302 0 obj <<
-/D [300 0 R /XYZ 124.798 753.953 null]
+303 0 obj <<
+/D [301 0 R /XYZ 124.798 753.953 null]
>> endobj
-304 0 obj <<
-/D [300 0 R /XYZ 124.802 696.276 null]
+305 0 obj <<
+/D [301 0 R /XYZ 124.802 696.276 null]
>> endobj
-299 0 obj <<
-/Font << /F44 303 0 R /F49 305 0 R /F8 255 0 R >>
+300 0 obj <<
+/Font << /F44 304 0 R /F49 306 0 R /F8 255 0 R >>
/ProcSet [ /PDF /Text ]
>> endobj
-338 0 obj <<
+339 0 obj <<
/Length 2380
/Filter /FlateDecode
>>
@@ -1355,259 +1362,259 @@
£Öõª~š¾ø?îïe¨
endstream
endobj
-337 0 obj <<
+338 0 obj <<
/Type /Page
-/Contents 338 0 R
-/Resources 336 0 R
+/Contents 339 0 R
+/Resources 337 0 R
/MediaBox [0 0 595.276 841.89]
/Parent 256 0 R
-/Annots [ 296 0 R 297 0 R 298 0 R 313 0 R 314 0 R 340 0 R 315 0 R 316 0 R 317 0 R 318 0 R 341 0 R 319 0 R 320 0 R 342 0 R 321 0 R 322 0 R 323 0 R 324 0 R 325 0 R 343 0 R 326 0 R 344 0 R 327 0 R 345 0 R 328 0 R 329 0 R 330 0 R 331 0 R 346 0 R 332 0 R 333 0 R 334 0 R 335 0 R ]
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/soiltexture -r 15
More information about the Soiltexture-commits
mailing list