[Stacomir-commits] r263 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jan 31 17:27:45 CET 2017
Author: briand
Date: 2017-01-31 17:27:44 +0100 (Tue, 31 Jan 2017)
New Revision: 263
Modified:
pkg/stacomir/R/BilanAgedemer.r
pkg/stacomir/R/BilanAnnuels.r
pkg/stacomir/R/BilanArgentee.r
pkg/stacomir/R/BilanConditionEnv.r
pkg/stacomir/R/BilanEspeces.r
pkg/stacomir/R/BilanFonctionnementDC.r
pkg/stacomir/R/BilanFonctionnementDF.r
pkg/stacomir/R/BilanMigration.r
pkg/stacomir/R/BilanMigrationConditionEnv.r
pkg/stacomir/R/BilanMigrationInterAnnuelle.r
pkg/stacomir/R/BilanMigrationMult.r
pkg/stacomir/R/BilanMigrationPar.r
pkg/stacomir/R/BilanOperation.r
pkg/stacomir/R/Bilan_carlot.r
pkg/stacomir/R/Bilan_poids_moyen.r
pkg/stacomir/R/Bilan_stades_pigm.r
pkg/stacomir/R/Bilan_taille.r
pkg/stacomir/R/PasDeTempsJournalier.r
pkg/stacomir/R/PasdeTemps.r
pkg/stacomir/R/RefAnnee.r
pkg/stacomir/R/RefDC.r
pkg/stacomir/R/RefDF.r
pkg/stacomir/R/RefStades.r
pkg/stacomir/R/RefStationMesure.r
pkg/stacomir/R/RefTaxon.r
pkg/stacomir/R/Refpar.r
pkg/stacomir/R/Refparqual.r
pkg/stacomir/R/Refparquan.r
pkg/stacomir/R/fn_EcritBilanMensuel.r
pkg/stacomir/R/funSousListeBilanMigrationPar.r
pkg/stacomir/R/fungraph.r
pkg/stacomir/R/fungraph_civelle.r
pkg/stacomir/R/fungraph_env.r
pkg/stacomir/R/funstat.r
pkg/stacomir/R/funtraitement_poids.r
pkg/stacomir/R/interface_BilanAgedemer.r
pkg/stacomir/R/interface_BilanAnnuels.r
pkg/stacomir/R/interface_BilanArgentee.r
pkg/stacomir/R/interface_BilanConditionEnv.r
pkg/stacomir/R/interface_BilanFonctionnementDC.r
pkg/stacomir/R/interface_BilanFonctionnementDF.r
pkg/stacomir/R/interface_BilanMigration.r
pkg/stacomir/R/interface_BilanMigrationConditionEnv.r
pkg/stacomir/R/interface_BilanMigrationInterannuelle.r
pkg/stacomir/R/interface_BilanMigrationMult.r
pkg/stacomir/R/interface_BilanMigrationPar.r
pkg/stacomir/R/interface_Bilan_carlot.r
pkg/stacomir/R/interface_Bilan_taille.r
pkg/stacomir/R/interface_bilan_poids_moyen.r
pkg/stacomir/R/stacomi.r
Log:
Modified: pkg/stacomir/R/BilanAgedemer.r
===================================================================
--- pkg/stacomir/R/BilanAgedemer.r 2017-01-31 10:34:35 UTC (rev 262)
+++ pkg/stacomir/R/BilanAgedemer.r 2017-01-31 16:27:44 UTC (rev 263)
@@ -87,7 +87,7 @@
" AND car_par_code in ", vector_to_listsql(object at par@par_selectionne), sep="")
requete<-stacomirtools::connect(requete)
object at data<-requete at query
- if (!silent) funout(gettext("Data loaded"))
+ if (!silent) funout(gettext("Data loaded",domain="R-stacomiR"))
return(object)
})
@@ -106,34 +106,34 @@
if (exists("refDC",envir_stacomi)) {
object at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
object at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)) {
object at stades<-get("refStades",envir_stacomi)
} else {
- funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refpar",envir_stacomi)) {
object at par<-get("refpar",envir_stacomi)
} else {
- funout(gettext("You need to choose a parameter, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a parameter, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
# rem pas tres satisfaisant car ce nom est choisi dans l'interface
if (exists("bilan_adm_date_debut",envir_stacomi)) {
object at horodatedebut@horodate<-get("bilan_adm_date_debut",envir_stacomi)
} else {
- funout(gettext("You need to choose the starting date\n"),arret=TRUE)
+ funout(gettext("You need to choose the starting date\n",domain="R-stacomiR"),arret=TRUE)
}
# rem id
if (exists("bilan_adm_date_fin",envir_stacomi)) {
object at horodatefin@horodate<-get("bilan_adm_date_fin",envir_stacomi)
} else {
- funout(gettext("You need to choose the ending date\n"),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n",domain="R-stacomiR"),arret=TRUE)
}
return(object)
@@ -170,8 +170,8 @@
# code for debug using example
#horodatedebut="2012-01-01";horodatefin="2013-12-31";dc=c(107,108,101);
#taxons='2220'; stades=c('5','11','BEC','BER','IND');par=c('1786','1785','C001');silent=FALSE
- if (!(is.numeric(limit1hm)|is.integer(limit1hm))) funout(gettext("limit1hm should be numeric or integer"),arret=TRUE)
- if (!(is.numeric(limit2hm)|is.integer(limit2hm))) funout(gettext("limit2hm should be numeric or integer"),arret=TRUE)
+ if (!(is.numeric(limit1hm)|is.integer(limit1hm))) funout(gettext("limit1hm should be numeric or integer",domain="R-stacomiR"),arret=TRUE)
+ if (!(is.numeric(limit2hm)|is.integer(limit2hm))) funout(gettext("limit2hm should be numeric or integer",domain="R-stacomiR"),arret=TRUE)
bilan_adm<-object
bilan_adm at dc=charge(bilan_adm at dc)
@@ -187,12 +187,12 @@
bilan_adm at par<-choice_c(bilan_adm at par,par,silent=silent)
bilan_adm at horodatedebut<-choice_c(object=bilan_adm at horodatedebut,
nomassign="bilan_adm_date_debut",
- funoutlabel=gettext("Beginning date has been chosen\n"),
+ funoutlabel=gettext("Beginning date has been chosen\n",domain="R-stacomiR"),
horodate=horodatedebut,
silent=silent)
bilan_adm at horodatefin<-choice_c(bilan_adm at horodatefin,
nomassign="bilan_adm_date_fin",
- funoutlabel=gettext("Ending date has been chosen\n"),
+ funoutlabel=gettext("Ending date has been chosen\n",domain="R-stacomiR"),
horodate=horodatefin,
silent=silent)
bilan_adm at limit1hm<-choice_c(bilan_adm at limit1hm,as.character(limit1hm))
@@ -211,7 +211,7 @@
#bilan_adm<-b_carlot
bilan_adm<-object
if(nrow(bilan_adm at data)==0) {
- funout(gettext("you are in deep shit"), arret=TRUE)
+ funout(gettext("you are in deep shit",domain="R-stacomiR"), arret=TRUE)
}
adm=bilan_adm at data # on recupere le data.frame
if (is.na(as.numeric(bilan_adm at limit1hm@label))) stop("internal error")
@@ -253,7 +253,7 @@
if (exists("bilan_adm",envir_stacomi)) {
bilan_adm<-get("bilan_adm",envir_stacomi)
} else {
- if (!silent) funout(gettext("You need to launch computation first, clic on calc\n"),arret=TRUE)
+ if (!silent) funout(gettext("You need to launch computation first, clic on calc\n",domain="R-stacomiR"),arret=TRUE)
}
dat<-bilan_adm at calcdata[["data"]]
# cols are using viridis::inferno(6,alpha=0.9)
@@ -275,7 +275,7 @@
ylab("Effectif")
print(p)
assign("p",p,envir=envir_stacomi)
- funout(gettext("The graphical object is written is env_stacomi, type p<-get('p',envir=envir_stacomi)"))
+ funout(gettext("The graphical object is written is env_stacomi, type p<-get('p',envir=envir_stacomi)",domain="R-stacomiR"))
}
######################################
@@ -291,7 +291,7 @@
facet_grid(ope_dic_identifiant~.)
print(p)
assign("p",p,envir=envir_stacomi)
- funout(gettext("The graphical object is written is env_stacomi, type p<-get('p',envir=envir_stacomi)"))
+ funout(gettext("The graphical object is written is env_stacomi, type p<-get('p',envir=envir_stacomi)",domain="R-stacomiR"))
}
})
@@ -307,7 +307,7 @@
if (exists("bilan_adm",envir_stacomi)) {
bilan_adm<-get("bilan_adm",envir_stacomi)
} else {
- if (!silent) funout(gettext("You need to launch computation first, clic on calc\n"),arret=TRUE)
+ if (!silent) funout(gettext("You need to launch computation first, clic on calc\n",domain="R-stacomiR"),arret=TRUE)
}
dat<-bilan_adm at calcdata[["data"]]
ndc=unique(dat$ope_dic_identifiant)
@@ -454,7 +454,7 @@
))
#
- if (!silent) funout(gettext("Writing daily summary in the database","\n"))
+ if (!silent) funout(gettext("Writing daily summary in the database","\n",domain="R-stacomiR"))
taxon= as.character(bilanMigration at taxons@data$tax_nom_latin)
stade= as.character(bilanMigration at stades@data$std_libelle)
DC=as.numeric(bilanMigration at dc@dc_selectionne)
@@ -516,7 +516,7 @@
bilan_adm<-connect(bilan_adm)
vue_ope_lot=bilan_adm at requete@query # on recupere le data.frame
assign("bilan_adm",bilan_adm,envir_stacomi)#assign("bilan_adm",vue_ope_lot,envir_stacomi)
- funout(gettext("Size (BL mm)"))
+ funout(gettext("Size (BL mm)",domain="R-stacomiR"))
vue_ope_lot[is.na(vue_ope_lot)]<-""
vue_ope_lot$ope_date_debut=as.character(vue_ope_lot$ope_date_debut)
vue_ope_lot$ope_date_fin=as.character(vue_ope_lot$ope_date_fin)
Modified: pkg/stacomir/R/BilanAnnuels.r
===================================================================
--- pkg/stacomir/R/BilanAnnuels.r 2017-01-31 10:34:35 UTC (rev 262)
+++ pkg/stacomir/R/BilanAnnuels.r 2017-01-31 16:27:44 UTC (rev 263)
@@ -43,31 +43,31 @@
if (exists("refDC",envir_stacomi)) {
bilA at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
bilA at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)){
bilA at stades<-get("refStades",envir_stacomi)
} else
{
- funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("anneedebut",envir_stacomi)) {
bilA at anneedebut<-get("anneedebut",envir_stacomi)
} else {
- funout(gettext("You need to choose the starting year\n"),arret=TRUE)
+ funout(gettext("You need to choose the starting year\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("anneefin",envir_stacomi)) {
bilA at anneefin<-get("anneefin",envir_stacomi)
} else {
- funout(gettext("You need to choose the ending year\n"),arret=TRUE)
+ funout(gettext("You need to choose the ending year\n",domain="R-stacomiR"),arret=TRUE)
}
assign("bilanAnnuels",bilA,envir_stacomi)
- funout(gettext("The object BilanAnnuels is stored in the stacomi environment, type bilA <-get('bilanAnnuels',envir_stacomi)"))
+ funout(gettext("The object BilanAnnuels is stored in the stacomi environment, type bilA <-get('bilanAnnuels',envir_stacomi)",domain="R-stacomiR"))
return(bilA)
@@ -380,7 +380,7 @@
}
}
} else {
- funout(gettext("No data"))
+ funout(gettext("No data",domain="R-stacomiR"))
}
})
@@ -420,7 +420,7 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
} else if (length(lestax)==1 & length(lesstd)==1){
@@ -429,7 +429,7 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
} else if (length(lestax)==1 & length(lesdic)==1){
@@ -438,7 +438,7 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
} else if (length(lesdic)==1 & length(lesstd)==1){
@@ -447,7 +447,7 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
} else if (length(lestax)==1){
@@ -457,7 +457,7 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
} else if (length(lesstd)==1){
@@ -466,7 +466,7 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
} else if (length(lesdic)==1){
@@ -475,7 +475,7 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
} else {
if (length(lesdic)<3){
@@ -493,13 +493,13 @@
print(g)
assign("g",g,envir_stacomi)
- if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n"))
+ if (!silent) funout(gettext("\"Writing the graphical object into envir_stacomi environment : write g=get(g\",envir_stacomi)\"\n",domain="R-stacomiR"))
}
}
}
} else {
- funout(gettext("No data"))
+ funout(gettext("No data",domain="R-stacomiR"))
}
})
Modified: pkg/stacomir/R/BilanArgentee.r
===================================================================
--- pkg/stacomir/R/BilanArgentee.r 2017-01-31 10:34:35 UTC (rev 262)
+++ pkg/stacomir/R/BilanArgentee.r 2017-01-31 16:27:44 UTC (rev 263)
@@ -82,7 +82,7 @@
" AND car_par_code in ", vector_to_listsql(object at par@par_selectionne), sep="")
requete<-stacomirtools::connect(requete)
object at data<-requete at query
- if (!silent) funout(gettext("Data loaded"))
+ if (!silent) funout(gettext("Data loaded",domain="R-stacomiR"))
return(object)
})
@@ -101,34 +101,34 @@
if (exists("refDC",envir_stacomi)) {
object at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refTaxon",envir_stacomi)) {
object at taxons<-get("refTaxon",envir_stacomi)
} else {
- funout(gettext("You need to choose a taxa, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a taxa, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refStades",envir_stacomi)) {
object at stades<-get("refStades",envir_stacomi)
} else {
- funout(gettext("You need to choose a stage, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a stage, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refpar",envir_stacomi)) {
object at par<-get("refpar",envir_stacomi)
} else {
- funout(gettext("You need to choose a parameter, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a parameter, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
# rem pas tres satisfaisant car ce nom est choisi dans l'interface
if (exists("bilan_arg_date_debut",envir_stacomi)) {
object at horodatedebut@horodate<-get("bilan_arg_date_debut",envir_stacomi)
} else {
- funout(gettext("You need to choose the starting date\n"),arret=TRUE)
+ funout(gettext("You need to choose the starting date\n",domain="R-stacomiR"),arret=TRUE)
}
# rem id
if (exists("bilan_arg_date_fin",envir_stacomi)) {
object at horodatefin@horodate<-get("bilan_arg_date_fin",envir_stacomi)
} else {
- funout(gettext("You need to choose the ending date\n"),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n",domain="R-stacomiR"),arret=TRUE)
}
return(object)
@@ -176,12 +176,12 @@
bilanArg at par<-choice_c(bilanArg at par,par,silent=silent)
bilanArg at horodatedebut<-choice_c(object=bilanArg at horodatedebut,
nomassign="bilanArg_date_debut",
- funoutlabel=gettext("Beginning date has been chosen\n"),
+ funoutlabel=gettext("Beginning date has been chosen\n",domain="R-stacomiR"),
horodate=horodatedebut,
silent=silent)
bilanArg at horodatefin<-choice_c(bilanArg at horodatefin,
nomassign="bilanArg_date_fin",
- funoutlabel=gettext("Ending date has been chosen\n"),
+ funoutlabel=gettext("Ending date has been chosen\n",domain="R-stacomiR"),
horodate=horodatefin,
silent=silent)
validObject(bilanArg)
@@ -198,7 +198,7 @@
#bilanArg<-b_carlot
bilanArg<-object
if(nrow(bilanArg at data)==0) {
- funout(gettext("No data of silver or yellow eel on the selected period"), arret=TRUE)
+ funout(gettext("No data of silver or yellow eel on the selected period",domain="R-stacomiR"), arret=TRUE)
}
arg=bilanArg at data # on recupere le data.frame
@@ -288,7 +288,7 @@
if (exists("bilanArg",envir_stacomi)) {
bilanArg<-get("bilanArg",envir_stacomi)
} else {
- if (!silent) funout(gettext("You need to launch computation first, clic on calc\n"),arret=TRUE)
+ if (!silent) funout(gettext("You need to launch computation first, clic on calc\n",domain="R-stacomiR"),arret=TRUE)
}
dat<-bilanArg at calcdata
# cols are using viridis::inferno(6,alpha=0.9)
@@ -347,10 +347,10 @@
group=stage,
type = c("p"),
par.settings = my.settings,
- xlab=gettext("size (BL mm)"),
- ylab=gettext("Mean eye diameter (MD mm)"),
+ xlab=gettext("size (BL mm)",domain="R-stacomiR"),
+ ylab=gettext("Mean eye diameter (MD mm)",domain="R-stacomiR"),
par.strip.text=list(col="white", font=2),
- auto.key=list(title=gettext("Silvering stages (Durif et al. 2009)"),
+ auto.key=list(title=gettext("Silvering stages (Durif et al. 2009)",domain="R-stacomiR"),
cex.title=1.2,
space="top",
columns=6,
@@ -402,10 +402,10 @@
bb<-lattice::barchart(form,data=datdc1,
group=stage,
- xlab=gettext("Month"),
- ylab=gettext("Number"),
+ xlab=gettext("Month",domain="R-stacomiR"),
+ ylab=gettext("Number",domain="R-stacomiR"),
par.strip.text=list(col="white", font=2),
- auto.key=list(title=gettext("Number by pigmentation stage"),
+ auto.key=list(title=gettext("Number by pigmentation stage",domain="R-stacomiR"),
cex.title=1.2,
space="top",
columns=6,
@@ -521,8 +521,8 @@
#############
par(mar=c(5.1,4.1,1,1)) # blur bottom left up right
plot(datdc$BL,datdc$W,type="n",
- xlab=gettext("Size (mm)"),
- ylab=gettext("Weight(g)"),
+ xlab=gettext("Size (mm)",domain="R-stacomiR"),
+ ylab=gettext("Weight(g)",domain="R-stacomiR"),
xlim=c(250,1000),ylim=c(0,2000))
abline(v=seq(250,1000,by=50), col = "lightgray",lty=2)
abline(h=seq(0,2000,by=100),col="lightgray",lty=2)
@@ -605,7 +605,7 @@
if (exists("bilanArg",envir_stacomi)) {
bilanArg<-get("bilanArg",envir_stacomi)
} else {
- if (!silent) funout(gettext("You need to launch computation first, clic on calc\n"),arret=TRUE)
+ if (!silent) funout(gettext("You need to launch computation first, clic on calc\n",domain="R-stacomiR"),arret=TRUE)
}
dat<-bilanArg at calcdata
# cols are using viridis::inferno(6,alpha=0.9)
@@ -703,7 +703,7 @@
bilanArg<-connect(bilanArg)
vue_ope_lot=bilanArg at requete@query # on recupere le data.frame
assign("bilanArg",bilanArg,envir_stacomi)#assign("bilanArg",vue_ope_lot,envir_stacomi)
- funout(gettext("Size (BL mm)"))
+ funout(gettext("Size (BL mm)",domain="R-stacomiR"))
vue_ope_lot[is.na(vue_ope_lot)]<-""
vue_ope_lot$ope_date_debut=as.character(vue_ope_lot$ope_date_debut)
vue_ope_lot$ope_date_fin=as.character(vue_ope_lot$ope_date_fin)
Modified: pkg/stacomir/R/BilanConditionEnv.r
===================================================================
--- pkg/stacomir/R/BilanConditionEnv.r 2017-01-31 10:34:35 UTC (rev 262)
+++ pkg/stacomir/R/BilanConditionEnv.r 2017-01-31 16:27:44 UTC (rev 263)
@@ -74,7 +74,7 @@
requete at and=paste(" AND env_stm_identifiant IN ",tmp )
requete<-stacomirtools::connect(requete)
object at data<-stacomirtools::killfactor(requete at query)
- funout(gettext("Environmental conditions loading query completed\n"))
+ funout(gettext("Environmental conditions loading query completed\n",domain="R-stacomiR"))
return(object)
}
)
@@ -89,19 +89,19 @@
if (exists("refStationMesure",envir_stacomi)) {
object at stationMesure<-get("refStationMesure",envir_stacomi)
} else {
- funout(gettext("You need to choose a monitoring station, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a monitoring station, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("bilanConditionEnv_date_debut",envir_stacomi)) {
object at datedebut<-get("bilanConditionEnv_date_debut",envir_stacomi)@horodate
} else {
- funout(gettext("You need to choose the starting date\n"),arret=TRUE)
+ funout(gettext("You need to choose the starting date\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("bilanConditionEnv_date_fin",envir_stacomi)) {
object at datefin<-get("bilanConditionEnv_date_fin",envir_stacomi)@horodate
}else {
- funout(gettext("You need to choose the ending date\n"),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n",domain="R-stacomiR"),arret=TRUE)
}
object<-connect(object)
return(object)
@@ -130,7 +130,7 @@
lesGraphes=list()
if(length(unique(dat$env_stm_identifiant))!= nrow(bilanConditionEnv at stationMesure@data))
{
- funout(gettext("Some monitoring stations lack associated values\n"))
+ funout(gettext("Some monitoring stations lack associated values\n",domain="R-stacomiR"))
}
# pour toutes les stations de mesure selectionnees
@@ -163,7 +163,7 @@
}
else
{
- funout(gettext("No environmental conditions values for selected monitoring stations (BilanConditionEnv.r)\n"),arret=TRUE)
+ funout(gettext("No environmental conditions values for selected monitoring stations (BilanConditionEnv.r)\n",domain="R-stacomiR"),arret=TRUE)
}
return (lesGraphes)
}
@@ -177,7 +177,7 @@
dat<-bilanConditionEnv at data
dat<-stacomirtools::chnames(dat,"env_stm_identifiant","stm_identifiant")
dat<-merge(dat,bilanConditionEnv at stationMesure@data,by="stm_identifiant")
- funout(gettext("Statistics :\n"))
+ funout(gettext("Statistics :\n",domain="R-stacomiR"))
liste = tapply(dat$env_valeur_quantitatif,dat$stm_libelle,summary)
for (i in names(liste)){
funout(paste(" station",i,":\nMin ; 1st Qu.; Median ; Mean ; 3rd Qu. ; Max ; Na's ) = \n",paste(liste[[i]],collapse=" ; "),"\n"))
Modified: pkg/stacomir/R/BilanEspeces.r
===================================================================
--- pkg/stacomir/R/BilanEspeces.r 2017-01-31 10:34:35 UTC (rev 262)
+++ pkg/stacomir/R/BilanEspeces.r 2017-01-31 16:27:44 UTC (rev 263)
@@ -85,7 +85,7 @@
" AND lot_effectif IS NOT NULL",
sep="")
requete<-stacomirtools::connect(requete)
- if (requete at etat!="Requete reussie \n") funout(gettext("Query failed for the view vue_ope_lot_car \n"),arret=TRUE)
+ if (requete at etat!="Requete reussie \n") funout(gettext("Query failed for the view vue_ope_lot_car \n",domain="R-stacomiR"),arret=TRUE)
bilanEspeces at data<-requete at query
return(bilanEspeces)
})
@@ -109,34 +109,34 @@
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
setMethod("charge",signature=signature("BilanEspeces"),definition=function(object){
- funout(gettext("Checking objects and launching query\n"))
+ funout(gettext("Checking objects and launching query\n",domain="R-stacomiR"))
bilanEspeces<-object
if (exists("refDC",envir_stacomi)) {
bilanEspeces at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE)
+ funout(gettext("You need to choose a counting device, clic on validate\n",domain="R-stacomiR"),arret=TRUE)
}
# rem pas tres satisfaisant car ce nom est choisi dans l'interface
if (exists("bilanEspeces_date_debut",envir_stacomi)) {
bilanEspeces at datedebut<-get("bilanEspeces_date_debut",envir_stacomi)@horodate
} else {
- funout(gettext("You need to choose the starting date\n"),arret=TRUE)
+ funout(gettext("You need to choose the starting date\n",domain="R-stacomiR"),arret=TRUE)
}
# rem id
if (exists("bilanEspeces_date_fin",envir_stacomi)) {
bilanEspeces at datefin<-get("bilanEspeces_date_fin",envir_stacomi)@horodate
} else {
- funout(gettext("You need to choose the ending date\n"),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("refliste",envir_stacomi)) {
bilanEspeces at liste<-get("refliste",envir_stacomi)
} else {
- funout(gettext("You need to choose a size class\n"), arret=TRUE)
+ funout(gettext("You need to choose a size class\n",domain="R-stacomiR"), arret=TRUE)
}
bilanEspeces<-connect(bilanEspeces)
assign("bilanEspeces",bilanEspeces,envir_stacomi)
- funout(gettext("Summary object is stocked into envir_stacomi environment : write bilanEspeces=get('bilanEspeces',envir_stacomi)\n"))
+ funout(gettext("Summary object is stocked into envir_stacomi environment : write bilanEspeces=get('bilanEspeces',envir_stacomi)\n",domain="R-stacomiR"))
})
@@ -152,14 +152,14 @@
if (exists("bilanEspeces",envir_stacomi)) {
bilanEspeces<-get("bilanEspeces",envir_stacomi)
} else {
- funout(gettext("You need to launch computation first, clic on calc\n"),arret=TRUE)
+ funout(gettext("You need to launch computation first, clic on calc\n",domain="R-stacomiR"),arret=TRUE)
}
DC=as.numeric(bilanEspeces at dc@dc_selectionne)
# update of refliste which does not need calcul button pushed
bilanEspeces at liste<-get("refliste",envir_stacomi)
tableEspeces=bilanEspeces at data
- if (nrow(tableEspeces)==0) funout(gettext("No fish in the database for this period\n"),arret=TRUE)
+ if (nrow(tableEspeces)==0) funout(gettext("No fish in the database for this period\n",domain="R-stacomiR"),arret=TRUE)
tableEspeces$taxon_stades=paste(tableEspeces$tax_nom_latin,tableEspeces$std_libelle,sep="_")
# only keeping taxon stage for species with several stages
nbstades=tapply(tableEspeces$tax_nom_latin,tableEspeces$taxon_stades,function(X)(length(unique(X))))
@@ -169,7 +169,7 @@
} else tableEspeces$taxon_stades<-tableEspeces$tax_nom_latin
# TODO ajouter les effectifs en fin de taxons_stades ???
nb=length(unique(tableEspeces$taxon_stade))
- if (min(tableEspeces$lot_effectif)<0) {funout(gettext("Warning, some negative counts are transformed into positive ones\n"))
+ if (min(tableEspeces$lot_effectif)<0) {funout(gettext("Warning, some negative counts are transformed into positive ones\n",domain="R-stacomiR"))
tableEspeces$lot_effectif=abs(tableEspeces$lot_effectif)
}
sumEspeces=switch(bilanEspeces at liste@listechoice,
@@ -217,14 +217,14 @@
if (exists("bilanEspeces",envir_stacomi)) {
bilanEspeces<-get("bilanEspeces",envir_stacomi)
} else {
- funout(gettext("You need to launch computation first, clic on calc\n"),arret=TRUE)
+ funout(gettext("You need to launch computation first, clic on calc\n",domain="R-stacomiR"),arret=TRUE)
}
DC=as.numeric(bilanEspeces at dc@dc_selectionne)
# update of refliste which does not need calcul button pushed
bilanEspeces at liste<-get("refliste",envir_stacomi)
tableEspeces=bilanEspeces at data
- if (nrow(tableEspeces)==0) funout(gettext("No fish in the database for this period\n"),arret=TRUE)
+ if (nrow(tableEspeces)==0) funout(gettext("No fish in the database for this period\n",domain="R-stacomiR"),arret=TRUE)
tableEspeces$taxon_stades=paste(tableEspeces$tax_nom_latin,tableEspeces$std_libelle,sep="_")
nbstades=tapply(tableEspeces$tax_nom_latin,tableEspeces$taxon_stades,function(X)(length(unique(X))))
if (length(nbstades[nbstades>1])>0){
@@ -233,7 +233,7 @@
} else tableEspeces$taxon_stades<-tableEspeces$tax_nom_latin
# TODO ajouter les effectifs en fin de taxons_stades ???
nb=length(unique(tableEspeces$taxon_stade))
- if (min(tableEspeces$lot_effectif)<0) {funout(gettext("Warning, some negative counts are transformed into positive ones\n"))
+ if (min(tableEspeces$lot_effectif)<0) {funout(gettext("Warning, some negative counts are transformed into positive ones\n",domain="R-stacomiR"))
tableEspeces$lot_effectif=abs(tableEspeces$lot_effectif)
}
now<-bilanEspeces at horodate@horodate
@@ -254,26 +254,26 @@
interface_BilanEspeces=function(){
bilanEspeces=new("BilanEspeces")
assign("bilanEspeces",bilanEspeces,envir = .GlobalEnv)
- funout(gettext("Summary of encountered species for the counting device\n"))
+ funout(gettext("Summary of encountered species for the counting device\n",domain="R-stacomiR"))
bilanEspeces at dc=charge(bilanEspeces at dc)
bilanEspeces at liste=charge(object=bilanEspeces at liste,
vecteur=c("aucun","semaine","mois","annee"),
- label=gettext("Choice of cutting"))
+ label=gettext("Choice of cutting",domain="R-stacomiR"))
quitte()
group <- gWidgets::ggroup(horizontal=FALSE) # doit toujours s'appeller group
assign("group",group,envir = .GlobalEnv)
- gl=glabel(text=gettext("Species summary"),container=group)
+ gl=glabel(text=gettext("Species summary",domain="R-stacomiR"),container=group)
add(ggroupboutons,group)
choice(bilanEspeces at horodate,
- label=gettext("Start of timestamp"),
+ label=gettext("Start of timestamp",domain="R-stacomiR"),
nomassign="bilanEspeces_date_debut",
- funoutlabel=gettext("Beginning date has been chosen\n"),
+ funoutlabel=gettext("Beginning date has been chosen\n",domain="R-stacomiR"),
decal=-2,
affichecal=FALSE)
choice(bilanEspeces at horodate,
- label=gettext("End of timestamp"),
+ label=gettext("End of timestamp",domain="R-stacomiR"),
nomassign="bilanEspeces_date_fin",
- funoutlabel=gettext("Ending date has been chosen\n"),
+ funoutlabel=gettext("Ending date has been chosen\n",domain="R-stacomiR"),
decal=-1,
affichecal=FALSE)
choice(bilanEspeces at dc,objectBilan=bilanEspeces,is.enabled=TRUE)
@@ -282,11 +282,11 @@
assign("ggroupboutonsbas",ggroupboutonsbas, envir=.GlobalEnv)
gWidgets::add(ggroupboutons,ggroupboutonsbas)
toolbarlist = list(
- Calc=gWidgets::gaction(handler=hBilanEspecescalc, action=bilanEspeces, icon="new", label="calcul", tooltip=gettext("Loading")),
- Graph=gWidgets::gaction(label="pie",tooltip=gettext("Pie chart graphic"),icon="bubbles",handler=hCamembert,action="pie"),
- Graph2=gWidgets::gaction(handler=hCamembert, icon="barplot", label="histo", tooltip=gettext("barplot"),action="graph"),
- Stat=gWidgets::gaction(handler=hTableBilanEspeces, icon="dataframe", label="stat", tooltip=gettext("Summary tables in .csv and XML")),
- annuler=gWidgets::gaction(handler= quitte,icon = "close",label=gettext("exit"))
+ Calc=gWidgets::gaction(handler=hBilanEspecescalc, action=bilanEspeces, icon="new", label="calcul", tooltip=gettext("Loading",domain="R-stacomiR")),
+ Graph=gWidgets::gaction(label="pie",tooltip=gettext("Pie chart graphic",,domain="R-stacomiR"),icon="bubbles",handler=hCamembert,action="pie"),
+ Graph2=gWidgets::gaction(handler=hCamembert, icon="barplot", label="histo", tooltip=gettext("barplot",domain="R-stacomiR"),action="graph"),
+ Stat=gWidgets::gaction(handler=hTableBilanEspeces, icon="dataframe", label="stat", tooltip=gettext("Summary tables in .csv and XML",domain="R-stacomiR")),
+ annuler=gWidgets::gaction(handler= quitte,icon = "close",label=gettext("exit",domain="R-stacomiR"))
)
#gWidgets::add(ggroupboutonsbas, gtoolbar(toolbarlist))
#gWidgets::addSpring(group)
Modified: pkg/stacomir/R/BilanFonctionnementDC.r
===================================================================
--- pkg/stacomir/R/BilanFonctionnementDC.r 2017-01-31 10:34:35 UTC (rev 262)
+++ pkg/stacomir/R/BilanFonctionnementDC.r 2017-01-31 16:27:44 UTC (rev 263)
@@ -60,7 +60,7 @@
#req at where=#defini dans la methode ODBCwheredate
req<-stacomirtools::connect(req) # appel de la methode connect de l'object ODBCWHEREDATE
object at data<-req at query
- if (!silent) funout(gettext("Time steps loaded fot this counting device\n"))
+ if (!silent) funout(gettext("Time steps loaded fot this counting device\n",domain="R-stacomiR"))
return(object)
})
@@ -79,18 +79,18 @@
if (exists("refDC",envir_stacomi)) {
object at dc<-get("refDC",envir_stacomi)
} else {
- funout(gettext("You need to choose a counting device, clic on validate\n"),arret=TRUE) }
+ funout(gettext("You need to choose a counting device, clic on validate\n",domain="R-stacomiR"),arret=TRUE) }
if (exists("bilanFonctionnementDC_date_debut",envir_stacomi)) {
object at horodatedebut@horodate<-get("bilanFonctionnementDC_date_debut",envir_stacomi)
} else {
- funout(gettext("You need to choose the starting date\n"),arret=TRUE)
+ funout(gettext("You need to choose the starting date\n",domain="R-stacomiR"),arret=TRUE)
}
if (exists("bilanFonctionnementDC_date_fin",envir_stacomi)) {
object at horodatefin@horodate<-get("bilanFonctionnementDC_date_fin",envir_stacomi)
} else {
- funout(gettext("You need to choose the ending date\n"),arret=TRUE)
+ funout(gettext("You need to choose the ending date\n",domain="R-stacomiR"),arret=TRUE)
}
return(object)
})
@@ -112,17 +112,17 @@
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/stacomir -r 263
More information about the Stacomir-commits
mailing list