From noreply at r-forge.r-project.org Tue Apr 14 11:39:24 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 11:39:24 +0200 (CEST) Subject: [Soiltexture-commits] r123 - / pkg pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst pkg/soiltexture/man pkg/soiltexture/tests Message-ID: <20150414093924.9DB7F183CE9@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 11:39:24 +0200 (Tue, 14 Apr 2015) New Revision: 123 Added: pkg/soiltexture/R/soiltexture_text_gui.R pkg/soiltexture/man/soiltexture_gui.Rd pkg/soiltexture/tests/soiltexture_gui.R Modified: pkg/ pkg/soiltexture/DESCRIPTION pkg/soiltexture/NAMESPACE pkg/soiltexture/NEWS pkg/soiltexture/R/soiltexture.R pkg/soiltexture/inst/SVN_VERSION pkg/soiltexture/man/TT.DJ.col.Rd pkg/soiltexture/man/TT.col2hsv.Rd pkg/soiltexture/man/TT.css2xy.Rd pkg/soiltexture/man/TT.deg2rad.Rd pkg/soiltexture/man/TT.dia2phi.Rd pkg/soiltexture/man/TT.phi2dia.Rd pkg/soiltexture/man/TT.polygon.area.Rd pkg/soiltexture/man/TT.polygon.centroids.Rd pkg/soiltexture/man/TT.vertices.plot.Rd pkg/soiltexture/man/soiltexture-package.Rd soiltexture_2_RCMDcheck_noexamples.bat soiltexture_3_RCMDINSTALL_build.BAT soiltexture_4_RCMDRd2pdf.BAT soiltexture_compile.R Log: Added soiltexture_gui(), a text-based graphical user interface for the package Property changes on: pkg ___________________________________________________________________ Modified: svn:ignore - *.Rcheck *.gz *.pdf *.zip binaryArchives soiltexture.Rcheck soiltexture.Rcheck.zip soiltexture_1.2.3.tar.gz soiltexture_1.2.3_R_i486-pc-linux-gnu.tar.gz soiltexture_1.2.4.tar.gz soiltexture_1.2.4.zip soiltexture_1.2.5.tar.gz soiltexture_1.2.5.zip soiltexture_1.2.6.tar.gz soiltexture_1.2.6.zip soiltexture_1.2.6_R_i486-pc-linux-gnu.tar.gz soiltexture_1.2.8.tar.gz soiltexture_1.2.8.zip soiltexture_1.2.9.tar.gz soiltexture_1.2.9.zip + *.Rcheck *.gz *.pdf *.zip binaryArchives soiltexture.Rcheck soiltexture.Rcheck.zip soiltexture_1.2.3.tar.gz soiltexture_1.2.3_R_i486-pc-linux-gnu.tar.gz soiltexture_1.2.4.tar.gz soiltexture_1.2.4.zip soiltexture_1.2.5.tar.gz soiltexture_1.2.5.zip soiltexture_1.2.6.tar.gz soiltexture_1.2.6.zip soiltexture_1.2.6_R_i486-pc-linux-gnu.tar.gz soiltexture_1.2.8.tar.gz soiltexture_1.2.8.zip soiltexture_1.2.9.tar.gz soiltexture_1.2.9.zip soiltexturegui Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2015-03-09 09:36:26 UTC (rev 122) +++ pkg/soiltexture/DESCRIPTION 2015-04-14 09:39:24 UTC (rev 123) @@ -1,13 +1,13 @@ Package: soiltexture -Version: 1.2.22 -Date: 2015-03-09 +Version: 1.3.0 +Date: 2015-04-14 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 Depends: R (>= 3.1.1) 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. Several texture triangles are predefined: USDA; FAO (which is also the triangle for the soil map of Europe); Aisne (France); GEPPA (France); German triangles "Bodenkundliche Kartieranleitung 1994", "SEA 1974" and "TGL 1985"; Soil Survey of England and Wales; Australian triangle; Belgian triangle; Canadian triangle; ISSS triangle; Romanian triangle; Polish triangle. +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. License: AGPL (>=3) URL: http://soiltexture.r-forge.r-project.org/ -Imports: sp, MASS, tools, utils +Imports: sp, MASS, tools, utils, tcltk Modified: pkg/soiltexture/NAMESPACE =================================================================== --- pkg/soiltexture/NAMESPACE 2015-03-09 09:36:26 UTC (rev 122) +++ pkg/soiltexture/NAMESPACE 2015-04-14 09:39:24 UTC (rev 123) @@ -4,4 +4,7 @@ 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) Modified: pkg/soiltexture/NEWS =================================================================== --- pkg/soiltexture/NEWS 2015-03-09 09:36:26 UTC (rev 122) +++ pkg/soiltexture/NEWS 2015-04-14 09:39:24 UTC (rev 123) @@ -1,13 +1,25 @@ package: 'soiltexture' +CHANGES IN VERSION 1.3.0 + + 2015/04/11 Implements a new text-based graphical user + interface: soiltexture_gui(). The user is guided + through a series of simple question to import, + plot and classify soil texture data. + + 2015/04/12 Many functions have now been classified + as "internal" (keywords = internal) in order + to simplify the long list of functions in the + package help pages + CHANGES IN VERSION 1.2.22 - - 2014/03/09 Fix package imports from tools and utils. + 2015/03/09 Fix package imports from tools and utils. + CHANGES IN VERSION 1.2.21 - 2014/03/06 Added a new Brazilian texture triangle: + 2015/03/06 Added a new Brazilian texture triangle: from Humberto Gon?alves dos Santos [et al.], 2013. Sistema Brasileiro de Classifica??o de Solos, 3 ed. rev. ampl. Bras?lia, DF: Embrapa, 2013. Modified: pkg/soiltexture/R/soiltexture.R =================================================================== --- pkg/soiltexture/R/soiltexture.R 2015-03-09 09:36:26 UTC (rev 122) +++ pkg/soiltexture/R/soiltexture.R 2015-04-14 09:39:24 UTC (rev 123) @@ -1,158 +1,4 @@ -# source( "C:/_R_PACKAGES/soiltexture/pkg/soiltexture/R/soiltexture.R" ) -# source( "http://r-forge.r-project.org/scm/viewvc.php/*checkout*/pkg/soiltexture/R/soiltexture.R?revision=19&root=soiltexture" ) -# +-------------------------------------------------------------------------+ -# | | -# | Julien MOEYS | -# | | -# | The Soil Texture Wizard -- A set of R functions to plot soil texture | -# | triangles, classify and transform soil texture data | -# | | -# | These functions are _originally_ based on the soil.texture function, | -# | in the PLOTRIX package from Jim LEMON and Ben BOLKER. But the code has | -# | been gradually modified, and is now (ALMOST?) ENTIRELY DIFFERENT from | -# | the original code. Not compatibilty has been maintained with PLOTRIX | -# | see | -# | | -# | Author: - Moeys Julien (2006-2010) | -# | Contact: http://julienmoeys.free.fr | -# | | -# | Original sources: - plotrix package, by Lemon J. and Bolker B. | -# | | -# | Institution: < 2008: EGC | -# | UMG Environnement et Grandes Cultures | -# | Equipe Sol, INRA/AgroParisTech | -# | av. Lucien Bretignre, BP01 | -# | F-78850, Thiverval-Grignon, FRANCE | -# | > 2008: SLU Swedish University of | -# | Agricultural Sciences | -# | Soil Science dept., | -# | Environmental Physics div. | -# | Ulls vg 17, Ultuna - PO Box 7014 | -# | SE-75651 Uppsala, SWEDEN | -# | | -# | None of the institution above, and neither the author, endorse any | -# | responsibility for problems that could arise from inaccuracies or errors| -# | in the code presented here. (1) It is much based on free personal work | -# | and (2) it is provided for free, so users have the responsibility to | -# | check themselves that the program works as expected... | -# | | -# | Research program: An awful lots of _personal_ work + | -# | Research program: < 2008: ESHEL research program, | -# | Research program: < 2009: FOOTPRINT, EU-FP6-funded project | -# | | -# | Context: PhD thesis (France) | -# | Post-doctoral position (Sweden) | -# | | -# | Copyleft: Julien Moeys | -# | Licence: General Public Licence, GPL (>=3) | -# | | -# | Programing language: R language for statistical computing | -# | http://wwww:r-project.org | -# | OS: Tested on Windows XP | -# | this scripts may/should work on Linux and MacOS | -# | | -# +-------------------------------------------------------------------------+ -# | | -# | FEATURES list: | -# | - Create ternary/triangle plot of point variables defined by a | -# | triplet of variable (which sum to a constant). | -# | - Default settings for Soil Texture Triangle Plots | -# | - Capable of displaying 4 FAMILIES/TYPES of ternary plots | -# | (1) Equilateral with clockwise axis | -# | (2) Equilateral with counter-clockwise axis | -# | (3) Right-triangle, with right-side 90deg angle, base side | -# | counter-clockwise and right side clockwise | -# | (4) Right-triangle, with left-side 90deg angle, base side | -# | clockwise and right left counter-clockwise | -# | - For all families, triangle internal angles fully customizable, | -# | a fancy feature for creating free form ternary plot | -# | - Free variable sum (1, 100 or X) for the ternary plot; | -# | - Display variable-classes polygons/area on the ternary plot; | -# | - 7 pre-parameterized national Soil Texture Triangles/Classes | -# | systems, including classes polygons, classes and axis names, | -# | and geometric settings of the triangle. | -# | (EU, USDA, French-Aisne, French-GEPPA, German, UK and | -# | Australian triangles) | -# | - Capable of projecting any Soil Texture Triangles/Classes systems| -# | in another family of ternary plot (custom angles and clock), | -# | thus enabling otherwise difficult comparisons of systems | -# | - Retrieve the class(es) of point data in a given (Soil Texture)- | -# | class system (pre-defined) | -# | - Several features for exploratory/visual analysis | -# | - Create a background 2d map of a 4th variable (heat-map), | -# | through inverse weighted distance grid-interpolation | -# | - Global (and triangle-specific) parameters management system, with | -# | functions for easily retrieving and changing these options | -# | - Simple pre-defined Bubble & color-gradient plot for a 4th variable | -# | - Linguistic components ('local' variable names) | -# | - A generic function for checking "sum of variable triplets" | -# | - 'geo' global and triangle specific option, that is outputted either | -# | from TT.plot() or TT.frame() and is used by lower level plotting | -# | functions: frame, grid, arrows, points... | -# | (Parameters: tlr.an, blr.clock, blr.tx, text.sum, etc) | -# | | -# +-------------------------------------------------------------------------+ - - -# +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ -# | LOAD REQUIRED PACKAGES: sp, drc, lattice, magic, nlme, plotrix | -# +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ - - - -# sp package is required for his pointinpolygon() function -# it is used here to determine is a data-point belong to a class-polygon (Soil Texture Class) - -# drc package is required for his drm() function -# it is used here fitting the Particle-size Distribution modes. - -# lattice, magic, nlme and plotrix package is required by drc - -# if( !"sp" %in% as.character( installed.packages()[,1] ) ) -# { # -# install.packages("sp") -# } # - -# if( !"drc" %in% as.character( installed.packages()[,1] ) ) -# { # -# install.packages("drc") -# } # - - -# if( !"lattice" %in% as.character( installed.packages()[,1] ) ) -# { # -# install.packages("lattice") -# } # -# -# if( !"lattice" %in% as.character( installed.packages()[,1] ) ) -# { # -# install.packages("magic") -# } # -# -# if( !"lattice" %in% as.character( installed.packages()[,1] ) ) -# { # -# install.packages("nlme") -# } # -# -# if( !"lattice" %in% as.character( installed.packages()[,1] ) ) -# { # -# install.packages("plotrix") -# } # - -# require( "sp" ) -# require( "drc" ) -# require( "drc" ) -# require( "lattice" ) -# require( "magic" ) -# require( "nlme" ) -# require( "plotrix" ) - - - - - - # Environment for storing, hiding and protecting internal variables and functions. TT.env <- new.env() @@ -1810,6 +1656,7 @@ TT.str <- function(# Internal. Stretch or reshape the range of value of some data set. ### Function to 'stretch' or reshape the range of value of some data set. Usefull for cex parameter in plot. +##keywords<< internal x, str.min = 0, @@ -1866,6 +1713,7 @@ TT.gen.op.set <- function(# Internal. Retrieve and set default values from options. ### Retrieve and set default values from options (that do _not_ superseed par()). +##keywords<< internal param, assign.op = TRUE, @@ -1935,6 +1783,7 @@ TT.par.op.set <- function(# Internal. Retrieve and set default values from options with default in "par()". ### Retrieve and set default values from options with default in "par()" +##keywords<< internal param, assign.op = TRUE, @@ -1999,6 +1848,7 @@ TT.auto.set <- function(# Internal. Retrieve and set default values for parameters (par() or not), when NULL. ### Retrieve and set default values for parameters (par() or not), when NULL. +##keywords<< internal fun = sys.function(which=-1), assign.op = TRUE, @@ -2091,8 +1941,9 @@ -TT.DJ.col <- function(# A function to obtaine a weight average 'mix' of different colors! +TT.DJ.col <- function(# Internal. A function to obtaine a weight average 'mix' of different colors! ### A function to obtaine a weight average 'mix' of different colors! +##keywords<< internal cl, # vector of colors, html stype "#808080" w, # vector of weight corresponding to the colors @@ -2122,8 +1973,9 @@ -TT.col2hsv <- function(# Convert any colors to hsv. +TT.col2hsv <- function(# Internal. Convert any colors to hsv. ### Convert any colors to hsv. Wrapper around rgb2hsv() and col2rgb(). +##keywords<< internal col ){ # @@ -2147,6 +1999,7 @@ TT.blr.tx.check <- function(# Internal. Check the consistency between blr.tx and css.names. ### Check the consistency between blr.tx and css.names. All values ### in blr.tx should be found in css.names and vice-versa. +##keywords<< internal blr.tx, css.names @@ -2184,6 +2037,7 @@ TT.blr.ps.lim <- function(# Internal. Create a tabular version of clay silt sand particle size limits. ### Create a tabular version of clay silt sand particle size limits. +##keywords<< internal blr.tx, css.ps.lim @@ -2218,6 +2072,7 @@ TT.geo.set <- function(# Internal. Takes "geo" values and assign them individually in the parent function. ### Takes "geo" values and assign them individually in the parent function. +##keywords<< internal geo, p.env = parent.frame() @@ -2319,6 +2174,7 @@ TT.geo.get <- function(# Internal. Retrieve and return the geometrical parameters from a list of parameter values (NULL or not). ### Retrieve and return the geometrical parameters from a list of parameter values (NULL or not). +##keywords<< internal class.sys = NULL, blr.clock = NULL, @@ -2571,9 +2427,10 @@ -TT.dia2phi <- function(# Convert a soil particle diameter dia [micro-meters] into phi = -log2(dia/1000) +TT.dia2phi <- function(# Internal. Convert a soil particle diameter dia [micro-meters] into phi = -log2(dia/1000) ### Convert a soil particle diameter dia [micro-meters] into ### phi = -log2(dia). See also TT.phi2dia(). +##keywords<< internal dia ### Particle size diameter in micro-meters (will be converted in milli-meters) @@ -2587,9 +2444,10 @@ -TT.phi2dia <- function(# Convert a soil particle phi value into diameter dia [micro-meters]. +TT.phi2dia <- function(# Internal. Convert a soil particle phi value into diameter dia [micro-meters]. ### Convert a soil particle phi value into diameter dia [micro-meters]. ### See also TT.dia2phi(). dia = (2^-phi)*1000. Not used by the package. +##keywords<< internal phi @@ -2605,10 +2463,11 @@ TT.check.ps.lim <- function(# Internal. Check the consistency between 'base.ps.lim' and 'dat.ps.lim'. ### Check the consistency between 'base.ps.lim' and 'dat.ps.lim'. ### 5 tests performed. +##keywords<< internal base.ps.lim, dat.ps.lim, - ps.lim.length=c(4,4) + ps.lim.length=c(4,4) ### vector of 2 integers. Number of particle size classes + 1. c(base,dat) ){ # @@ -2974,8 +2833,9 @@ -TT.deg2rad <- function(# Function to convert angle in degree to angle in radian. +TT.deg2rad <- function(# Internal. Function to convert angle in degree to angle in radian. ### Function to convert angle in degree to angle in radian. +##keywords<< internal A ### Angle in Degrees @@ -2991,6 +2851,7 @@ TT.ifelse <- function(# Internal. Flexible version of ifelse. ### Flexible version of ifelse. +##keywords<< internal test, yes, @@ -3008,6 +2869,7 @@ TT.switch <- function(# Internal. Used in the plot axis drawings. ### Used in the plot axis drawings. +##keywords<< internal blr.clock = TT.get("blr.clock"), c1 = NA, @@ -3036,9 +2898,10 @@ -TT.css2xy <- function(# Converts texture data (3 classes) into x-y coordinates. +TT.css2xy <- function(# Internal. Converts texture data (3 classes) into x-y coordinates. ### Converts texture data (3 classes) into x-y coordinates. This ### function is the 'heart' of most soiltexture plot functions. +##keywords<< internal tri.data, geo, @@ -3452,6 +3315,7 @@ ### Create an empty plot where a texture triangle can be drawn with ### other secondary functions (frame, axis, ...). Also return the ### 'geo' parameters needed by these secondary functions. +##keywords<< internal geo = NULL, class.sys = "none", @@ -3641,6 +3505,7 @@ ### Plot the edges (bare axis) of a soil texture triangle. This ### is not a primary plot function, TT.baseplot() must have been ### called before (usually inside TT.plot()). +##keywords<< internal geo, # @@ -3964,6 +3829,7 @@ TT.ticks <- function(# Internal. Plot the axis' ticks of a texture triangle plot. ### Plot the axis' ticks of a texture triangle plot. +##keywords<< internal geo, at = NULL, @@ -4044,6 +3910,7 @@ TT.ticks.lab <- function(# Internal. Plot the axis ticks' labels of a texture triangle plot. ### Plot the axis ticks' labels of a texture triangle plot. +##keywords<< internal geo, at = NULL, @@ -4135,6 +4002,7 @@ TT.axis.arrows <- function(# Internal. Plot the axis' arrows of a texture triangle plot. ### Plot the axis' arrows of a texture triangle plot. +##keywords<< internal geo, #css.names = NULL, @@ -4663,11 +4531,12 @@ -TT.vertices.plot <- function(# Plot the vertices of a texture classification system. +TT.vertices.plot <- function(# Internal. Plot the vertices of a texture classification system. ### Plot the vertices of a texture classification system, on top ### of an already drawn texture triangle plot. Also plot the ### vertices numbers. See TT.vertices.tbl() and TT.classes.tbl() ### for a non graphic, tabular equivalent of the plot. +##keywords<< internal geo, class.sys = "HYPRES.TT", @@ -4725,7 +4594,7 @@ -TT.polygon.area <- function(# Determines the area of 1 polygon (in x-y coordinates). +TT.polygon.area <- function(# Internal. Determines the area of 1 polygon (in x-y coordinates). ### Determines the area of 1 non-intersecting polygon (in x-y ### coordinates). Used by TT.polygon.centroids(). pol.x[1]:pol.y[1] ### is supposed different from pol.x[n]:pol.y[n] (i.e. the polygon @@ -4733,6 +4602,7 @@ ### After "http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/ ### Calculating The Area And Centroid Of A Polygon. Written by ### Paul Bourke, July 1988". +##keywords<< internal pol.x, ### Vector of numericals. X coordinates of each vertices of the @@ -4761,7 +4631,7 @@ -TT.polygon.centroids <- function(# Determines the centroid of 1 polygon (in x-y coordinates). +TT.polygon.centroids <- function(# Internal. Determines the centroid of 1 polygon (in x-y coordinates). ### Determines the centroid of 1 non-intersecting polygon (in x-y ### coordinates). Used to determine the centroid of each texture ### class in the texture triangle onces its clay silt sand @@ -4771,6 +4641,7 @@ ### After "http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/ ### Calculating The Area And Centroid Of A Polygon. Written by ### Paul Bourke, July 1988". +##keywords<< internal pol.x, ### Vector of numericals. X coordinates of each vertices of the @@ -6648,6 +6519,8 @@ ### Create a grid in the x-y coordinate system. Most of the function ### is a reshaped extract from kde2d() from the MASS package, by ### Venables & Ripley (+ modifications) +##keywords<< internal + x, y, n = 25 Added: pkg/soiltexture/R/soiltexture_text_gui.R =================================================================== --- pkg/soiltexture/R/soiltexture_text_gui.R (rev 0) +++ pkg/soiltexture/R/soiltexture_text_gui.R 2015-04-14 09:39:24 UTC (rev 123) @@ -0,0 +1,690 @@ + +# .select.list2 +# ========================================================== + +.select.list2 <- function( # Wrapper around 'menu' with error handling +### Wrapper around 'menu' with error handling + +##seealso<< \code{\link[utils]{select.list}}, on which +## \code{.select.list2} is based. + +##keywords<< internal + + title = NULL, +### See \code{\link[utils]{select.list}}. + + choices, +### See \code{\link[utils]{select.list}}. + + graphics = FALSE, +### See \code{\link[utils]{select.list}}. + + preselect = NULL, +### See \code{\link[utils]{select.list}}. + + error = "You haven't chosen anything", +### Single character string. Error message to be displayed if +### the user does not chose any item (code 0). + + multi = FALSE +### Single logical. If \code{TRUE}, then multiple choices are +### allowed. +){ + # Index of choices + choicesNum <- 1:length(choices) + + # Label choice index + names( choicesNum ) <- choices + + # library( "utils" ) + + mRes <- select.list( + title = title, + choices = choices, + preselect = preselect, + multiple = multi, + graphics = graphics + ) + + ## Error handling: + if( length(mRes) == 0 ){ + stop( error ) + } + + mRes <- choicesNum[ mRes ] + names( mRes ) <- NULL + + if( any( is.na( mRes ) ) ){ + stop( "Wrong value(s) chosen" ) + } + + return( mRes ) +### The \bold{index} of the user's choice (index from +### \code{choices}). +} + + # .select.list2( + # title = "Please chose", + # choices = c( "A", "B" ) + # ) + + + +# .chooseTextFiles +# ========================================================== + +.chooseTextFiles <- function( # Pop-up a menu to choose one or several text file(s) from the file system. +### Pop-up a menu to choose one or several text file(s) from the file system. + +##keywords<< internal + + caption = "Select a text file", +### See \code{\link[utils]{choose.files}} or +### \code{\link[tcltk]{tk_choose.files}}. + + multi = FALSE +### See \code{\link[utils]{choose.files}} or +### \code{\link[tcltk]{tk_choose.files}}. + +){ + if( !interactive() ){ + stop( "'.chooseTextFiles' can only be used in interactive mode" ) + } + + + ## Create a template of file extension to be read: + filterz <- matrix( + data = c( + "Text file (*.txt)", "*.txt", + "CSV file (*.csv)", "*.csv" ), + nrow = 2, + ncol = 2, + byrow = TRUE + ) + rownames( filterz ) <- c( "txt", "csv" ) + + ## Pop-up a menu to choose the bin file to be + ## imported + if( exists( "choose.files", where = "package:utils" ) ){ + # fun <- get( "choose.files" ) + + .file <- utils::choose.files( + # default = "", # , "*.bin" + caption = caption, + multi = multi, + filters = filterz + ) + + }else{ + .file <-tcltk::tk_choose.files( + # default = "", # , "*.bin" + caption = caption, + multi = multi, + filters = filterz + ) + } + + if( length( .file ) == 0 ){ + stop( "No file was chosen" ) + } + + return( .file ) +### Returns the full path to the selected file. +} + + + +# .read.table.menu +# ========================================================== + +.read.table.menu <- function( # Text-based menu for importing a text table (typically a CSV file) +### Text-based menu for importing a text table (typically a +### CSV file). + +##keywords<< internal + + graphics = FALSE, +### See \code{\link[utils]{select.list}}. + + stringsAsFactors = FALSE, +### See \code{\link{read.table}}. + + ... +### Additional parameters passed to +### \code{\link[utils]{read.table}}. + +){ + message( "==== Select the file to import ====" ) + # ============================================== + + message( "* Provide a text file (.txt or csv) containing soil texture data" ) + message( "* This must be a text file containing tabular data" ) + message( "* The file *must* contain the following headers: CLAY, SILT, SAND" ) + message( "* The column order does not matter, and other variables can be present" ) + + f <- .chooseTextFiles( + caption = "* Select a text file with soil texture data", + multi = FALSE + ) + + + + message( "==== File format ====" ) + # ================================ + + # Field separator character + sep <- c( + "Comma (,)" = ",", + "Semi-colon (;)" = ";", + "Tabulation (\t)" = "\t", + "Single space ( )" = " ", + "Multiple space ( )" = "" + ) + + sep <- sep[ .select.list2( + title = "* Choose the field/column separator character", + choices = names( sep ), + graphics = graphics, + preselect = names( sep )[ 1L ], + error = "You haven't chosen anything", + multi = FALSE + ) ] + + + # 'decimal points' character + dec <- c( + "Dot (.)" = ".", + "Comma (,)" = "," + ) + + dec <- dec[ .select.list2( + title = "* Choose the 'decimal points' character", + choices = names( dec ), + graphics = graphics, + preselect = names( dec )[ 1L ], + error = "You haven't chosen anything", + multi = FALSE + ) ] + + + # 'decimal points' character + fileEncoding <- c( + "Internal (current locale)" = "native.enc", + "UTF-8" = "UTF-8" + ) + + fileEncoding <- fileEncoding[ .select.list2( + title = "* Choose the encoding of the file", + choices = names( fileEncoding ), + graphics = graphics, + preselect = names( fileEncoding )[ 1L ], + error = "You haven't chosen anything", + multi = FALSE + ) ] + + + message( "==== Importing the file ====" ) + # ======================================= + + message( sprintf( "* File: %s", f ) ) + + dat <- read.table( file = f, sep = sep, dec = dec, + stringsAsFactors = stringsAsFactors, + fileEncoding = fileEncoding, header = TRUE ) + + message( sprintf( "* Dimensions: %s columns, %s rows", + ncol(dat), nrow(dat) ) ) + + message( sprintf( "* Columns: %s", + paste( colnames( dat ), collapse = "," ) ) ) + + + # Save attributes + attr( x = dat, which = "sep" ) <- sep + attr( x = dat, which = "dec" ) <- dec + attr( x = dat, which = "fileEncoding" ) <- fileEncoding + + return( dat ) +### A \code{\link{data.frame}} with the imported soil texture +### data (column names \code{CLAY}, \code{SILT} and \code{SAND}, +### along with any additional column present in the file +### imported). +} + +# library( "soiltexture" ) +# .read.table.menu() + + + +# soiltexture_gui +# ========================================================== + +soiltexture_gui <- function( # Text-based menu for plotting and classifying soil texture data +### Text-based menu for plotting and classifying soil texture +### data. +### +### If you simply want to obtain a figure with an +### empty soil texture triangle, just call +### \code{soiltexture_gui}() and follow the instructions. +### +### If you want to a figure with your own soil texture data +### on top of a texture triangle, you must first prepare +### a tabular text file containing your texture data, as +### \code{.txt} or \code{.csv}. Such a file can be prepared +### with \code{MS Excel} or \code{Libre Office}, and exported +### as CSV ("CSV (comma delimited) (*.csv)" or "CSV (MS-DOS) +### (*.csv)" for example). The table \bold{must} contain +### headers (column names) and it \bold{must} the following +### columns and headers: \code{CLAY}, \code{SILT} and +### \code{SAND}. Other columns are allowed and will be ignored. +### In the texture data file, each row represent a record +### (a sample) and each column a variable. +### +### You will be asked about the format of this text file, in +### particular about the field / column separator (it can be +### commas, semi-colons, tabulations or (multiple) spaces) +### and the decimal mark (comma or dot). The file encoding +### can be either the native encoding of the computer, or +### UTF-8 (without BOM). +### +### The sum of the texture of each row must be either 1 (if +### expressed as a fraction) or 100 (if expressed as a +### percentage). You will be asked about the unit. Only small +### divergences from 1 or 100 are allowed, but you will be +### asked if you want to normalise your data beforehand, so +### larger divergences are possible. +### +### You will also be asked which texture classification system +### you want to use (FAO, USDA, etc.). It is possible to +### plot a texture triangle without texture classification. +### +### Finally, if you have chosen a texture classification system, +### \code{soiltexture_gui} can classify each record according +### to this classification system and \bold{return you the [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/soiltexture -r 123 From noreply at r-forge.r-project.org Tue Apr 14 11:40:16 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 11:40:16 +0200 (CEST) Subject: [Soiltexture-commits] r124 - pkg/soiltexture/inst Message-ID: <20150414094016.91671183CE9@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 11:40:16 +0200 (Tue, 14 Apr 2015) New Revision: 124 Modified: pkg/soiltexture/inst/SVN_VERSION Log: version Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-14 09:39:24 UTC (rev 123) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-14 09:40:16 UTC (rev 124) @@ -1 +1 @@ -118:122M +122:123M From noreply at r-forge.r-project.org Tue Apr 14 15:59:37 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 15:59:37 +0200 (CEST) Subject: [Soiltexture-commits] r125 - / pkg/soiltexture pkg/soiltexture/inst pkg/soiltexture/man Message-ID: <20150414135937.841D71877D0@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 15:59:37 +0200 (Tue, 14 Apr 2015) New Revision: 125 Modified: pkg/soiltexture/DESCRIPTION pkg/soiltexture/NAMESPACE pkg/soiltexture/inst/SVN_VERSION pkg/soiltexture/man/soiltexture-package.Rd soiltexture_compile.R Log: utils now in Depends (not Imports) Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2015-04-14 09:40:16 UTC (rev 124) +++ pkg/soiltexture/DESCRIPTION 2015-04-14 13:59:37 UTC (rev 125) @@ -5,9 +5,9 @@ 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 -Depends: R (>= 3.1.1) +Depends: R (>= 3.1.1), utils 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. License: AGPL (>=3) URL: http://soiltexture.r-forge.r-project.org/ -Imports: sp, MASS, tools, utils, tcltk +Imports: sp, MASS, tools, tcltk Modified: pkg/soiltexture/NAMESPACE =================================================================== --- pkg/soiltexture/NAMESPACE 2015-04-14 09:40:16 UTC (rev 124) +++ pkg/soiltexture/NAMESPACE 2015-04-14 13:59:37 UTC (rev 125) @@ -3,8 +3,8 @@ importFrom(sp,point.in.polygon) importFrom(MASS,kde2d) importFrom(MASS,mvrnorm) -importFrom(utils,installed.packages) -importFrom(utils,select.list) -importFrom(utils,choose.files) +#importFrom(utils,installed.packages) +#importFrom(utils,select.list) +#importFrom(utils,choose.files) importFrom(tcltk,tk_choose.files) importFrom(tools,package_dependencies) Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-14 09:40:16 UTC (rev 124) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-14 13:59:37 UTC (rev 125) @@ -1 +1 @@ -122:123M +122:124M Modified: pkg/soiltexture/man/soiltexture-package.Rd =================================================================== --- pkg/soiltexture/man/soiltexture-package.Rd 2015-04-14 09:40:16 UTC (rev 124) +++ pkg/soiltexture/man/soiltexture-package.Rd 2015-04-14 13:59:37 UTC (rev 125) @@ -26,7 +26,7 @@ Maintainer: \tab Julien Moeys \cr -Depends: \tab R (>= 3.1.1)\cr +Depends: \tab R (>= 3.1.1), utils\cr Suggests: \tab xtable\cr @@ -34,7 +34,7 @@ URL: \tab http://soiltexture.r-forge.r-project.org/\cr -Imports: \tab sp, MASS, tools, utils, tcltk\cr} +Imports: \tab sp, MASS, tools, tcltk\cr} } Modified: soiltexture_compile.R =================================================================== --- soiltexture_compile.R 2015-04-14 09:40:16 UTC (rev 124) +++ soiltexture_compile.R 2015-04-14 13:59:37 UTC (rev 125) @@ -18,9 +18,9 @@ pkgName = pkgName, pkgDir = pkgDir, pkgVersion = "1.3.0", - pkgDepends = NULL, # "utils" In Depends because can not importFrom Windows only functions + pkgDepends = "utils", # In Depends because can not importFrom Windows only functions pkgSuggests = c( "xtable" ), # c("drc","plotrix"), - pkgImports = c( "sp", "MASS", "tools", "utils", "tcltk" ), + pkgImports = c( "sp", "MASS", "tools", "tcltk" ), # "utils", RVersion = NULL ) From noreply at r-forge.r-project.org Tue Apr 14 15:59:54 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 15:59:54 +0200 (CEST) Subject: [Soiltexture-commits] r126 - www Message-ID: <20150414135954.D83981877D0@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 15:59:54 +0200 (Tue, 14 Apr 2015) New Revision: 126 Added: www/USDA_texture_triangle.png www/generate_figures.R www/generate_index.R www/index.md www/index_old.html Removed: www/EN_TEXTURE_TRIANGLE_USDA_GRAD_UNOFFICIAL_CC-BY-SA-3-small.png www/index.html www/kompozer_80x15.png Log: Updated homepage Deleted: www/EN_TEXTURE_TRIANGLE_USDA_GRAD_UNOFFICIAL_CC-BY-SA-3-small.png =================================================================== (Binary files differ) Added: www/USDA_texture_triangle.png =================================================================== (Binary files differ) Property changes on: www/USDA_texture_triangle.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: www/generate_figures.R =================================================================== --- www/generate_figures.R (rev 0) +++ www/generate_figures.R 2015-04-14 13:59:54 UTC (rev 126) @@ -0,0 +1,17 @@ + +setwd( "D:/Users/julienm/Documents/_WORKS/_PROJECTS/r_packages/soiltexture/www" ) + +library( "soiltexture" ) + +png( + filename = "USDA_texture_triangle.png", + width = 512, + height = 512, + res = 75 +) + + TT.plot( class.sys = "USDA.TT", # family.op = "serif", + cex.axis = 1, cex.lab = 1, cex.main = 1, + class.p.bg.col = TRUE, main = NA ) + +dev.off() Added: www/generate_index.R =================================================================== --- www/generate_index.R (rev 0) +++ www/generate_index.R 2015-04-14 13:59:54 UTC (rev 126) @@ -0,0 +1,10 @@ + +setwd( "D:/Users/julienm/Documents/_WORKS/_PROJECTS/r_packages/soiltexture/www" ) + +library( "markdown" ) + +markdownToHTML( + file = "index.md", + output = "index.html", + title = "soiltexture: The Soil Texture Wizard", + encoding = "UTF-8" ) Deleted: www/index.html =================================================================== --- www/index.html 2015-04-14 13:59:37 UTC (rev 125) +++ www/index.html 2015-04-14 13:59:54 UTC (rev 126) @@ -1,348 +0,0 @@ -r-forge
-

