[Soiltexture-commits] r149 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst pkg/soiltexture/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Apr 8 16:24:09 CEST 2016
Author: jmoeys
Date: 2016-04-08 16:24:09 +0200 (Fri, 08 Apr 2016)
New Revision: 149
Modified:
packageUtilities.R
pkg/soiltexture/DESCRIPTION
pkg/soiltexture/NAMESPACE
pkg/soiltexture/NEWS
pkg/soiltexture/R/onAttach.R
pkg/soiltexture/R/soiltexture_text_gui.R
pkg/soiltexture/inst/SVN_VERSION
pkg/soiltexture/man/TT.axis.arrows.Rd
pkg/soiltexture/man/TT.baseplot.Rd
pkg/soiltexture/man/TT.classes.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.edges.Rd
pkg/soiltexture/man/TT.grid.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.plot.Rd
pkg/soiltexture/man/TT.points.Rd
pkg/soiltexture/man/TT.points.in.classes.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.xy2css.Rd
soiltexture_2_RCMDcheck_noexamples.bat
soiltexture_3_RCMDINSTALL_build.BAT
soiltexture_4_RCMDRd2pdf.BAT
soiltexture_compile.R
Log:
Add imports in NAMESPACE and update doc
Modified: packageUtilities.R
===================================================================
--- packageUtilities.R 2016-01-07 09:05:47 UTC (rev 148)
+++ packageUtilities.R 2016-04-08 14:24:09 UTC (rev 149)
@@ -72,7 +72,7 @@
){
# Read the file DESCRIPTION
- desc <- packageDescription(
+ desc <- utils::packageDescription(
pkg = pkgName,
lib.loc = pkgDir )
@@ -103,16 +103,19 @@
desc[[ "Depends" ]] <- paste(
c( RVersion, pkgDepends ),
- collapse = ", "
+ collapse = ",\n"
)
+ desc[[ "Depends" ]] <- paste( "\n", desc[[ "Depends" ]], sep = "" )
# Write the Suggests field:
if( !is.null( pkgSuggests ) ){
desc[[ "Suggests" ]] <- paste(
pkgSuggests,
- collapse = ", "
+ collapse = ",\n"
)
+
+ desc[[ "Suggests" ]] <- paste( "\n", desc[[ "Suggests" ]], sep = "" )
}else{
desc <- desc[ names(desc) != "Suggests" ]
}
@@ -122,8 +125,10 @@
if( !is.null( pkgImports ) ){
desc[[ "Imports" ]] <- paste(
pkgImports,
- collapse = ", "
+ collapse = ",\n"
)
+
+ desc[[ "Imports" ]] <- paste( "\n", desc[[ "Imports" ]], sep = "" )
}else{
desc <- desc[ names(desc) != "Imports" ]
}
@@ -135,12 +140,20 @@
desc <- unlist( lapply(
X = 1:length(desc),
FUN = function( X, desc, nm ){
+ desc[[ X ]] <- gsub(
+ x = desc[[ X ]],
+ pattern = "\n",
+ replacement = "\n ",
+ fixed = TRUE
+ )
+
paste0( nm[X], ": ", desc[[ X ]] )
},
desc = desc,
nm = nm
) )
+
# Write again the description file:
desc <- writeLines(
con = file.path(
Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/DESCRIPTION 2016-04-08 14:24:09 UTC (rev 149)
@@ -1,13 +1,20 @@
Package: soiltexture
-Version: 1.3.3
-Date: 2015-05-15
+Version: 1.4.0
+Date: 2016-04-08
Title: Functions for Soil Texture Plot, Classification and Transformation
Author: Julien Moeys [aut, cre], Wei Shangguan [ctb], Rainer Petzold [ctb], Budiman Minasny [ctb], Bogdan Rosca [ctb], Nic Jelinski [ctb], Wiktor Zelazny [ctb], Rodolfo Marcondes Silva Souza [ctb], Jose Lucas Safanelli [ctb], Alexandre ten Caten [ctb]
Authors at R: c( person( "Julien", "Moeys", role = c("aut", "cre"), email = "jules_m78-soiltexture at yahoo.fr" ), person( "Wei", "Shangguan", role = "ctb" ), person( "Rainer", "Petzold", role = "ctb" ), person( "Budiman", "Minasny", role = "ctb" ), person( "Bogdan", "Rosca", role = "ctb" ), person( "Nic", "Jelinski", role = "ctb" ), person( "Wiktor", "Zelazny", role = "ctb" ), person( "Rodolfo", "Marcondes Silva Souza", role = "ctb" ), person( "Jose Lucas", "Safanelli", role = "ctb" ), person( "Alexandre", "ten Caten", role = "ctb" ) )
Maintainer: Julien Moeys <jules_m78-soiltexture at yahoo.fr>
-Depends: R (>= 3.1.1), utils
-Suggests: xtable
+Depends:
+ R (>= 3.2.0)
+Suggests:
+ xtable
Description: "The Soil Texture Wizard" is a set of R functions designed to produce texture triangles (also called texture plots, texture diagrams, texture ternary plots), classify and transform soil textures data. These functions virtually allows to plot any soil texture triangle (classification) into any triangle geometry (isosceles, right-angled triangles, etc.). This set of function is expected to be useful to people using soil textures data from different soil texture classification or different particle size systems. Many (> 15) texture triangles from all around the world are predefined in the package. A simple text based graphical user interface is provided: soiltexture_gui().
License: AGPL (>=3)
URL: http://soiltexture.r-forge.r-project.org/
-Imports: sp, MASS, tools, tcltk
+Imports:
+ sp,
+ MASS,
+ tools,
+ tcltk,
+ utils
Modified: pkg/soiltexture/NAMESPACE
===================================================================
--- pkg/soiltexture/NAMESPACE 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/NAMESPACE 2016-04-08 14:24:09 UTC (rev 149)
@@ -1,10 +1,30 @@
exportPattern("^[[:alpha:]]+")
-importFrom(sp,point.in.polygon)
-importFrom(MASS,kde2d)
-importFrom(MASS,mvrnorm)
-#importFrom(utils,installed.packages)
-#importFrom(utils,select.list)
-#importFrom(utils,choose.files)
-importFrom(tcltk,tk_choose.files)
-importFrom(tools,package_dependencies)
+
+importFrom( "sp", "point.in.polygon" )
+
+importFrom( "MASS", "kde2d" )
+
+importFrom( "MASS", "mvrnorm" )
+
+# Imports from package utils
+if(.Platform$OS.type != "windows") {
+ importFrom( "utils", "select.list" )
+}
+
+importFrom( "utils", "installed.packages",
+ "packageDescription", "read.table",
+ "capture.output", "write.table", "browseURL" )
+
+importFrom( "tcltk", "tk_choose.files" )
+
+importFrom( "tools", "package_dependencies" )
+
+importFrom( "grDevices" , "col2rgb", "rgb2hsv", "rgb", "hsv",
+ "heat.colors", "dev.cur", "png", "dev.off" )
+
+importFrom( "graphics", "par", "plot", "segments", "points",
+ "arrows", "text", "polygon", "contour", "image", "locator" )
+
+importFrom( "stats", "weighted.mean", "dist", "quantile",
+ "cov", "mahalanobis", "approx" )
Modified: pkg/soiltexture/NEWS
===================================================================
--- pkg/soiltexture/NEWS 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/NEWS 2016-04-08 14:24:09 UTC (rev 149)
@@ -1,6 +1,12 @@
package: 'soiltexture'
+CHANGES IN VERSION 1.4.0
+
+ 2016/04/08 Add many importFrom in the NAMESPACE.
+ Package "utils" now not in "Depends" but in "Imports"
+ instead.
+
CHANGES IN VERSION 1.3.3
2015/05/15 Minor changes to the package vignette:
Modified: pkg/soiltexture/R/onAttach.R
===================================================================
--- pkg/soiltexture/R/onAttach.R 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/R/onAttach.R 2016-04-08 14:24:09 UTC (rev 149)
@@ -49,7 +49,7 @@
msg <- sprintf(
"%s %s %s. For help type: help(pack='%s')",
pkgname,
- as.character( packageVersion( pkgname ) ),
+ as.character( utils::packageDescription( pkgname ) ),
svnVersion,
pkgname )
Modified: pkg/soiltexture/R/soiltexture_text_gui.R
===================================================================
--- pkg/soiltexture/R/soiltexture_text_gui.R 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/R/soiltexture_text_gui.R 2016-04-08 14:24:09 UTC (rev 149)
@@ -38,7 +38,7 @@
# library( "utils" )
- mRes <- select.list(
+ mRes <- utils::select.list(
title = title,
choices = choices,
preselect = preselect,
@@ -228,7 +228,7 @@
message( sprintf( "* File: %s", f ) )
- dat <- read.table( file = f, sep = sep, dec = dec,
+ dat <- utils::read.table( file = f, sep = sep, dec = dec,
stringsAsFactors = stringsAsFactors,
fileEncoding = fileEncoding, header = TRUE )
Modified: pkg/soiltexture/inst/SVN_VERSION
===================================================================
--- pkg/soiltexture/inst/SVN_VERSION 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/inst/SVN_VERSION 2016-04-08 14:24:09 UTC (rev 149)
@@ -1 +1 @@
-122:145M
+122:147M
Modified: pkg/soiltexture/man/TT.axis.arrows.Rd
===================================================================
--- pkg/soiltexture/man/TT.axis.arrows.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.axis.arrows.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -12,14 +12,16 @@
a.t.s2 = TT.get("arrows.text.shift2"), a.b.s = TT.get("arrows.base.shift"),
- text.tol = NULL, text.sum = NULL, blr.clock = NULL, tlr.an = NULL,
+ text.tol = NULL, text.sum = NULL, blr.clock = NULL,
- base.css.ps.lim = NULL, tri.sum.tst = FALSE, tri.pos.tst = FALSE,
+ tlr.an = NULL, base.css.ps.lim = NULL, tri.sum.tst = FALSE,
- lwd.lab = NULL, arrows.lty = NULL, col.lab = NULL, font.lab = NULL,
+ tri.pos.tst = FALSE, lwd.lab = NULL, arrows.lty = NULL,
- cex.lab = NULL, family.op = NULL, unit.ps = NULL, unit.tx = NULL,
+ col.lab = NULL, font.lab = NULL, cex.lab = NULL,
+ family.op = NULL, unit.ps = NULL, unit.tx = NULL,
+
lang = NULL)}
\arguments{
Modified: pkg/soiltexture/man/TT.baseplot.Rd
===================================================================
--- pkg/soiltexture/man/TT.baseplot.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.baseplot.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -12,16 +12,18 @@
\usage{TT.baseplot(geo = NULL, class.sys = "none", blr.clock = NULL,
- tlr.an = NULL, blr.tx = NULL, text.sum = NULL, base.css.ps.lim = NULL,
+ tlr.an = NULL, blr.tx = NULL, text.sum = NULL,
- tri.sum.tst = NULL, tri.pos.tst = NULL, text.tol = NULL,
+ base.css.ps.lim = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
- unit.ps = NULL, unit.tx = NULL, b.lim = NULL, l.lim = NULL,
+ text.tol = NULL, unit.ps = NULL, unit.tx = NULL,
- main = NULL, new.mar = NULL, bg = NULL, fg = NULL, col = NULL,
+ b.lim = NULL, l.lim = NULL, main = NULL, new.mar = NULL,
- cex.main = NULL, lang = NULL)}
+ bg = NULL, fg = NULL, col = NULL, cex.main = NULL,
+ lang = NULL)}
+
\arguments{
\item{geo}{
Modified: pkg/soiltexture/man/TT.classes.Rd
===================================================================
--- pkg/soiltexture/man/TT.classes.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.classes.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -7,10 +7,11 @@
\usage{TT.classes(geo, class.sys, tri.css.ps.lim = NULL, css.transf = NULL,
text.transf.fun = NULL, trsf.add.opt1 = NULL, trsf.add.opt2 = NULL,
text.tol = NULL, text.sum = NULL, base.css.ps.lim = NULL,
- blr.tx = NULL, blr.clock = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
- bg = NULL, class.lab.col = NULL, class.p.bg.col = NULL, class.p.bg.hue = NULL,
- class.line.col = NULL, class.lty = NULL, class.lab.show = NULL,
- cex.lab = NULL, font.lab = NULL, family.op = NULL, lwd.axis = NULL,
+ blr.tx = NULL, blr.clock = NULL, tri.sum.tst = NULL,
+ tri.pos.tst = NULL, bg = NULL, class.lab.col = NULL,
+ class.p.bg.col = NULL, class.p.bg.hue = NULL, class.line.col = NULL,
+ class.lty = NULL, class.lab.show = NULL, cex.lab = NULL,
+ font.lab = NULL, family.op = NULL, lwd.axis = NULL,
col.axis = NULL, new.centroid = TRUE)}
\arguments{
\item{geo}{
Modified: pkg/soiltexture/man/TT.contour.Rd
===================================================================
--- pkg/soiltexture/man/TT.contour.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.contour.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -12,20 +12,24 @@
TT.kde2d(), before or after plot.}
-\usage{TT.contour(geo, x, add = FALSE, tri.sum.tst = NULL, tri.pos.tst = NULL,
+\usage{TT.contour(geo, x, add = FALSE, tri.sum.tst = NULL,
- text.tol = NULL, unit.ps = NULL, unit.tx = NULL, b.lim = NULL,
+ tri.pos.tst = NULL, text.tol = NULL, unit.ps = NULL,
- l.lim = NULL, main = NULL, new.mar = NULL, bg = NULL, fg = NULL,
+ unit.tx = NULL, b.lim = NULL, l.lim = NULL, main = NULL,
- col = NULL, cex.main = NULL, lang = NULL, nlevels = 10, levels = NA,
+ new.mar = NULL, bg = NULL, fg = NULL, col = NULL,
- labels = NULL, xlim = NA, ylim = NA, zlim = NA, labcex = 1,
+ cex.main = NULL, lang = NULL, nlevels = 10, levels = NA,
- drawlabels = TRUE, method = "flattest", axes = TRUE, frame.plot = NA,
+ labels = NULL, xlim = NA, ylim = NA, zlim = NA,
- lty = NA, lwd = NA, blr.clock = NULL, tlr.an = NULL, blr.tx = NULL,
+ labcex = 1, drawlabels = TRUE, method = "flattest",
+ axes = TRUE, frame.plot = NA, lty = NA, lwd = NA,
+
+ blr.clock = NULL, tlr.an = NULL, blr.tx = NULL,
+
text.sum = NULL, base.css.ps.lim = NULL, ...)}
\arguments{
Modified: pkg/soiltexture/man/TT.css2xy.Rd
===================================================================
--- pkg/soiltexture/man/TT.css2xy.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.css2xy.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -8,10 +8,12 @@
function is the 'heart' of most soiltexture plot functions.}
-\usage{TT.css2xy(tri.data, geo, css.names = NULL, text.tol = NULL, tri.sum.tst = NULL,
+\usage{TT.css2xy(tri.data, geo, css.names = NULL, text.tol = NULL,
- tri.pos.tst = NULL, set.par = FALSE, text.sum = NULL, blr.clock = NULL)}
+ tri.sum.tst = NULL, tri.pos.tst = NULL, set.par = FALSE,
+ text.sum = NULL, blr.clock = NULL)}
+
\arguments{
\item{tri.data}{
Modified: pkg/soiltexture/man/TT.data.test.Rd
===================================================================
--- pkg/soiltexture/man/TT.data.test.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.data.test.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -18,9 +18,9 @@
(ignored).}
-\usage{TT.data.test(tri.data, css.names = NULL, text.sum = NULL, text.tol = NULL,
+\usage{TT.data.test(tri.data, css.names = NULL, text.sum = NULL,
- tri.sum.tst = NULL, tri.pos.tst = NULL)}
+ text.tol = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL)}
\arguments{
Modified: pkg/soiltexture/man/TT.data.test.X.Rd
===================================================================
--- pkg/soiltexture/man/TT.data.test.X.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.data.test.X.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -18,9 +18,9 @@
'tri.data' should only contains texture data, and nothing else.}
-\usage{TT.data.test.X(tri.data, text.sum = NULL, text.tol = NULL, tri.sum.tst = NULL,
+\usage{TT.data.test.X(tri.data, text.sum = NULL, text.tol = NULL,
- tri.pos.tst = NULL)}
+ tri.sum.tst = NULL, tri.pos.tst = NULL)}
\arguments{
Modified: pkg/soiltexture/man/TT.edges.Rd
===================================================================
--- pkg/soiltexture/man/TT.edges.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.edges.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -12,10 +12,12 @@
\usage{TT.edges(geo, text.tol = NULL, text.sum = NULL, blr.clock = NULL,
- col.axis = NULL, plot.axis = TRUE, frame.bg.col = NULL, lwd.axis = NULL,
+ col.axis = NULL, plot.axis = TRUE, frame.bg.col = NULL,
- tri.sum.tst = NULL, tri.pos.tst = NULL, bg = NULL)}
+ lwd.axis = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
+ bg = NULL)}
+
\arguments{
\item{geo}{
Modified: pkg/soiltexture/man/TT.grid.Rd
===================================================================
--- pkg/soiltexture/man/TT.grid.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.grid.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -8,12 +8,14 @@
\usage{TT.grid(geo = geo, at = NULL, text.tol = NULL, text.sum = NULL,
- blr.clock = NULL, grid.col = NULL, grid.lty = NULL, lwd.axis = NULL,
+ blr.clock = NULL, grid.col = NULL, grid.lty = NULL,
- tri.sum.tst = NULL, tri.pos.tst = NULL, class.p.bg.col = NULL,
+ lwd.axis = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
- class.p.bg.hue = NULL, frame.bg.col = NULL, bg = NULL, col.axis = NULL)}
+ class.p.bg.col = NULL, class.p.bg.hue = NULL, frame.bg.col = NULL,
+ bg = NULL, col.axis = NULL)}
+
\arguments{
\item{geo}{
Modified: pkg/soiltexture/man/TT.image.Rd
===================================================================
--- pkg/soiltexture/man/TT.image.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.image.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -14,16 +14,18 @@
\usage{TT.image(geo, x, add = FALSE, tri.sum.tst = NULL, tri.pos.tst = NULL,
- text.tol = NULL, unit.ps = NULL, unit.tx = NULL, b.lim = NULL,
+ text.tol = NULL, unit.ps = NULL, unit.tx = NULL,
- l.lim = NULL, main = NULL, new.mar = NULL, bg = NULL, fg = NULL,
+ b.lim = NULL, l.lim = NULL, main = NULL, new.mar = NULL,
- cex.main = NULL, lang = NULL, xlim = NA, ylim = NA, zlim = NA,
+ bg = NULL, fg = NULL, cex.main = NULL, lang = NULL,
- col = rev(heat.colors(12)), oldstyle = FALSE, blr.clock = NULL,
+ xlim = NA, ylim = NA, zlim = NA, col = rev(heat.colors(12)),
- tlr.an = NULL, blr.tx = NULL, text.sum = NULL, base.css.ps.lim = NULL,
+ oldstyle = FALSE, blr.clock = NULL, tlr.an = NULL,
+ blr.tx = NULL, text.sum = NULL, base.css.ps.lim = NULL,
+
...)}
\arguments{
Modified: pkg/soiltexture/man/TT.iwd.Rd
===================================================================
--- pkg/soiltexture/man/TT.iwd.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.iwd.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -8,12 +8,14 @@
\usage{TT.iwd(tri.data, z.name, geo, css.names = NULL, tri.pol.data = NULL,
- text.tol = NULL, text.sum = NULL, blr.clock = NULL, tri.sum.tst = NULL,
+ text.tol = NULL, text.sum = NULL, blr.clock = NULL,
- tri.pos.tst = NULL, set.par = FALSE, n = 25, lims = c("points",
+ tri.sum.tst = NULL, tri.pos.tst = NULL, set.par = FALSE,
- "triangle")[1], max.dist = NULL, q.max.dist = 0.5, pow = 0.5)}
+ n = 25, lims = c("points", "triangle")[1], max.dist = NULL,
+ q.max.dist = 0.5, pow = 0.5)}
+
\arguments{
\item{tri.data}{
Modified: pkg/soiltexture/man/TT.kde2d.Rd
===================================================================
--- pkg/soiltexture/man/TT.kde2d.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.kde2d.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -12,12 +12,14 @@
MASS package.}
-\usage{TT.kde2d(geo, tri.data, css.names = NULL, text.tol = NULL, text.sum = NULL,
+\usage{TT.kde2d(geo, tri.data, css.names = NULL, text.tol = NULL,
- blr.clock = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
+ text.sum = NULL, blr.clock = NULL, tri.sum.tst = NULL,
- set.par = FALSE, n = 25, lims = c("points", "triangle")[2])}
+ tri.pos.tst = NULL, set.par = FALSE, n = 25, lims = c("points",
+ "triangle")[2])}
+
\arguments{
\item{geo}{
Modified: pkg/soiltexture/man/TT.lines.Rd
===================================================================
--- pkg/soiltexture/man/TT.lines.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.lines.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -6,14 +6,16 @@
\description{Used to plot line elements of a texture plot axis, ticks, arrows, etc.}
-\usage{TT.lines(geo = geo, at.1.s = TT.get("at"), at.2.s = 1 - TT.get("at"),
+\usage{TT.lines(geo = geo, at.1.s = TT.get("at"), at.2.s = 1 -
- at.3.s = 0, at.1.e = TT.get("at"), at.2.e = 0, at.3.e = 1 -
+ TT.get("at"), at.3.s = 0, at.1.e = TT.get("at"),
- TT.get("at"), text.tol = NULL, text.sum = NULL, blr.clock = NULL,
+ at.2.e = 0, at.3.e = 1 - TT.get("at"), text.tol = NULL,
- tri.sum.tst = NULL, tri.pos.tst = NULL)}
+ text.sum = NULL, blr.clock = NULL, tri.sum.tst = NULL,
+ tri.pos.tst = NULL)}
+
\arguments{
\item{geo}{
Modified: pkg/soiltexture/man/TT.locator.Rd
===================================================================
--- pkg/soiltexture/man/TT.locator.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.locator.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -6,11 +6,11 @@
\description{Interactive (mouse clic) retrieval the CLAY SILT SAND coordinate of points on a texture triangle. }
-\usage{TT.locator(geo, css.names = NULL, text.tol = NULL, tri.sum.tst = NULL,
+\usage{TT.locator(geo, css.names = NULL, text.tol = NULL,
- tri.pos.tst = FALSE, set.par = FALSE, n = 512, type = "n",
+ tri.sum.tst = NULL, tri.pos.tst = FALSE, set.par = FALSE,
- ...)}
+ n = 512, type = "n", ...)}
\arguments{
Modified: pkg/soiltexture/man/TT.mahalanobis.Rd
===================================================================
--- pkg/soiltexture/man/TT.mahalanobis.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.mahalanobis.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -16,12 +16,14 @@
\usage{TT.mahalanobis(geo, tri.data, css.names = NULL, text.tol = NULL,
- text.sum = NULL, blr.clock = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
+ text.sum = NULL, blr.clock = NULL, tri.sum.tst = NULL,
- set.par = FALSE, n = 25, center = NULL, cov.mat = NULL, inverted = FALSE,
+ tri.pos.tst = NULL, set.par = FALSE, n = 25, center = NULL,
- ..., alr = FALSE, divisorvar = 2)}
+ cov.mat = NULL, inverted = FALSE, ..., alr = FALSE,
+ divisorvar = 2)}
+
\arguments{
\item{geo}{
Modified: pkg/soiltexture/man/TT.plot.Rd
===================================================================
--- pkg/soiltexture/man/TT.plot.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.plot.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -94,32 +94,36 @@
trsf.add.opt1 = NULL, trsf.add.opt2 = NULL, unit.ps = NULL,
- unit.tx = NULL, blr.clock = NULL, tlr.an = NULL, font = NULL,
+ unit.tx = NULL, blr.clock = NULL, tlr.an = NULL,
- font.axis = NULL, font.lab = NULL, font.main = NULL, bg = NULL,
+ font = NULL, font.axis = NULL, font.lab = NULL,
- fg = NULL, col = NULL, col.axis = NULL, col.lab = NULL, col.main = NULL,
+ font.main = NULL, bg = NULL, fg = NULL, col = NULL,
+ col.axis = NULL, col.lab = NULL, col.main = NULL,
+
cex = NULL, cex.axis = NULL, cex.lab = NULL, cex.main = NULL,
lwd = NULL, lwd.axis = NULL, lwd.lab = NULL, family.op = NULL,
- frame.bg.col = NULL, at = NULL, grid.show = NULL, grid.col = NULL,
+ frame.bg.col = NULL, at = NULL, grid.show = NULL,
- grid.lty = NULL, class.sys = NULL, class.lab.show = NULL,
+ grid.col = NULL, grid.lty = NULL, class.sys = NULL,
- class.lab.col = NULL, class.line.col = NULL, class.p.bg.col = NULL,
+ class.lab.show = NULL, class.lab.col = NULL, class.line.col = NULL,
- class.p.bg.hue = NULL, arrows.show = NULL, arrows.lty = NULL,
+ class.p.bg.col = NULL, class.p.bg.hue = NULL, arrows.show = NULL,
- points.type = NULL, pch = NULL, z.type = NULL, z.col.hue = NULL,
+ arrows.lty = NULL, points.type = NULL, pch = NULL,
- z.cex.range = NULL, z.pch = NULL, text.tol = NULL, tri.sum.tst = NULL,
+ z.type = NULL, z.col.hue = NULL, z.cex.range = NULL,
- tri.pos.tst = NULL, b.lim = NULL, l.lim = NULL, lang = NULL,
+ z.pch = NULL, text.tol = NULL, tri.sum.tst = NULL,
- new.mar = NULL, new.centroid = TRUE)}
+ tri.pos.tst = NULL, b.lim = NULL, l.lim = NULL,
+ lang = NULL, new.mar = NULL, new.centroid = TRUE)}
+
\arguments{
\item{geo}{List. 'geo' is one of the 3 way to set the texture triangle
Modified: pkg/soiltexture/man/TT.points.Rd
===================================================================
--- pkg/soiltexture/man/TT.points.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.points.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -6,20 +6,24 @@
\description{Plot a soil texture data table as points on an existing texture plot. }
-\usage{TT.points(tri.data, geo, css.names = NULL, z.name = NULL, base.css.ps.lim = NULL,
+\usage{TT.points(tri.data, geo, css.names = NULL, z.name = NULL,
- dat.css.ps.lim = NULL, css.transf = NULL, text.transf.fun = NULL,
+ base.css.ps.lim = NULL, dat.css.ps.lim = NULL,
- trsf.add.opt1 = NULL, trsf.add.opt2 = NULL, text.tol = NULL,
+ css.transf = NULL, text.transf.fun = NULL, trsf.add.opt1 = NULL,
- pch = NULL, fg = NULL, col = NULL, bg = NULL, cex = NULL,
+ trsf.add.opt2 = NULL, text.tol = NULL, pch = NULL,
- lwd = NULL, points.type = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
+ fg = NULL, col = NULL, bg = NULL, cex = NULL, lwd = NULL,
- z.type = NULL, z.col.hue = NULL, z.cex.range = NULL, z.pch = NULL,
+ points.type = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
- text.sum = NULL, blr.clock = NULL, blr.tx = NULL)}
+ z.type = NULL, z.col.hue = NULL, z.cex.range = NULL,
+ z.pch = NULL, text.sum = NULL, blr.clock = NULL,
+
+ blr.tx = NULL)}
+
\arguments{
\item{tri.data}{
Modified: pkg/soiltexture/man/TT.points.in.classes.Rd
===================================================================
--- pkg/soiltexture/man/TT.points.in.classes.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.points.in.classes.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -34,7 +34,8 @@
tri.css.ps.lim = NULL, dat.css.ps.lim = NULL, css.transf = NULL,
text.transf.fun = NULL, trsf.add.opt1 = NULL, trsf.add.opt2 = NULL,
text.tol = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
- collapse = NULL, texture2xy = FALSE, blr.tx = NULL, blr.clock = NULL)}
+ collapse = NULL, texture2xy = FALSE, blr.tx = NULL,
+ blr.clock = NULL)}
\arguments{
\item{tri.data}{Data frame. Data frame containing the CLAY, SILT and SAND
'coordinates' of the texture data points to be classified The data
Modified: pkg/soiltexture/man/TT.switch.Rd
===================================================================
--- pkg/soiltexture/man/TT.switch.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.switch.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -6,10 +6,12 @@
\description{Used in the plot axis drawings.}
-\usage{TT.switch(blr.clock = TT.get("blr.clock"), c1 = NA, c2 = NA,
+\usage{TT.switch(blr.clock = TT.get("blr.clock"), c1 = NA,
- c3 = NA, c4 = NA, blr.order = c(1, 3, 2))}
+ c2 = NA, c3 = NA, c4 = NA, blr.order = c(1, 3,
+ 2))}
+
\arguments{
\item{blr.clock}{
Modified: pkg/soiltexture/man/TT.text.Rd
===================================================================
--- pkg/soiltexture/man/TT.text.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.text.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -6,18 +6,22 @@
\description{Plot text labels for each values of a soil texture data table on an existing texture plot. }
-\usage{TT.text(tri.data, geo, labels = NULL, css.names = NULL, base.css.ps.lim = NULL,
+\usage{TT.text(tri.data, geo, labels = NULL, css.names = NULL,
- dat.css.ps.lim = NULL, css.transf = NULL, text.transf.fun = NULL,
+ base.css.ps.lim = NULL, dat.css.ps.lim = NULL,
- trsf.add.opt1 = NULL, trsf.add.opt2 = NULL, text.tol = NULL,
+ css.transf = NULL, text.transf.fun = NULL, trsf.add.opt1 = NULL,
- text.sum = NULL, blr.clock = NULL, fg = NULL, col = NULL,
+ trsf.add.opt2 = NULL, text.tol = NULL, text.sum = NULL,
- cex = NULL, font = NULL, family.op = NULL, adj = NULL, pos = NULL,
+ blr.clock = NULL, fg = NULL, col = NULL, cex = NULL,
- offset = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL, blr.tx = NULL)}
+ font = NULL, family.op = NULL, adj = NULL, pos = NULL,
+ offset = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
+
+ blr.tx = NULL)}
+
\arguments{
\item{tri.data}{
Modified: pkg/soiltexture/man/TT.text.transf.Rd
===================================================================
--- pkg/soiltexture/man/TT.text.transf.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.text.transf.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -20,12 +20,14 @@
transformed texture data.}
-\usage{TT.text.transf(tri.data, base.css.ps.lim, dat.css.ps.lim, css.names = NULL,
+\usage{TT.text.transf(tri.data, base.css.ps.lim, dat.css.ps.lim,
- blr.tx = NULL, text.sum = NULL, text.tol = NULL, tri.sum.tst = NULL,
+ css.names = NULL, blr.tx = NULL, text.sum = NULL,
- tri.pos.tst = NULL, trsf.add.opt1 = NULL, trsf.add.opt2 = NULL)}
+ text.tol = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL,
+ trsf.add.opt1 = NULL, trsf.add.opt2 = NULL)}
+
\arguments{
\item{tri.data}{
Modified: pkg/soiltexture/man/TT.text.transf.X.Rd
===================================================================
--- pkg/soiltexture/man/TT.text.transf.X.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.text.transf.X.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -18,10 +18,12 @@
can only contain texture data.}
-\usage{TT.text.transf.X(tri.data, base.ps.lim, dat.ps.lim, text.sum = NULL,
+\usage{TT.text.transf.X(tri.data, base.ps.lim, dat.ps.lim,
- text.tol = NULL, tri.sum.tst = NULL, tri.pos.tst = NULL)}
+ text.sum = NULL, text.tol = NULL, tri.sum.tst = NULL,
+ tri.pos.tst = NULL)}
+
\arguments{
\item{tri.data}{
Modified: pkg/soiltexture/man/TT.ticks.Rd
===================================================================
--- pkg/soiltexture/man/TT.ticks.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.ticks.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -6,11 +6,11 @@
\description{Plot the axis' ticks of a texture triangle plot. }
-\usage{TT.ticks(geo, at = NULL, text.tol = NULL, text.sum = NULL, blr.clock = NULL,
+\usage{TT.ticks(geo, at = NULL, text.tol = NULL, text.sum = NULL,
- tk.s = NULL, tri.sum.tst = NULL, tri.pos.tst = FALSE, lwd.axis = NULL,
+ blr.clock = NULL, tk.s = NULL, tri.sum.tst = NULL,
- col.axis = NULL)}
+ tri.pos.tst = FALSE, lwd.axis = NULL, col.axis = NULL)}
\arguments{
Modified: pkg/soiltexture/man/TT.ticks.lab.Rd
===================================================================
--- pkg/soiltexture/man/TT.ticks.lab.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.ticks.lab.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -8,11 +8,11 @@
\usage{TT.ticks.lab(geo, at = NULL, text.tol = NULL, text.sum = NULL,
- blr.clock = NULL, tlr.an = NULL, tk.ls = NULL, tri.sum.tst = NULL,
+ blr.clock = NULL, tlr.an = NULL, tk.ls = NULL,
- tri.pos.tst = FALSE, col.axis = NULL, font.axis = NULL, cex.axis = NULL,
+ tri.sum.tst = NULL, tri.pos.tst = FALSE, col.axis = NULL,
- family.op = NULL)}
+ font.axis = NULL, cex.axis = NULL, family.op = NULL)}
\arguments{
Modified: pkg/soiltexture/man/TT.vertices.plot.Rd
===================================================================
--- pkg/soiltexture/man/TT.vertices.plot.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.vertices.plot.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -12,12 +12,14 @@
for a non graphic, tabular equivalent of the plot.}
-\usage{TT.vertices.plot(geo, class.sys = "HYPRES.TT", fg = NULL, col = NULL,
+\usage{TT.vertices.plot(geo, class.sys = "HYPRES.TT", fg = NULL,
- cex = NULL, font = NULL, family.op = NULL, adj = NULL, pos = NULL,
+ col = NULL, cex = NULL, font = NULL, family.op = NULL,
- offset = NULL, blr.tx = NULL, text.sum = NULL, blr.clock = NULL)}
+ adj = NULL, pos = NULL, offset = NULL, blr.tx = NULL,
+ text.sum = NULL, blr.clock = NULL)}
+
\arguments{
\item{geo}{
Modified: pkg/soiltexture/man/TT.xy2css.Rd
===================================================================
--- pkg/soiltexture/man/TT.xy2css.Rd 2016-01-07 09:05:47 UTC (rev 148)
+++ pkg/soiltexture/man/TT.xy2css.Rd 2016-04-08 14:24:09 UTC (rev 149)
@@ -8,10 +8,12 @@
coordinaes) in Clay silta and sand coordinates. }
-\usage{TT.xy2css(xy.data, geo, css.names = NULL, text.tol = NULL, tri.sum.tst = NULL,
+\usage{TT.xy2css(xy.data, geo, css.names = NULL, text.tol = NULL,
- tri.pos.tst = NULL, set.par = FALSE, blr.clock = NULL, text.sum = NULL)}
+ tri.sum.tst = NULL, tri.pos.tst = NULL, set.par = FALSE,
+ blr.clock = NULL, text.sum = NULL)}
+
\arguments{
\item{xy.data}{a data.frame with xpos and ypos columns}
Modified: soiltexture_2_RCMDcheck_noexamples.bat
===================================================================
--- soiltexture_2_RCMDcheck_noexamples.bat 2016-01-07 09:05:47 UTC (rev 148)
+++ soiltexture_2_RCMDcheck_noexamples.bat 2016-04-08 14:24:09 UTC (rev 149)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.3
+set version=1.4.0
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_3_RCMDINSTALL_build.BAT
===================================================================
--- soiltexture_3_RCMDINSTALL_build.BAT 2016-01-07 09:05:47 UTC (rev 148)
+++ soiltexture_3_RCMDINSTALL_build.BAT 2016-04-08 14:24:09 UTC (rev 149)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.3
+set version=1.4.0
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_4_RCMDRd2pdf.BAT
===================================================================
--- soiltexture_4_RCMDRd2pdf.BAT 2016-01-07 09:05:47 UTC (rev 148)
+++ soiltexture_4_RCMDRd2pdf.BAT 2016-04-08 14:24:09 UTC (rev 149)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.3
+set version=1.4.0
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_compile.R
===================================================================
--- soiltexture_compile.R 2016-01-07 09:05:47 UTC (rev 148)
+++ soiltexture_compile.R 2016-04-08 14:24:09 UTC (rev 149)
@@ -17,16 +17,16 @@
pkgDescription( # Done with R 3.2.0 RC
pkgName = pkgName,
pkgDir = pkgDir,
- pkgVersion = "1.3.3",
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/soiltexture -r 149
More information about the Soiltexture-commits
mailing list