[Stacomir-commits] r201 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Sep 8 21:45:25 CEST 2016
Author: briand
Date: 2016-09-08 21:45:25 +0200 (Thu, 08 Sep 2016)
New Revision: 201
Modified:
pkg/stacomir/R/BilanMigration.r
pkg/stacomir/R/BilanMigrationPar.r
pkg/stacomir/R/RefStades.r
pkg/stacomir/R/RefTaxon.r
pkg/stacomir/R/stacomi.r
Log:
Modified: pkg/stacomir/R/BilanMigration.r
===================================================================
--- pkg/stacomir/R/BilanMigration.r 2016-09-08 19:44:32 UTC (rev 200)
+++ pkg/stacomir/R/BilanMigration.r 2016-09-08 19:45:25 UTC (rev 201)
@@ -83,7 +83,7 @@
#' @param object An object of class \link{BilanMigration-class}
#' @return BilanMigration with slot @data filled from the database
#' @export
-setMethod("connect",signature=signature("BilanMigration"),definition=function(object,...){
+setMethod("connect",signature=signature("BilanMigration"),definition=function(object){
bilanMigration<-object
bilanMigrationMult<-as(bilanMigration,"BilanMigrationMult")
bilanMigrationMult<-connect(bilanMigrationMult)
Modified: pkg/stacomir/R/BilanMigrationPar.r
===================================================================
--- pkg/stacomir/R/BilanMigrationPar.r 2016-09-08 19:44:32 UTC (rev 200)
+++ pkg/stacomir/R/BilanMigrationPar.r 2016-09-08 19:45:25 UTC (rev 201)
@@ -70,6 +70,8 @@
} )
#' handler for bilanmigrationpar
+#' @param h handler
+#' @param ... additional parameters
hbilanMigrationParcalc=function(h,...){
calcule(h$action)
}
@@ -158,7 +160,8 @@
})
#' le handler appelle la methode generique graphe sur l'object plot.type=1
#'
-#' @param h, passed by the handler
+#' @param h handler
+#' @param ... additional parameters
hbilanMigrationPargraph = function(h,...) {
if (exists("bilanMigrationPar",envir_stacomi)) {
bilanMigrationPar<-get("bilanMigrationPar",envir_stacomi)
@@ -169,7 +172,8 @@
}
#' le handler appelle la methode generique graphe sur l'object plot.type=2
#'
-#' @param h, passed by the handler
+#' @param h handler
+#' @param ... additional parameters
hbilanMigrationPargraph2=function(h,...){
if (exists("bilanMigrationPar",envir_stacomi)) {
bilanMigrationPar<-get("bilanMigrationPar",envir_stacomi)
@@ -181,7 +185,8 @@
#' This handler calls the generic method graphe on object plot.type 3
#'
#'
-#' @param h, passed by
+#' @param h handler
+#' @param ... additional parameters
hbilanMigrationParstat=function(h,...){
if (exists("bilanMigrationPar",envir_stacomi)) {
bilanMigrationPar<-get("bilanMigrationPar",envir_stacomi)
Modified: pkg/stacomir/R/RefStades.r
===================================================================
--- pkg/stacomir/R/RefStades.r 2016-09-08 19:44:32 UTC (rev 200)
+++ pkg/stacomir/R/RefStades.r 2016-09-08 19:45:25 UTC (rev 201)
@@ -4,7 +4,6 @@
#'
#' Representation of a fish phase
#'
-#'
#' @section Objects from the Class: Objects can be created by calls of the form
#' \code{new("RefStades", data="data.frame")}. \describe{
#' \item{list("data")}{Object of class \code{"data.frame"} ~ The phases
@@ -24,6 +23,7 @@
setClass(Class="RefStades",representation=representation(data="data.frame") )
#' Loading method for RefStades referential objects
+#' @param object An object of class \link{RefStades-class}
#' @return An S4 object of class RefStades
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @examples
@@ -40,7 +40,11 @@
return(object)
})
#' Loading method for RefStades referential objects searching only those stages existing for a DC and a Taxon
-#' @return An S4 object of class RefStades
+#' @param object An object of class \link{RefStades-class}
+#' @param dc_selectionne The selected counting device
+#' @param taxon_selectionne The selected species
+
+#' @return An S4 object of class \link{RefStades-class}
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @examples
#' \dontrun{
@@ -67,6 +71,9 @@
return(object)
})
#' Choice method for RefStades referential objects
+#' @param object An object of class \link{RefStades-class}
+#' @param objectBilan An object Bilan which includes the \link{RefStades-class}, default NULL
+#' @param is.enabled Sets if the frame is enabled at launch, defaut TRUE
#' @note the method tests if the load is called from within a "bilan" object, and loads par, parqual, or parquan objects accordingly
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @examples
@@ -129,6 +136,11 @@
})
#' Multiple Choice method for RefStades referential objects
+#'
+#' @param object An object of class \link{RefStades-class}
+#' @param objectBilan An object Bilan which includes the \link{RefStades-class}, default NULL
+#' @param is.enabled Sets if the frame is enabled at launch, defaut TRUE
+
#' @note the method tests if the load is called from within a "bilan" object, and loads par, parqual, or parquan objects accordingly
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @examples
@@ -258,6 +270,7 @@
#' the choice_c method is intented to have the same behaviour as choice (which creates a
#' widget in the graphical interface) but from the command line. The values passed to the choice_c method
#' for stades is the code. Any numeric value will be discarded
+#' @param object An object of class \link{RefStades-class}
#' @param stades the vector of stages chosen
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @examples
Modified: pkg/stacomir/R/RefTaxon.r
===================================================================
--- pkg/stacomir/R/RefTaxon.r 2016-09-08 19:44:32 UTC (rev 200)
+++ pkg/stacomir/R/RefTaxon.r 2016-09-08 19:45:25 UTC (rev 201)
@@ -101,6 +101,9 @@
#' Multiple Choice method for Reftaxon referential objects, the graphical interface is built to allow
#' for multiple choices. See load for method in the command line.
+#' @param object An object of class \link{RefTaxon-class}
+#' @param objectBilan An object Bilan which includes the \link{RefTaxon-class}, default NULL
+#' @param is.enabled Sets if the frame is enabled at launch, defaut TRUE
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @examples
#' \dontrun{
Modified: pkg/stacomir/R/stacomi.r
===================================================================
--- pkg/stacomir/R/stacomi.r 2016-09-08 19:44:32 UTC (rev 200)
+++ pkg/stacomir/R/stacomi.r 2016-09-08 19:45:25 UTC (rev 201)
@@ -3,82 +3,110 @@
#'
#' @param h A handler
#' @param ... Other parameters
-#' @aliases hDC,hOPE,hDFDC,hBilanMigration,hBilanMigrationInterannuelle,hBilanMigrationConditionEnv, hBilanMigrationPar, hBilanConditionEnv, hBilanLots, hTail, hpds, hSt, htodo, hhelp, h0, hX11
-#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
hDF=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.1,wash=TRUE)
eval(interface_BilanFonctionnementDF(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hDC=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.2,wash=TRUE)
eval(interface_BilanFonctionnementDC(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hOPE=function(h,...){
# TODO a developper
funout(text=get("msg",envir_stacomi)$interface_graphique.3,wash=TRUE)
}
-#' handler function used by the main interface
+#' handler function used by the main interface#'
+#' @param h handler
+#' @param ... additional parameters
hDFDC=function(h,...){
# TODO developper cette fonction
funout(get("msg",envir_stacomi)$interface_graphique.4,wash=TRUE)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hBilanMigration=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.5,wash=TRUE)
eval(interface_BilanMigration(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hBilanMigrationMult=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.14,wash=TRUE)
eval(interface_BilanMigrationMult(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hBilanMigrationInterAnnuelle=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.6,wash=TRUE)
eval(interface_BilanMigrationInterAnnuelle(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hBilanMigrationConditionEnv=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.7,wash=TRUE)
eval(interface_BilanMigrationConditionEnv(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hBilanMigrationPar=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.8,wash=TRUE)
eval(interface_BilanMigrationPar(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hBilanConditionEnv=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.9,wash=TRUE)
eval(interface_ConditionEnv(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hBilan_carlot=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.10,wash=TRUE)
eval(interface_Bilan_carlot(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hTail=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.11,wash=TRUE)
eval(interface_BilanTaille(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hpds=function(h,...){
eval(interface_BilanPoidsMoyen(),envir = .GlobalEnv)
funout(get("msg",envir_stacomi)$interface_graphique.12,wash=TRUE)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hSt=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.13,wash=TRUE)
eval(interface_Bilan_stades_pigm(),envir = .GlobalEnv)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
htodo=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.17,wash=TRUE)
}
#' handler function used by the main interface
+#' @param h handler
+#' @param ... additional parameters
hBilanEspeces=function(h,...){
funout(get("msg",envir_stacomi)$interface_graphique.19,wash=TRUE)
eval(interface_BilanEspeces(),envir = .GlobalEnv)
More information about the Stacomir-commits
mailing list