Welcome to The Soil Texture Wizard project!

-Unofficial USDA texture triangle made with the soiltexture package
-
-The Soil Texture Wizard is a -set of R functions designed to produce texture triangle plots. It also -allows to classify soil textures data according to a classification, -and to transform them according to different texture particle size -class systems.
-

In short
-

- -

Related projects

-Other projects exists that provides useful soil-related R functions -(toolboxes for the pedometrician):
-
    -
  • aqp. -'Algorithms for Quantitative Pedology';
    -
  • -
  • soilwater. -Provides soil water retention functions and soil hydraulic conductivity -functions and pedotransfer functions to estimate their parameter from -easily available soil properties;
  • -
-Other packages that may interest soil scientists are:
-
    -
  • soil.spec. Soil spectral data exploration and -regression functions;
  • -
  • HydroMe. -Estimation of Soil Hydraulic Parameters from Experimental Data;
  • -
  • SoPhy. A defunct -package that implemented a 2D water infiltration model into R;
  • -
-

Package installation

-For installing the package, -try first:
-
-    -install.packages("soiltexture")
-

-If it doesn't work, or if you don't have the latest release of R, try -instead:
-
    -install.packages("soiltexture", repos = "http://R-Forge.R-project.org")

or:

-
    -install.packages("soiltexture", repos = "http://R-Forge.R-project.org", -type = "source")
