[Stacomir-commits] r360 - in pkg/stacomir: . man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon May 15 16:16:52 CEST 2017
Author: briand
Date: 2017-05-15 16:16:50 +0200 (Mon, 15 May 2017)
New Revision: 360
Added:
pkg/stacomir/man/choicemult-RefChoix-method.Rd
pkg/stacomir/man/choicemult-RefHorodate-method.Rd
pkg/stacomir/man/hbmCplotcrossed.Rd
pkg/stacomir/man/hbmCplotqual.Rd
pkg/stacomir/man/hbmCplotquan.Rd
Removed:
pkg/stacomir/man/hbmCgraph.Rd
pkg/stacomir/man/hbmCgraph2.Rd
Modified:
pkg/stacomir/DESCRIPTION
pkg/stacomir/NAMESPACE
pkg/stacomir/man/BilanMigrationMult-class.Rd
pkg/stacomir/man/choice_c-RefChoix-method.Rd
pkg/stacomir/man/xtable-BilanMigrationCar-method.Rd
Log:
Modified: pkg/stacomir/DESCRIPTION
===================================================================
--- pkg/stacomir/DESCRIPTION 2017-05-08 20:07:03 UTC (rev 359)
+++ pkg/stacomir/DESCRIPTION 2017-05-15 14:16:50 UTC (rev 360)
@@ -68,7 +68,6 @@
'interface_BilanMigrationMult.r'
'interface_BilanMigrationMultConditionEnv.r'
'interface_Bilan_carlot.r'
- 'interface_Bilan_taille.r'
'interface_bilan_poids_moyen.r'
'setAs.r'
'stacomi.r'
@@ -99,7 +98,8 @@
lubridate,
dplyr,
xtable,
- mgcv
+ mgcv,
+ MIfuns
Suggests:
testthat,
viridis
Modified: pkg/stacomir/NAMESPACE
===================================================================
--- pkg/stacomir/NAMESPACE 2017-05-08 20:07:03 UTC (rev 359)
+++ pkg/stacomir/NAMESPACE 2017-05-15 14:16:50 UTC (rev 360)
@@ -74,6 +74,7 @@
import(xtable)
importFrom(Hmisc,capitalize)
importFrom(Hmisc,wtd.quantile)
+importFrom(MIfuns,ftable2data.frame)
importFrom(grDevices,adjustcolor)
importFrom(grDevices,dev.new)
importFrom(grDevices,gray)
Modified: pkg/stacomir/man/BilanMigrationMult-class.Rd
===================================================================
--- pkg/stacomir/man/BilanMigrationMult-class.Rd 2017-05-08 20:07:03 UTC (rev 359)
+++ pkg/stacomir/man/BilanMigrationMult-class.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -106,7 +106,7 @@
#changing the reference table names to english should shift all to english.
#same for spanish.
# combined plot for ggplot2
-plot(bMM_Arzal,plot.type="multiple"=silent=TRUE)
+plot(bMM_Arzal,plot.type="multiple",silent=TRUE)
# data will be written in the data directory specified in
# the stacomi/calcmig.csv file
\dontrun{
Modified: pkg/stacomir/man/choice_c-RefChoix-method.Rd
===================================================================
--- pkg/stacomir/man/choice_c-RefChoix-method.Rd 2017-05-08 20:07:03 UTC (rev 359)
+++ pkg/stacomir/man/choice_c-RefChoix-method.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -13,9 +13,6 @@
\description{
Choice_c method for Refchoix referential objects
}
-\note{
-the choice method assigns an object of class refList named refListe in the environment envir_stacomi
-}
\examples{
\dontrun{
Added: pkg/stacomir/man/choicemult-RefChoix-method.Rd
===================================================================
--- pkg/stacomir/man/choicemult-RefChoix-method.Rd (rev 0)
+++ pkg/stacomir/man/choicemult-RefChoix-method.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -0,0 +1,19 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/RefChoix.r
+\docType{methods}
+\name{choicemult,RefChoix-method}
+\alias{choicemult,RefChoix-method}
+\title{Multiple Choice method for RefChoix referential objects, to put together with notebook widgets}
+\usage{
+\S4method{choicemult}{RefChoix}(object, selected_value)
+}
+\arguments{
+\item{object}{An object of class \link{RefChoix-class}}
+}
+\description{
+Multiple Choice method for RefChoix referential objects, to put together with notebook widgets
+}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
+
Added: pkg/stacomir/man/choicemult-RefHorodate-method.Rd
===================================================================
--- pkg/stacomir/man/choicemult-RefHorodate-method.Rd (rev 0)
+++ pkg/stacomir/man/choicemult-RefHorodate-method.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -0,0 +1,27 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/RefHorodate.r
+\docType{methods}
+\name{choicemult,RefHorodate-method}
+\alias{choicemult,RefHorodate-method}
+\title{Multiple Choice method for RefHorodate referential objects, to put together with notebook widgets}
+\usage{
+\S4method{choicemult}{RefHorodate}(object, label = "date",
+ nomassign = "horodate",
+ funoutlabel = "nous avons le choix dans la date\\n")
+}
+\arguments{
+\item{object}{An object of class \link{RefHorodate-class}}
+
+\item{label}{the name to write in the frame}
+
+\item{nomassign}{the name with which the frame will be assigned to envir_stacomi}
+
+\item{funoutlabel}{the sentence to write when the choice has been made}
+}
+\description{
+Multiple Choice method for RefHorodate referential objects, to put together with notebook widgets
+}
+\author{
+Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
+}
+
Deleted: pkg/stacomir/man/hbmCgraph.Rd
===================================================================
--- pkg/stacomir/man/hbmCgraph.Rd 2017-05-08 20:07:03 UTC (rev 359)
+++ pkg/stacomir/man/hbmCgraph.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -1,17 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/BilanMigrationCar.r
-\name{hbmCgraph}
-\alias{hbmCgraph}
-\title{le handler appelle la methode generique graphe sur l'object plot.type=1}
-\usage{
-hbmCgraph(h, ...)
-}
-\arguments{
-\item{h}{handler}
-
-\item{...}{Additional parameters}
-}
-\description{
-le handler appelle la methode generique graphe sur l'object plot.type=1
-}
-
Deleted: pkg/stacomir/man/hbmCgraph2.Rd
===================================================================
--- pkg/stacomir/man/hbmCgraph2.Rd 2017-05-08 20:07:03 UTC (rev 359)
+++ pkg/stacomir/man/hbmCgraph2.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -1,17 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/BilanMigrationCar.r
-\name{hbmCgraph2}
-\alias{hbmCgraph2}
-\title{le handler appelle la methode generique graphe sur l'object plot.type=2}
-\usage{
-hbmCgraph2(h, ...)
-}
-\arguments{
-\item{h}{handler}
-
-\item{...}{Additional parameters}
-}
-\description{
-le handler appelle la methode generique graphe sur l'object plot.type=2
-}
-
Added: pkg/stacomir/man/hbmCplotcrossed.Rd
===================================================================
--- pkg/stacomir/man/hbmCplotcrossed.Rd (rev 0)
+++ pkg/stacomir/man/hbmCplotcrossed.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/BilanMigrationCar.r
+\name{hbmCplotcrossed}
+\alias{hbmCplotcrossed}
+\title{handler for plot}
+\usage{
+hbmCplotcrossed(h, ...)
+}
+\arguments{
+\item{h}{handler}
+
+\item{...}{Additional parameters}
+}
+\description{
+handler for plot
+}
+
Added: pkg/stacomir/man/hbmCplotqual.Rd
===================================================================
--- pkg/stacomir/man/hbmCplotqual.Rd (rev 0)
+++ pkg/stacomir/man/hbmCplotqual.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/BilanMigrationCar.r
+\name{hbmCplotqual}
+\alias{hbmCplotqual}
+\title{handler for plot}
+\usage{
+hbmCplotqual(h, ...)
+}
+\arguments{
+\item{h}{handler}
+
+\item{...}{Additional parameters}
+}
+\description{
+handler for plot
+}
+
Added: pkg/stacomir/man/hbmCplotquan.Rd
===================================================================
--- pkg/stacomir/man/hbmCplotquan.Rd (rev 0)
+++ pkg/stacomir/man/hbmCplotquan.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/BilanMigrationCar.r
+\name{hbmCplotquan}
+\alias{hbmCplotquan}
+\title{handler for plot}
+\usage{
+hbmCplotquan(h, ...)
+}
+\arguments{
+\item{h}{handler}
+
+\item{...}{Additional parameters}
+}
+\description{
+handler for plot
+}
+
Modified: pkg/stacomir/man/xtable-BilanMigrationCar-method.Rd
===================================================================
--- pkg/stacomir/man/xtable-BilanMigrationCar-method.Rd 2017-05-08 20:07:03 UTC (rev 359)
+++ pkg/stacomir/man/xtable-BilanMigrationCar-method.Rd 2017-05-15 14:16:50 UTC (rev 360)
@@ -4,14 +4,13 @@
\name{xtable,BilanMigrationCar-method}
\alias{xtable,BilanMigrationCar-method}
\title{xtable funciton for \link{BilanMigrationCar-class}
-create an xtable objet but also assigns an add.to.column argument in envir_stacomi,
-for later use by the print.xtable method.}
+create an xtable objet to be later used by the print.xtable method.}
\usage{
\S4method{xtable}{BilanMigrationCar}(x, caption = NULL, label = NULL,
align = NULL, digits = NULL, display = NULL, auto = FALSE, ...)
}
\arguments{
-\item{x, }{an object of class "BilanAnnuels"}
+\item{x, }{an object of class "BilanMigrationCar"}
\item{caption, }{see xtable}
@@ -22,19 +21,9 @@
\item{digits}{default 0}
\item{display}{see xtable}
-
-\item{auto}{see xtable}
-
-\item{dc_name}{A string indicating the names of the DC, in the order of x at dc@dc_selectionne
-if not provided DC codes are used.}
-
-\item{tax_name}{A string indicating the names of the taxa, if not provided latin names are used}
-
-\item{std_name}{A string indicating the stages names, if not provided then std_libelle are used}
}
\description{
xtable funciton for \link{BilanMigrationCar-class}
-create an xtable objet but also assigns an add.to.column argument in envir_stacomi,
-for later use by the print.xtable method.
+create an xtable objet to be later used by the print.xtable method.
}
More information about the Stacomir-commits
mailing list