[Stacomir-commits] r370 - pkg/stacomir/R

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

Author: briand
Date: 2017-05-27 22:35:40 +0200 (Sat, 27 May 2017)
New Revision: 370

Modified:
   pkg/stacomir/R/stacomi.r
   pkg/stacomir/R/utilitaires.r
Log:


Modified: pkg/stacomir/R/stacomi.r
===================================================================
--- pkg/stacomir/R/stacomi.r	2017-05-17 15:03:26 UTC (rev 369)
+++ pkg/stacomir/R/stacomi.r	2017-05-27 20:35:40 UTC (rev 370)
@@ -484,7 +484,7 @@
 				"per_etat_fonctionnement","std_libelle","sumduree","dc","stade","taxon","stage","ouv",
 				"Q0","Q100","Q5","Q50","Q95","age","bjo_annee","bjo_labelquantite","bjo_valeur","doy",
 				"pred_weight","pred_weight_lwr","pred_weight_upr","total","w","year","sta","tableauCEst","stm_libelle",
-				"env_valeur_quantitatif","env_val_identifiant","DC"))
+				"env_valeur_quantitatif","env_val_identifiant","DC","color"))
 
 # variable used by dplyr
 utils::globalVariables(c("n0","newid","xmin","xmax"))

Modified: pkg/stacomir/R/utilitaires.r
===================================================================
--- pkg/stacomir/R/utilitaires.r	2017-05-17 15:03:26 UTC (rev 369)
+++ pkg/stacomir/R/utilitaires.r	2017-05-27 20:35:40 UTC (rev 370)
@@ -366,7 +366,7 @@
 #' @param color_function, the name of the function used to brew the colors, one for 
 #' "brewer.pal", "gray.colors", default to "brewer.pal, this argument is ignored if a
 #' named vector of color is passed.
-#' @return A dataframe with two columns, the vector and the color as a reordered factor
+#' @return A dataframe with two columns, the vector (name) and the color (color) as a reordered factor
 #' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
 #' @export
 colortable<-function(color=NULL,vec,palette="Set2",color_function="brewer.pal"){