-
-If it doesn't work, try to load the sources instead (this method does -not install the help page):
-

-
    source( -"https://r-forge.r-project.org/scm/viewvc.php/*checkout*/pkg/soiltexture/R/soiltexture.R?root=soiltexture" -)
-
-

Features list

-

"The Soil Texture Wizard" is an integrated set of -functions for the R -software for statistical computing, that allows to:

- -
    -
  • Create clear, readable soil texture triangles graphics (also called ternary -plots or soil texture diagrams), with proper axis labels, either -"neutral", or with one of the 14 soil texture -classification systems actually pre-defined: -
  • -
-
    -
  • USDA;
    -
  • -
  • FAO (which is also the triangle for the soil map of Europe);
    -
  • -
  • Aisne (France);
    -
  • -
  • GEPPA (France);
    -
  • -
  • German triangle (Bodenkundliche Kartieranleitung 1994);
  • German triangle (Standortserkundungsanweisung SEA 1974) for forest soils (new 2011/10/11);
  • German triangle (TGL 24300-05, landwirtschaftliche B?den, 1985) for arable soils (new 2011/10/15);
  • -
  • Soil Survey of England and Wales (UK);
    -
  • -
  • Australian triangle;
    -
  • -
  • Belgian triangle (new 2009/10/15);
    -
  • -
  • Canadian triangle (new 2010/04/16);
    -
  • -
  • ISSS triangle (new 2010/05/13);
  • -
  • Romanian texture triangle (new -2010-06-09);
  • Polish triangle (Systematyka gleb Polski, 1989, for non-alluvial soils -- new).
  • -
-

Many thanks to Wei -Shangguan, from the School of geography of Beijing normal -university for providing the code of ISSS the triangle, to Rosca -Bogdan (from Romanian Academy, Iasi Branch, Geography team) for -providing the code for the Romanian triangle, to Wiktor Zelazny for providing the code for the Polish triangle (and the polish language translation of triangle labels) and to Rainer Petzold (Staatsbetrieb Sachsenforst) for providing the code of the German SEA 1974 and TGL 1985 triangles.
-

-
    -
  • Implement new texture triangles or create -personalized texture triangles, that will be usable as any of -the above mentioned soil textures triangle (graphs, classification, -etc.);
  • -
-
    -
  • Numerous graphical possibilities to display -soil texture data in a texture triangle, following an option -system similar to R plot(), points() and text() functions: -
  • -
-
    -
  • Simple graphics (points);
  • -
  • Bubble charts (points sizes and colors are proportional to a 4th -variable);
  • -
  • Graph with text instead of points.
  • -
-
    -
  • Calculate the texture class(es) (= classification) to which belong soil texture -data, in 1 of the 7 predefined system / classification / triangle (or -your own custom triangle);
  • -
-
    -
  • Transform soil textures data from 1 particle sizes system (limits between the -clay, silt and sand particles) to another -particle size system, with a log-linear transformation (estimation). -For instance, it is possible to convert a textures data table measured -in a system that have a silt / sand limit is 60 micrometers into a -system that has a silt / sand limit is 50 micrometers. It is also possible to define your own texture -transformation function, and use it for on-the-fly transformation of -data in texture plots or for texture classification.;
  • -
-
    -
  • Display a texture triangle / classification in -a (triangle) geometry different from its default (triangle) geometry. -For instance, a texture triangle / classification usually displayed in -an isosceles triangle can be displayed in a right-angled triangle. The -geometrical parameters that can be changed are:
  • -
-
    -
  • The 3 angles of the triangle (free);
  • -
  • The "direction" of increasing textures for each axes (clockwise, -anti-clockwise or "centripetal");
  • -
  • The location of the 3 texture classes (clay, silt and sand) on -the 3 axes (abscissae, left or right axis).
  • -
-

Over-plot -/ superimpose 2 different texture triangles / classifications -into one single plot, whatever their initial "geometry" (for instance -the German right-angled soil texture triangle and the USDA isosceles -texture triangle can be over-plotted (into a given geometry));

-
    -
  • On the fly transformation of textures data particle size when -plotting a soil texture triangle;
  • -
-
    -
  • On the fly transformation of a triangle particle size when -over-plotting 2 (different) texture triangles;
  • -
- -
    -
  • Contour plot or image plot of: -
  • -
-
    -
  • 2D kernel density estimation (based on R-MASS kde2d function) (new 2009/10/13)
    -
  • -
  • Mahalanobis distance (based on R mahalanobis function), with or -without additive log-ratio transformation (new -2009/10/13)
    -
  • -
  • Inverse weighted distance estimate / smoothing of a 4th variable;
  • -
-
    -
  • Normalisation of texture datas sum of the 3 texture classes -to 100% (new 2009/10/13).
  • -
-
    -
  • Chose between 7 languages for the plot title -and the 3 axes legends (English, French, Swedish, German, -Spanish, Italian and Dutch), with a simple option;
  • -
-
    -
  • Most of the functions are optimised for -speed, and are thus suitable for mass / -batch treatment of soil textures data: -
  • -
-
    -
  • 3400 soil textures data transformed per second;
    -
  • -
  • 14000 soil textures data "classified" per second;
  • -
-
(Under Windows XP, Intel Core 2 Duo, -2,66 Ghz, 3,23 Gb of RAM)
-

Other works and softwares on soil textures -(triangles)

-

Numerous other works and softwares exist that deal with -soil textures and soil textures triangles. Nevertheless, to my -knowledge, The Soil Texture Wizard is the only -tool that offers an integrated set of functionalities for soil textures -(smart graphs + classification + multi-triangle + multi-geometry).

-

Ternary graphs (without soil textures classes):

-triangle.plot() and triangle.biplot() -functions, from the R package ADE4, by Daniel Chessel, Anne-Beatrice -Dufour and Stephane Dray. These functions are not specialised in soil -textures plots (and can not plot soil texture classes), but offer of -nice "zoom" feature that dont exist in -The Soil Texture Wizard, nor in the PLOTRIX package (see below). For -illustrations, see the web-page on triangle.plot() on the R Graph Gallery, -by Romain Francois.
-
-ternaryplot() function in the R package VCD -by David Meyer, Achim Zeileis and Kurt Hornik. For illustrations, see -the web-page on ternaryplot() on the R Graph Gallery, by -Romain Francois.
-
-

Ternary graphs (with soil textures classes):

-The functions soil.texture() and soil.texture.uk() from the R -package PLOTRIX, by Jim Lemon et -al. It allows to create graphs, with or without soil textures data, -following the USDA or the UK soil texture triangles. There is also an -underlying ternary plot function that can be used without soil texture -classes. It is nevertheless not possible to project the triangles into -another geometry, nor to transform or classify soil textures data. The R functions presented here ("The Soil Texture -Wizard") are originally (i.e. 3 years ago) derived from some functions -of the PLOTRIX package. Now, there probably not a single -common line of code, and the 2 set of functions are unfortunately not -compatible. But The Soil Texture Wizard obviously wouldnt exist if I -havent been able to freely adapt the code from PLOTRIX (reason why -free and open-source licences are so great). For illustrations of -PLOTRIX, see the web-page on soil.texture() on the R Graph Gallery, by -Romain Francois. -

Automatic classification:
-

-

Texture -Autolookup, by Christopher Teh Boon Sung is a -standalone program, with a graphical user interface, that can classify -soil textures following the USDA, UK, Canadian, FAO texture triangles, -or 7 other systems. The work has been published in two articles of -"Communications in Soil and Plant Analysis", in 1996 and 2003. The -software also allows to plot / visualise soil texture data (but the -plot function is not very advanced), in 2 different triangle geometries.

-TRIANGLE, "A Program For Soil Textural Classification", -by Aris Gerakis and Brian Baer allows to classify soil -textures data after the USDA soil texture triangle (published in the Soil Science Society of America -Journal in 1999). -

r.soils.texture is a [Grass-GIS -http://grass.osgeo.org/] add-on for classifying raster files of soil -textures with 3 classification systems (USDA, FAO, ISSS). Note that -this is not R code.

-

Articles related to soil texture triangles or -systems

-

Richer de Forges A., Feller C., -Jamagne M. & Arrouays D., 2008. "Perdus dans le triangle -des textures" (?tudes et Gestion des Sols, 15:2, pp. 97-111) -(en: "Lost in the textures triangle") are -presenting a gallery of 29 soil textures triangles, either still in use -nowadays or that were used in the past, from France and other -countries, and comparing the location of soil texture triangles limits -between several triangles. The article also presents a table comparing -the particle size limits (for clay, silt and sand fractions) between -numerous countries. See also their poster in English. -The "comparison" work has been done with a geographic information -system (ArcGIS?).

-B. Minasny and A.B. McBratney. The australian soil -texture boomerang: a comparison of the australian and usda/fao soil -particle-size classication systems. Australian Journal of Soil -Research, 39:1443-1451, 2001. LINK. -

A. Nemes, J.H.M. W?sten, A. Lilly, -and J.H. Oude Voshaar. Evaluation -of different procedures to interpolate particle-size distributions to -achieve compatibility within soil databases. Geoderma, -90:187-202, 1999. LINK.

-

-

Roadmap
-

-

- (suceptible to changes):
-
    -
  • The functions provided by the soiltexture package are considered -as beta / almost stable, but they need to be tested by more users.
  • -
  • The main function TT.plot() is now documented.
  • -
  • TT.points.in.classes() is also documented.
    -
  • -
  • The documentation is under construction for the rest of the -package (using inlinedocs), -and will be gradually completed.
  • -
  • ...
  • -
-

Feedbacks, contact, license, credit and -(absence of) guaranty

-

Feedbacks & contacts
-

-Feedbacks on the package are always welcome: - -

Credits

-See the latest package DESCRIPTION for a list of the authors to credit if -you cite / mesion this package.
-

License & garantees

-This package is a Free & Open Source Software (GNU -Affero GPL >= 3). Its documentation is licensed under a Creatice -Commons BY-SA. You are free to copy, distribute and modify this -package, but please make sure you make it clear that your version is -different from the original (i.e. cite the original authors, give the -package another name, and make it clear the original authors don't -endorse the changes).
-
-The R functions and the documents presented here have been created and -tested carefully but, given the free distribution of this work and the -highly permissive license, the author is not providing any guarantee of -exactitude of the data and functions, and decline any responsibility -regarding the use that could be done with that work.
-
-Creative Commons License
-This webpage is licenced under a Creative Commons -Licence.
-
-Document made with KompoZer Added: www/index.md =================================================================== --- www/index.md (rev 0) +++ www/index.md 2015-04-14 13:59:54 UTC (rev 126) @@ -0,0 +1,153 @@ + +soiltexture: The Soil Texture Wizard +==================================== + +![USDA Soil Texture Triangle](USDA_texture_triangle.png) + +Page content: +[In short](#inshort) · +[Introduction](#intro) (_this section_) · +[Installation](#installation) · +[Text based graphical user interface](#text_gui) · +[Usage](#usage) · + +In short +-------- + +* Author: **Julien MOEYS** ([SLU][]/[CKB][]). +* Package on CRAN: http://cran.r-project.org/web/packages/soiltexture/index.html +* Project page on R-forge: http://r-forge.r-project.org/projects/soiltexture/ +* Code Repository (R-forge): http://r-forge.r-project.org/scm/?group_id=740 + + + +Introduction +------------ + +`soiltexture` is a [package][R_packages] (_extension_) for +the [R][], a _free software environment for statistical_ +_computing and graphics_. + +`soiltexture` is a toolbox for plotting, classifying and +transforming [soil texture][soil_texture] data (clay, +silt and sand contents). + +Soil texture data and soil [texture classifications systems][texture_classif] +are traditionally visualised (plotted) on [ternary diagrams][ternary_plot] +(called texture plots, texture diagrams or texture triangles). + +`soiltexture` currently implements 17 soil texture classification +systems from all around the world. See [here][triangle_gallery] +for a gallery of available texture triangles, and see also +the package vignette (_after [installing](#installation)_ +_the package_): + + vignette( "soiltexture_vignette" ) + + + +Installation +============ + +Install R +--------- + +You need to install beforehand the sofware [R][] ("_a free_ +_software environment for statistical computing and graphics_"). + +From R homepage, go to the [CRAN homepage][CRAN] or (_better_) choose +the nearest [CRAN mirror][CRAN_mirrors]. + +From there, choose 'Download R for ...' (Windows, Mac or Linux), +and then choose 'base' or 'install R for the First time'. + +From there (latest stable R release), download the software +installation files (if you are running on Windows) and install +the program on your computer (follow the instructions from the +installer). + +Note: Unless you know what you are doing, it is recommended +to install the latest R release (it may not always be possible +to install the package `soiltexture` on older versions of R, +or some of the latest features might be missing). + + + +Install soiltexture (stable release) +------------------------------------ + +Open R, and type the command: + + install.packages( "soiltexture" ) + + + +Install soiltexture (development version) +----------------------------------------- + +Note: This will only work with the latest (stable) version +of R. You should also check on the package R-forge page +(here: http://r-forge.r-project.org/R/?group_id=740) that +the "Build status" of `soiltexture` is "Current" (and not +"Failed to build"). + +Open R, and type the command: + + install.packages("soiltexture", repos="http://R-Forge.R-project.org") + + + +Text based graphical user interface +=================================== + +From version `1.3.0` the package soil texture comes along +with a simple [text-based graphical user interface][text_gui]. + +After you have [installed](#installation) `R` and the package +`soiltexture`, simply start R and type: + + soiltexture::soiltexture_gui() + +This will start the text-based graphical user interface. You +will be asked a series of simple question (4 to 8. With a list +of possible answers), to import soil texture data, visualise +it on a texture triangle and classify the texture data according +to a classification system. Without typing any other commands +than the one above. You can also display an empty texture +triangle (without data-points) and/or display a texture triangle +without classification system. + +More information on how to prepare your soil texture data +can be found on the function help page. In R, type: + + help( "soiltexture_gui" ) + +or simply + + ?soiltexture_gui + +Note: An alternative way to call `soiltexture_gui` is to type: + + library( "soiltexture" ) + soiltexture_gui() + + + +Usage +===== + + + + +[R]: http://www.r-project.org/ "R software homepage" +[R_packages]: http://en.wikipedia.org/wiki/R_%28programming_language%29#Packages "R packages (Wikipedia)" +[text_gui]: http://en.wikipedia.org/wiki/Text-based_user_interface "Text-based user interface (Wikipedia)" +[soil_texture]: http://en.wikipedia.org/wiki/Soil_texture "Soil texture (Wikipedia)" +[texture_classif]: http://en.wikipedia.org/wiki/Soil_texture#Soil_texture_classification "Soil texture classification (Wikipedia)" +[ternary_plot]: http://en.wikipedia.org/wiki/Ternary_plot "Ternary plot (Wikipedia)" +[triangle_gallery]: http://julienmoeys.info/2015/02/06/texture-triangle-gallery/ +[SLU]: http://www.slu.se/en/ "Swedish University of Agricultural Sciences" +[CKB]: http://www.slu.se/en/collaborative-centres-and-projects/centre-for-chemical-pesticides-ckb1/ "The Centre for Chemical Pesticides (CKB)" +[CRAN]: http://cran.r-project.org/ "The Comprehensive R Archive Network" +[CRAN_mirrors]: http://cran.r-project.org/mirrors.html "CRAN Mirrors" + Copied: www/index_old.html (from rev 122, www/index.html) =================================================================== --- www/index_old.html (rev 0) +++ www/index_old.html 2015-04-14 13:59:54 UTC (rev 126) @@ -0,0 +1,348 @@ +r-forge
+

Welcome to The Soil Texture Wizard project!

+Unofficial USDA texture triangle made with the soiltexture package
+
+The Soil Texture Wizard is a +set of R functions designed to produce texture triangle plots. It also +allows to classify soil textures data according to a classification, +and to transform them according to different texture particle size +class systems.
+

In short
+

+ +

Related projects

+Other projects exists that provides useful soil-related R functions +(toolboxes for the pedometrician):
+
    +
  • aqp. +'Algorithms for Quantitative Pedology';
    +
  • +
  • soilwater. +Provides soil water retention functions and soil hydraulic conductivity +functions and pedotransfer functions to estimate their parameter from +easily available soil properties;
  • +
+Other packages that may interest soil scientists are:
+
    +
  • soil.spec. Soil spectral data exploration and +regression functions;
  • +
  • HydroMe. +Estimation of Soil Hydraulic Parameters from Experimental Data;
  • +
  • SoPhy. A defunct +package that implemented a 2D water infiltration model into R;
  • +
+

Package installation

+For installing the package, +try first:
+
+    +install.packages("soiltexture")
+

[TRUNCATED] To get the complete diff run: svnlook diff /svnroot/soiltexture -r 126 From noreply at r-forge.r-project.org Tue Apr 14 16:01:21 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 16:01:21 +0200 (CEST) Subject: [Soiltexture-commits] r127 - pkg/soiltexture/inst www Message-ID: <20150414140121.E82731877D0@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 16:01:21 +0200 (Tue, 14 Apr 2015) New Revision: 127 Added: www/index.html Modified: pkg/soiltexture/inst/SVN_VERSION Log: version Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-14 13:59:54 UTC (rev 126) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-14 14:01:21 UTC (rev 127) @@ -1 +1 @@ -122:124M +122:125M Added: www/index.html =================================================================== --- www/index.html (rev 0) +++ www/index.html 2015-04-14 14:01:21 UTC (rev 127) @@ -0,0 +1,295 @@ + + + + + +soiltexture: The Soil Texture Wizard + + + + + + + + + + + + + + +

soiltexture: The Soil Texture Wizard

+ [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/soiltexture -r 127 From noreply at r-forge.r-project.org Tue Apr 14 17:19:25 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 17:19:25 +0200 (CEST) Subject: [Soiltexture-commits] r128 - in www: . figure Message-ID: <20150414151925.EF67D18768D@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 17:19:25 +0200 (Tue, 14 Apr 2015) New Revision: 128 Added: www/FAQ.Rmd www/FAQ.html www/figure/ www/figure/test-1.png Modified: www/generate_index.R www/index.html www/index.md Log: Update homepage Added: www/FAQ.Rmd =================================================================== --- www/FAQ.Rmd (rev 0) +++ www/FAQ.Rmd 2015-04-14 15:19:25 UTC (rev 128) @@ -0,0 +1,12 @@ +soiltexture: FAQ +================ + +_This page is under construction. Please come back later_ + +Test +---- + +```{r test, echo=TRUE} +library( "soiltexture" ) +TT.plot() +``` Added: www/FAQ.html =================================================================== --- www/FAQ.html (rev 0) +++ www/FAQ.html 2015-04-14 15:19:25 UTC (rev 128) @@ -0,0 +1,223 @@ + + + + + +soiltexture: FAQ + + + + + + + + + + + + + + + + + + +

soiltexture: FAQ

+ +

This page is under construction. Please come back later

+ +

Test

+ +
library( "soiltexture" ) 
+
+ +
## soiltexture 1.3.0 (svn revision: 122:125M). For help type: help(pack='soiltexture')
+
+ +
TT.plot()
+
+ +

plot of chunk test

+ + + + Added: www/figure/test-1.png =================================================================== (Binary files differ) Property changes on: www/figure/test-1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: www/generate_index.R =================================================================== --- www/generate_index.R 2015-04-14 14:01:21 UTC (rev 127) +++ www/generate_index.R 2015-04-14 15:19:25 UTC (rev 128) @@ -8,3 +8,11 @@ output = "index.html", title = "soiltexture: The Soil Texture Wizard", encoding = "UTF-8" ) + +library( "knitr" ) + +knit2html( + input = "FAQ.Rmd", + output = "FAQ.html", + title = "soiltexture: FAQ", + encoding = "UTF-8" ) Modified: www/index.html =================================================================== --- www/index.html 2015-04-14 14:01:21 UTC (rev 127) [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/soiltexture -r 128 From noreply at r-forge.r-project.org Tue Apr 14 17:19:53 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 17:19:53 +0200 (CEST) Subject: [Soiltexture-commits] r129 - www Message-ID: <20150414151953.D1FA118768D@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 17:19:53 +0200 (Tue, 14 Apr 2015) New Revision: 129 Added: www/FAQ.md Log: Added: www/FAQ.md =================================================================== --- www/FAQ.md (rev 0) +++ www/FAQ.md 2015-04-14 15:19:53 UTC (rev 129) @@ -0,0 +1,22 @@ +soiltexture: FAQ +================ + +_This page is under construction. Please come back later_ + +Test +---- + + +```r +library( "soiltexture" ) +``` + +``` +## soiltexture 1.3.0 (svn revision: 122:125M). For help type: help(pack='soiltexture') +``` + +```r +TT.plot() +``` + +![plot of chunk test](figure/test-1.png) From noreply at r-forge.r-project.org Tue Apr 14 17:20:48 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 17:20:48 +0200 (CEST) Subject: [Soiltexture-commits] r130 - in pkg/soiltexture: R man Message-ID: <20150414152048.435371876F4@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 17:20:47 +0200 (Tue, 14 Apr 2015) New Revision: 130 Modified: pkg/soiltexture/R/soiltexture_text_gui.R pkg/soiltexture/man/soiltexture_gui.Rd Log: Attempt to fix an issue in an Rd file Modified: pkg/soiltexture/R/soiltexture_text_gui.R =================================================================== --- pkg/soiltexture/R/soiltexture_text_gui.R 2015-04-14 15:19:53 UTC (rev 129) +++ pkg/soiltexture/R/soiltexture_text_gui.R 2015-04-14 15:20:47 UTC (rev 130) @@ -300,14 +300,16 @@ ### ### Finally, if you have chosen a texture classification system, ### \code{soiltexture_gui} can classify each record according -### to this classification system and \bold{return you the -### texture class of each record}, as a CSV text file. +### to this classification system and +### \bold{return you the texture class of each record}, +### as a CSV text file. ### ### The texture triangle is show to you with R default ### graphical device, and you can choose to export a ### PNG figure of the resulting texture triangle (between ### 512 and 2048 pixel width/height, depending on what you ### chose). +### main = NULL, ### Single character string. Main title of the texture Modified: pkg/soiltexture/man/soiltexture_gui.Rd =================================================================== --- pkg/soiltexture/man/soiltexture_gui.Rd 2015-04-14 15:19:53 UTC (rev 129) +++ pkg/soiltexture/man/soiltexture_gui.Rd 2015-04-14 15:20:47 UTC (rev 130) @@ -84,10 +84,12 @@ \code{soiltexture_gui} can classify each record according -to this classification system and \bold{return you the +to this classification system and -texture class of each record}, as a CSV text file. +\bold{return you the texture class of each record}, +as a CSV text file. + The texture triangle is show to you with R default @@ -98,8 +100,10 @@ 512 and 2048 pixel width/height, depending on what you -chose).} +chose). +} + \usage{soiltexture_gui(main = NULL, graphics = FALSE, ...)} \arguments{ From noreply at r-forge.r-project.org Tue Apr 14 17:21:38 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 17:21:38 +0200 (CEST) Subject: [Soiltexture-commits] r131 - pkg/soiltexture/inst Message-ID: <20150414152138.3513B187826@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 17:21:37 +0200 (Tue, 14 Apr 2015) New Revision: 131 Modified: pkg/soiltexture/inst/SVN_VERSION Log: version Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-14 15:20:47 UTC (rev 130) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-14 15:21:37 UTC (rev 131) @@ -1 +1 @@ -122:125M +122:130M From noreply at r-forge.r-project.org Tue Apr 14 17:35:15 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 17:35:15 +0200 (CEST) Subject: [Soiltexture-commits] r132 - www Message-ID: <20150414153515.853DC1879B8@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 17:35:15 +0200 (Tue, 14 Apr 2015) New Revision: 132 Modified: www/index.html www/index.md Log: Update homepage Modified: www/index.html =================================================================== --- www/index.html 2015-04-14 15:21:37 UTC (rev 131) +++ www/index.html 2015-04-14 15:35:15 UTC (rev 132) @@ -186,6 +186,8 @@
  • Project page on R-forge: http://r-forge.r-project.org/projects/soiltexture/
  • Code Repository (R-forge): http://r-forge.r-project.org/scm/?group_id=740
  • Comprehensive tutorial (package vignette): http://cran.r-project.org/web/packages/soiltexture/vignettes/soiltexture_vignette.pdf
  • +
  • Frequently Asked Questions: FAQ (under construction)
  • +
  • On-line documentation: http://docs.julienmoeys.info/soiltexture/
  • Introduction

    Modified: www/index.md =================================================================== --- www/index.md 2015-04-14 15:21:37 UTC (rev 131) +++ www/index.md 2015-04-14 15:35:15 UTC (rev 132) @@ -22,6 +22,8 @@ * Project page on R-forge: http://r-forge.r-project.org/projects/soiltexture/ * Code Repository (R-forge): http://r-forge.r-project.org/scm/?group_id=740 * Comprehensive tutorial (_package vignette_): http://cran.r-project.org/web/packages/soiltexture/vignettes/soiltexture_vignette.pdf +* Frequently Asked Questions: [FAQ](FAQ.html) (_under construction_) +* On-line documentation: http://docs.julienmoeys.info/soiltexture/ From noreply at r-forge.r-project.org Tue Apr 14 18:17:51 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 18:17:51 +0200 (CEST) Subject: [Soiltexture-commits] r133 - pkg/soiltexture/R Message-ID: <20150414161751.82EBA186EA1@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 18:17:51 +0200 (Tue, 14 Apr 2015) New Revision: 133 Modified: pkg/soiltexture/R/soiltexture_text_gui.R Log: Typo: changed year in triangle's title Modified: pkg/soiltexture/R/soiltexture_text_gui.R =================================================================== --- pkg/soiltexture/R/soiltexture_text_gui.R 2015-04-14 15:35:15 UTC (rev 132) +++ pkg/soiltexture/R/soiltexture_text_gui.R 2015-04-14 16:17:51 UTC (rev 133) @@ -467,7 +467,7 @@ "Romania" = "ROM.TT", "Poland" = "PL.TT", "Brasil (1996)" = "BRASIL.TT", - "Brasil (2012)" = "SiBCS13.TT", + "Brasil (2013)" = "SiBCS13.TT", "USDA 1911 (US)" = "USDA1911" ) From noreply at r-forge.r-project.org Tue Apr 14 18:18:21 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 18:18:21 +0200 (CEST) Subject: [Soiltexture-commits] r134 - www Message-ID: <20150414161821.D47D5187673@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 18:18:21 +0200 (Tue, 14 Apr 2015) New Revision: 134 Modified: www/index.html www/index.md Log: Added list of classif system and contributors Modified: www/index.html =================================================================== --- www/index.html 2015-04-14 16:17:51 UTC (rev 133) +++ www/index.html 2015-04-14 16:18:21 UTC (rev 134) @@ -168,12 +168,14 @@ [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/soiltexture -r 134 From noreply at r-forge.r-project.org Tue Apr 14 18:19:08 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 14 Apr 2015 18:19:08 +0200 (CEST) Subject: [Soiltexture-commits] r135 - pkg/soiltexture/inst Message-ID: <20150414161908.E03831872C5@r-forge.r-project.org> Author: jmoeys Date: 2015-04-14 18:19:08 +0200 (Tue, 14 Apr 2015) New Revision: 135 Modified: pkg/soiltexture/inst/SVN_VERSION Log: version Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-14 16:18:21 UTC (rev 134) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-14 16:19:08 UTC (rev 135) @@ -1 +1 @@ -122:130M +122:133M From noreply at r-forge.r-project.org Fri Apr 17 13:44:10 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 17 Apr 2015 13:44:10 +0200 (CEST) Subject: [Soiltexture-commits] r136 - pkg/soiltexture/man Message-ID: <20150417114410.7929018103A@r-forge.r-project.org> Author: jmoeys Date: 2015-04-17 13:44:10 +0200 (Fri, 17 Apr 2015) New Revision: 136 Modified: pkg/soiltexture/man/soiltexture-package.Rd Log: Updated documentation (still R 3.1.1, inlinedocs 2013.9.3) Modified: pkg/soiltexture/man/soiltexture-package.Rd =================================================================== --- pkg/soiltexture/man/soiltexture-package.Rd 2015-04-14 16:19:08 UTC (rev 135) +++ pkg/soiltexture/man/soiltexture-package.Rd 2015-04-17 11:44:10 UTC (rev 136) @@ -14,9 +14,9 @@ \tabular{ll}{Package: \tab soiltexture\cr -Version: \tab 1.3.0\cr +Version: \tab 1.3.1\cr -Date: \tab 2015-04-14\cr +Date: \tab 2015-04-17\cr Title: \tab Functions for soil texture plot, classification and transformation\cr @@ -26,7 +26,7 @@ Maintainer: \tab Julien Moeys \cr -Depends: \tab R (>= 3.1.1), utils\cr +Depends: \tab R (>= 3.2.0), utils\cr Suggests: \tab xtable\cr From noreply at r-forge.r-project.org Fri Apr 17 13:44:41 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 17 Apr 2015 13:44:41 +0200 (CEST) Subject: [Soiltexture-commits] r137 - www Message-ID: <20150417114441.8BC9918103A@r-forge.r-project.org> Author: jmoeys Date: 2015-04-17 13:44:41 +0200 (Fri, 17 Apr 2015) New Revision: 137 Modified: www/index.html www/index.md Log: Updated homepage (form) Modified: www/index.html =================================================================== --- www/index.html 2015-04-17 11:44:10 UTC (rev 136) +++ www/index.html 2015-04-17 11:44:41 UTC (rev 137) @@ -163,10 +163,12 @@ -

    soiltexture: The Soil Texture Wizard

    +

    soiltexture: Functions for Soil Texture Plot, Classification and Transformation

    [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/soiltexture -r 137 From noreply at r-forge.r-project.org Fri Apr 17 13:45:32 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 17 Apr 2015 13:45:32 +0200 (CEST) Subject: [Soiltexture-commits] r138 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst Message-ID: <20150417114532.538B118681A@r-forge.r-project.org> Author: jmoeys Date: 2015-04-17 13:45:32 +0200 (Fri, 17 Apr 2015) New Revision: 138 Modified: pkg/soiltexture/DESCRIPTION pkg/soiltexture/NEWS pkg/soiltexture/R/soiltexture.R pkg/soiltexture/inst/SVN_VERSION soiltexture_2_RCMDcheck_noexamples.bat soiltexture_3_RCMDINSTALL_build.BAT soiltexture_4_RCMDRd2pdf.BAT soiltexture_compile.R Log: Now compiled for R 3.2.0 RC Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2015-04-17 11:44:41 UTC (rev 137) +++ pkg/soiltexture/DESCRIPTION 2015-04-17 11:45:32 UTC (rev 138) @@ -1,13 +1,13 @@ Package: soiltexture -Version: 1.3.0 -Date: 2015-04-14 -Title: Functions for soil texture plot, classification and transformation +Version: 1.3.1 +Date: 2015-04-17 +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 -Depends: R (>= 3.1.1), utils +Depends: R (>= 3.2.0), utils 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. +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 Modified: pkg/soiltexture/NEWS =================================================================== --- pkg/soiltexture/NEWS 2015-04-17 11:44:41 UTC (rev 137) +++ pkg/soiltexture/NEWS 2015-04-17 11:45:32 UTC (rev 138) @@ -1,6 +1,12 @@ package: 'soiltexture' +CHANGES IN VERSION 1.3.1 + + 2015/04/17 Compiled for R 3.2.0 RC (r68178). Inlinedocs + documentation still generated with R 3.1.1 + (inlinedocs 2013.9.3). + CHANGES IN VERSION 1.3.0 2015/04/11 Implements a new text-based graphical user Modified: pkg/soiltexture/R/soiltexture.R =================================================================== --- pkg/soiltexture/R/soiltexture.R 2015-04-17 11:44:41 UTC (rev 137) +++ pkg/soiltexture/R/soiltexture.R 2015-04-17 11:45:32 UTC (rev 138) @@ -1370,15 +1370,15 @@ "SiBCS13.TT" = list( # Subagrupamento Textural SiBCS 2013 parameters (Embrapa 2013) - # Embrapa. Sistema Brasileiro de Classifica??o de Solos / - # Humberto Gol?alves dos Santos ... [et al.]. 3a ed. rev. ampl. - # Bras?lia, DF: Embrapa, 2013. + # Embrapa. Sistema Brasileiro de Classificacao de Solos / + # Humberto Golcalves dos Santos ... [et al.]. 3a ed. rev. ampl. + # Brasilia, DF: Embrapa, 2013. - # Information is a courtesy of Jos? Lucas Safanelli and + # Information is a courtesy of Jose Lucas Safanelli and # Alexandre ten Caten, UFSC Curitibanos, Brasil. # main = "Subagrupamento textural SiBCS 2013 - Embrapa 2013", - main = "SiBCS 2013 (Embrapa)", # Shoter title and more international? + main = "SiBCS 2013 (Embrapa)", # Shorter title and more international? # # The list below specify the CSS coordinates of the different POINTS # that are used to draw soil texture classes. One points can be @@ -2942,7 +2942,7 @@ ) ) } # # - # Check for tlr.an: angle sum must be 180?? + # Check for tlr.an: angle sum must be 180 degrees if( sum(tlr.an) != 180 ) { # stop( paste( @@ -5729,7 +5729,7 @@ 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? + text.tol = text.tol, # useless base.css.ps.lim = base.css.ps.lim, tlr.an = tlr.an, lwd.lab = lwd.lab, @@ -6299,7 +6299,7 @@ ) ) } # # - # Check for tlr.an: angle sum must be 180?? + # Check for tlr.an: angle sum must be 180 degrees if( sum(tlr.an) != 180 ) { # stop( paste( Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-17 11:44:41 UTC (rev 137) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-17 11:45:32 UTC (rev 138) @@ -1 +1 @@ -122:133M +122:135M Modified: soiltexture_2_RCMDcheck_noexamples.bat =================================================================== --- soiltexture_2_RCMDcheck_noexamples.bat 2015-04-17 11:44:41 UTC (rev 137) +++ soiltexture_2_RCMDcheck_noexamples.bat 2015-04-17 11:45:32 UTC (rev 138) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.3.0 +set version=1.3.1 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_3_RCMDINSTALL_build.BAT =================================================================== --- soiltexture_3_RCMDINSTALL_build.BAT 2015-04-17 11:44:41 UTC (rev 137) +++ soiltexture_3_RCMDINSTALL_build.BAT 2015-04-17 11:45:32 UTC (rev 138) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.3.0 +set version=1.3.1 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_4_RCMDRd2pdf.BAT =================================================================== --- soiltexture_4_RCMDRd2pdf.BAT 2015-04-17 11:44:41 UTC (rev 137) +++ soiltexture_4_RCMDRd2pdf.BAT 2015-04-17 11:45:32 UTC (rev 138) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.3.0 +set version=1.3.1 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_compile.R =================================================================== --- soiltexture_compile.R 2015-04-17 11:44:41 UTC (rev 137) +++ soiltexture_compile.R 2015-04-17 11:45:32 UTC (rev 138) @@ -14,19 +14,19 @@ # Change the description file: -pkgDescription( +pkgDescription( # Done with R 3.2.0 RC pkgName = pkgName, pkgDir = pkgDir, - pkgVersion = "1.3.0", - pkgDepends = "utils", # In Depends because can not importFrom Windows only functions - pkgSuggests = c( "xtable" ), # c("drc","plotrix"), - pkgImports = c( "sp", "MASS", "tools", "tcltk" ), # "utils", + pkgVersion = "1.3.1", + pkgDepends = "utils", # In Depends because can not importFrom Windows only functions + pkgSuggests = c( "xtable" ), # + pkgImports = c( "sp", "MASS", "tools", "tcltk" ), RVersion = NULL ) -package.skeleton.dx( +package.skeleton.dx( # Done under R 3.1.1, with inlinedocs 2013.9.3 # Errors appear with R 3.2.0 RC pkgdir = file.path( pkgDir, pkgName ), namespace = FALSE # Must be edited manually! ) From noreply at r-forge.r-project.org Fri Apr 17 13:46:52 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 17 Apr 2015 13:46:52 +0200 (CEST) Subject: [Soiltexture-commits] r139 - pkg/soiltexture/inst Message-ID: <20150417114652.E5BFB18681A@r-forge.r-project.org> Author: jmoeys Date: 2015-04-17 13:46:52 +0200 (Fri, 17 Apr 2015) New Revision: 139 Modified: pkg/soiltexture/inst/SVN_VERSION Log: version Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-17 11:45:32 UTC (rev 138) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-17 11:46:52 UTC (rev 139) @@ -1 +1 @@ -122:135M +122:138M From noreply at r-forge.r-project.org Mon Apr 20 11:51:39 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 20 Apr 2015 11:51:39 +0200 (CEST) Subject: [Soiltexture-commits] r140 - pkg/soiltexture Message-ID: <20150420095139.4370B186E5E@r-forge.r-project.org> Author: jmoeys Date: 2015-04-20 11:51:38 +0200 (Mon, 20 Apr 2015) New Revision: 140 Modified: pkg/soiltexture/DESCRIPTION Log: decrease R version requirement Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2015-04-17 11:46:52 UTC (rev 139) +++ pkg/soiltexture/DESCRIPTION 2015-04-20 09:51:38 UTC (rev 140) @@ -5,7 +5,7 @@ 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 -Depends: R (>= 3.2.0), utils +Depends: R (>= 3.1.1), utils 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) From noreply at r-forge.r-project.org Thu Apr 23 15:26:09 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 23 Apr 2015 15:26:09 +0200 (CEST) Subject: [Soiltexture-commits] r141 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst pkg/soiltexture/man Message-ID: <20150423132609.F1F5D1878CF@r-forge.r-project.org> Author: jmoeys Date: 2015-04-23 15:26:09 +0200 (Thu, 23 Apr 2015) New Revision: 141 Modified: pkg/soiltexture/DESCRIPTION pkg/soiltexture/NEWS pkg/soiltexture/R/soiltexture_text_gui.R pkg/soiltexture/inst/SVN_VERSION pkg/soiltexture/man/soiltexture-package.Rd soiltexture_2_RCMDcheck_noexamples.bat soiltexture_3_RCMDINSTALL_build.BAT soiltexture_4_RCMDRd2pdf.BAT soiltexture_compile.R Log: Fixed a bug in soiltexture_gui() (non-Windows systems) Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2015-04-20 09:51:38 UTC (rev 140) +++ pkg/soiltexture/DESCRIPTION 2015-04-23 13:26:09 UTC (rev 141) @@ -1,6 +1,6 @@ Package: soiltexture -Version: 1.3.1 -Date: 2015-04-17 +Version: 1.3.2 +Date: 2015-04-23 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" ) ) Modified: pkg/soiltexture/NEWS =================================================================== --- pkg/soiltexture/NEWS 2015-04-20 09:51:38 UTC (rev 140) +++ pkg/soiltexture/NEWS 2015-04-23 13:26:09 UTC (rev 141) @@ -1,9 +1,15 @@ package: 'soiltexture' +CHANGES IN VERSION 1.3.2 + + 2015/04/23 Replaced shell.exec() by browserURL() + in soiltexture_gui(). shell.exec() only works + on windows. + CHANGES IN VERSION 1.3.1 - 2015/04/17 Compiled for R 3.2.0 RC (r68178). Inlinedocs + 2015/04/17 Compiled for R 3.2.0. Inlinedocs documentation still generated with R 3.1.1 (inlinedocs 2013.9.3). Modified: pkg/soiltexture/R/soiltexture_text_gui.R =================================================================== --- pkg/soiltexture/R/soiltexture_text_gui.R 2015-04-20 09:51:38 UTC (rev 140) +++ pkg/soiltexture/R/soiltexture_text_gui.R 2015-04-23 13:26:09 UTC (rev 141) @@ -675,7 +675,8 @@ if( exportFigure | classifData ){ - shell.exec( tempdir() ) + # shell.exec( tempdir() ) + browseURL( url = tempdir() ) } }else{ # Not interactive dat <- NULL Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-20 09:51:38 UTC (rev 140) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-23 13:26:09 UTC (rev 141) @@ -1 +1 @@ -122:138M +122:140M Modified: pkg/soiltexture/man/soiltexture-package.Rd =================================================================== --- pkg/soiltexture/man/soiltexture-package.Rd 2015-04-20 09:51:38 UTC (rev 140) +++ pkg/soiltexture/man/soiltexture-package.Rd 2015-04-23 13:26:09 UTC (rev 141) @@ -6,19 +6,19 @@ \docType{package} -\title{Functions for soil texture plot, classification and transformation} +\title{Functions for Soil Texture Plot, Classification and Transformation} -\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.} +\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().} \details{ \tabular{ll}{Package: \tab soiltexture\cr -Version: \tab 1.3.1\cr +Version: \tab 1.3.2\cr -Date: \tab 2015-04-17\cr +Date: \tab 2015-04-23\cr -Title: \tab Functions for soil texture plot, classification and transformation\cr +Title: \tab Functions for Soil Texture Plot, Classification and Transformation\cr Author: \tab 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]\cr @@ -26,7 +26,7 @@ Maintainer: \tab Julien Moeys \cr -Depends: \tab R (>= 3.2.0), utils\cr +Depends: \tab R (>= 3.1.1), utils\cr Suggests: \tab xtable\cr Modified: soiltexture_2_RCMDcheck_noexamples.bat =================================================================== --- soiltexture_2_RCMDcheck_noexamples.bat 2015-04-20 09:51:38 UTC (rev 140) +++ soiltexture_2_RCMDcheck_noexamples.bat 2015-04-23 13:26:09 UTC (rev 141) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.3.1 +set version=1.3.2 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_3_RCMDINSTALL_build.BAT =================================================================== --- soiltexture_3_RCMDINSTALL_build.BAT 2015-04-20 09:51:38 UTC (rev 140) +++ soiltexture_3_RCMDINSTALL_build.BAT 2015-04-23 13:26:09 UTC (rev 141) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.3.1 +set version=1.3.2 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_4_RCMDRd2pdf.BAT =================================================================== --- soiltexture_4_RCMDRd2pdf.BAT 2015-04-20 09:51:38 UTC (rev 140) +++ soiltexture_4_RCMDRd2pdf.BAT 2015-04-23 13:26:09 UTC (rev 141) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.3.1 +set version=1.3.2 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_compile.R =================================================================== --- soiltexture_compile.R 2015-04-20 09:51:38 UTC (rev 140) +++ soiltexture_compile.R 2015-04-23 13:26:09 UTC (rev 141) @@ -17,7 +17,7 @@ pkgDescription( # Done with R 3.2.0 RC pkgName = pkgName, pkgDir = pkgDir, - pkgVersion = "1.3.1", + pkgVersion = "1.3.2", pkgDepends = "utils", # In Depends because can not importFrom Windows only functions pkgSuggests = c( "xtable" ), # pkgImports = c( "sp", "MASS", "tools", "tcltk" ), From noreply at r-forge.r-project.org Thu Apr 23 15:27:20 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 23 Apr 2015 15:27:20 +0200 (CEST) Subject: [Soiltexture-commits] r142 - pkg/soiltexture/inst Message-ID: <20150423132720.626121878CF@r-forge.r-project.org> Author: jmoeys Date: 2015-04-23 15:27:20 +0200 (Thu, 23 Apr 2015) New Revision: 142 Modified: pkg/soiltexture/inst/SVN_VERSION Log: version Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-04-23 13:26:09 UTC (rev 141) +++ pkg/soiltexture/inst/SVN_VERSION 2015-04-23 13:27:20 UTC (rev 142) @@ -1 +1 @@ -122:140M +122:141M From noreply at r-forge.r-project.org Thu Apr 23 16:03:07 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 23 Apr 2015 16:03:07 +0200 (CEST) Subject: [Soiltexture-commits] r143 - www Message-ID: <20150423140307.BBB4D1879DC@r-forge.r-project.org> Author: jmoeys Date: 2015-04-23 16:03:07 +0200 (Thu, 23 Apr 2015) New Revision: 143 Modified: www/index.md Log: Added instructions to install the package from GitHub Modified: www/index.md =================================================================== --- www/index.md 2015-04-23 13:27:20 UTC (rev 142) +++ www/index.md 2015-04-23 14:03:07 UTC (rev 143) @@ -28,6 +28,9 @@ * Comprehensive tutorial (_package vignette_): http://cran.r-project.org/web/packages/soiltexture/vignettes/soiltexture_vignette.pdf * Frequently Asked Questions: [FAQ](FAQ.html) (_under construction_) * On-line documentation: http://docs.julienmoeys.info/soiltexture/ +* Github mirror of the code repository: https://github.com/rforge/soiltexture + Notice that I am not the maintainer of this (r-forge) + mirror. @@ -95,21 +98,63 @@ -Install soiltexture (development version) ------------------------------------------ +Install soiltexture (development version, from r-forge) +------------------------------------------------------- Note: This will only work with the latest (stable) version -of R. You should also check on the package R-forge page -(here: http://r-forge.r-project.org/R/?group_id=740) that -the "Build status" of `soiltexture` is "Current" (and not +of R. You should also check on the [package R-forge page][soiltexture_rf] +that the "Build status" of `soiltexture` is "Current" (and not "Failed to build"). Open R, and type the command: install.packages("soiltexture", repos="http://R-Forge.R-project.org") +Note: It can take some days before `r-forge` updates its +system to the latest R stable version (after a new stable +release). You can check what version of R is used by clicking +on "Show/Hide extra info" on the [package R-forge page][soiltexture_rf], +and then checking "Windows binary" or "Source package". The +R version currently used on `r-forge` should appear there. + +Install soiltexture (development version, from GitHub) +------------------------------------------------------ + +The [GitHub mirror of soiltexture][soiltexture_gh] (_Notice +that I am not the maintainer of this page_) makes it possible +to use `devtools` package installation method to install the +development version of the package `soiltexture`. It can be +an interesting solution when using a version of R that is +different from the one installed on `r-forge` (newer or older). + + + +### Install devtools (and maybe RTools) + +Follow the instructions given on [devtools GitHub page][devtools_gh]. +See in particular "Updating to the latest version of devtools". + + + +### Install soiltexture using devtools + +Open R and type: + + devtools::install_github("rforge/soiltexture/pkg/soiltexture") + +Notice that you can install in the same way the package +`soiltexturetransformation` by Wei Shangguan: + + devtools::install_github("rforge/soiltexture/pkg/soiltexturetransformation") + +For technical reason this package does not compile on `r-forge` +(because of a dependency on `drc` that used to be on `r-forge` +but is now developed outside of `r-forge`). + + + Text based graphical user interface =================================== @@ -359,6 +404,8 @@ [plotrix]: http://cran.r-project.org/web/packages/plotrix/index.html "plotrix R package" [ggplot2]: http://ggplot2.org/ "ggplot2 R package" [ggtern]: http://www.ggtern.com/ "ggtern R package" +[devtools_gh]: https://github.com/hadley/devtools "devtools R package on GitHub" +[soiltexture_rf]: http://r-forge.r-project.org/R/?group_id=740 "soiltexture on r-forge (installation page)" [R]: http://www.r-project.org/ "R software homepage" @@ -368,5 +415,5 @@ [ternaryplot]: http://rgm3.lab.nig.ac.jp/RGM/R_rdfile?f=VCD/man/ternaryplot.Rd&d=R_CC "ternaryplot examples (R Graphical Manual)" [soil.texture]: http://rgm3.lab.nig.ac.jp/RGM/R_rdfile?f=plotrix/man/soil.texture.Rd&d=R_CC "soi.texture examples (R Graphical Manual)" [soil.texture.uk]: http://rgm3.lab.nig.ac.jp/RGM/R_rdfile?f=plotrix/man/soil.texture.uk.Rd&d=R_CC "soi.texture.uk examples (R Graphical Manual)" +[soiltexture_gh]: https://github.com/rforge/soiltexture "GitHub mirror of 'soiltexture' from r-forge SVN" - From noreply at r-forge.r-project.org Thu Apr 23 16:19:03 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 23 Apr 2015 16:19:03 +0200 (CEST) Subject: [Soiltexture-commits] r144 - www Message-ID: <20150423141903.53D9C185242@r-forge.r-project.org> Author: jmoeys Date: 2015-04-23 16:19:03 +0200 (Thu, 23 Apr 2015) New Revision: 144 Modified: www/index.html Log: Added instructions for GitHub installation Modified: www/index.html =================================================================== --- www/index.html 2015-04-23 14:03:07 UTC (rev 143) +++ www/index.html 2015-04-23 14:19:03 UTC (rev 144) @@ -192,6 +192,9 @@
  • Comprehensive tutorial (package vignette): http://cran.r-project.org/web/packages/soiltexture/vignettes/soiltexture_vignette.pdf
  • Frequently Asked Questions: FAQ (under construction)
  • On-line documentation: http://docs.julienmoeys.info/soiltexture/
  • +
  • Github mirror of the code repository: https://github.com/rforge/soiltexture +Notice that I am not the maintainer of this (r-forge) +mirror.
  • Introduction

    @@ -250,12 +253,11 @@
    install.packages( "soiltexture" ) 
     
    -

    Install soiltexture (development version)

    +

    Install soiltexture (development version, from r-forge)

    Note: This will only work with the latest (stable) version -of R. You should also check on the package R-forge page -(here: http://r-forge.r-project.org/R/?group_id=740) that -the “Build status” of soiltexture is “Current” (and not +of R. You should also check on the package R-forge page +that the “Build status” of soiltexture is “Current” (and not “Failed to build”).

    Open R, and type the command:

    @@ -263,6 +265,44 @@
     install.packages("soiltexture", repos="http://R-Forge.R-project.org") 
     
    +

    Note: It can take some days before r-forge updates its +system to the latest R stable version (after a new stable +release). You can check what version of R is used by clicking +on “Show/Hide extra info” on the package R-forge page, +and then checking “Windows binary” or “Source package”. The +R version currently used on r-forge should appear there.

    + +

    Install soiltexture (development version, from GitHub)

    + +

    The GitHub mirror of soiltexture (Notice +that I am not the maintainer of this page) makes it possible +to use devtools package installation method to install the +development version of the package soiltexture. It can be +an interesting solution when using a version of R that is +different from the one installed on r-forge (newer or older).

    + +

    Install devtools (and maybe RTools)

    + +

    Follow the instructions given on devtools GitHub page. +See in particular “Updating to the latest version of devtools”.

    + +

    Install soiltexture using devtools

    + +

    Open R and type:

    + +
    devtools::install_github("rforge/soiltexture/pkg/soiltexture")
    +
    + +

    Notice that you can install in the same way the package +soiltexturetransformation by Wei Shangguan:

    + +
    devtools::install_github("rforge/soiltexture/pkg/soiltexturetransformation")
    +
    + +

    For technical reason this package does not compile on r-forge +(because of a dependency on drc that used to be on r-forge +but is now developed outside of r-forge).

    +

    Text based graphical user interface

    From version 1.3.0 the package soil texture comes along