[Stacomir-commits] r257 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jan 28 16:04:16 CET 2017
Author: briand
Date: 2017-01-28 16:04:15 +0100 (Sat, 28 Jan 2017)
New Revision: 257
Modified:
pkg/stacomir/R/funSousListeBilanMigrationPar.r
pkg/stacomir/R/fungraph.r
pkg/stacomir/R/fungraph_civelle.r
pkg/stacomir/R/funstat.r
pkg/stacomir/R/funtraitement_poids.r
pkg/stacomir/R/interface_BilanAgedemer.r
pkg/stacomir/R/interface_BilanArgentee.r
pkg/stacomir/R/interface_Bilan_carlot.r
Log:
Modified: pkg/stacomir/R/funSousListeBilanMigrationPar.r
===================================================================
--- pkg/stacomir/R/funSousListeBilanMigrationPar.r 2017-01-28 12:29:47 UTC (rev 256)
+++ pkg/stacomir/R/funSousListeBilanMigrationPar.r 2017-01-28 15:04:15 UTC (rev 257)
@@ -42,7 +42,7 @@
# width = 400),
# envir = .GlobalEnv)
mygtkProgressBar(title="cumul val. quant. par pas de temps",
- progress_text=gettext(get("msg",envir=envir_stacomi)$BilanFonctionnementDF.5))
+ progress_text=gettext("Progress %"))
##############################
on.exit(dispose(progres))
Modified: pkg/stacomir/R/fungraph.r
===================================================================
--- pkg/stacomir/R/fungraph.r 2017-01-28 12:29:47 UTC (rev 256)
+++ pkg/stacomir/R/fungraph.r 2017-01-28 15:04:15 UTC (rev 257)
@@ -119,7 +119,7 @@
xlab="",
xaxt="n",
yaxt="n",
- ylab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.11),
+ ylab=gettext("Fishway"),
bty="n",
cex=1.2)
@@ -144,7 +144,7 @@
border = NA,
lwd = 1)
legend( x= "bottom",
- legend= gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.9),
+ legend= c(gettext("working"),gettext("stopped"),gettext("normal operation")),
pch=c(16,16),
col=c(mypalette[4],mypalette[6],mypalette[1]),
horiz=TRUE,
@@ -198,7 +198,7 @@
legend (x= debut,
y=1.2,
- legend= c(gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.10,nomperiode)),
+ legend= c(gettext("stop"),nomperiode),
pch=c(15,15),
col=c(mypalette[4],mypalette[6],mypalette[1:length(listeperiode)]),
bty="n",
@@ -218,7 +218,7 @@
xlab="",
xaxt="n",
yaxt="n",
- ylab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.12),
+ ylab=gettext("CD"),
bty="n",
cex=1.2)
###################################
@@ -244,7 +244,7 @@
border = NA,
lwd = 1)
legend( x= "bottom",
- legend= c(gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.9)),
+ legend= c((gettext("working"),gettext("stopped"),gettext("normal operation")),
pch=c(16,16),
col=c(mypalette[4],mypalette[6],mypalette[1]),
#horiz=TRUE,
@@ -296,7 +296,7 @@
legend (x= debut,
y=1.2,
- legend= c(gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.10,nomperiode)),
+ legend= c(gettext("stop"),nomperiode),
pch=c(15,15),
col=c(mypalette[4],mypalette[6],mypalette[1:length(listeperiode)]),
bty="n",
@@ -317,7 +317,7 @@
xlab="",
xaxt="n",
yaxt="n",
- ylab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.13),
+ ylab=gettext("Op"),
bty="n",
cex=1.2)
###################################
@@ -336,7 +336,6 @@
###################################
# Graph mensuel
####################################
- # Pour les noms modifier gettext(get("msg",envir=envir_stacomi)$fungraph.7)
graphics::par("mar"=c(4, 4, 1, 2) + 0.1)
tableau$mois=factor(months(tableau$debut_pas,abbreviate=TRUE),
levels=unique(months(tableau$debut_pas,abbreviate=TRUE)))
@@ -345,7 +344,7 @@
measure.vars=c("MESURE","CALCULE","EXPERT","PONCTUEL"),
variable.name="type",
value.name="number")
- levels(tableaum$type)<-gettext(get("msg",envir=envir_stacomi)$fungraph.5)
+ levels(tableaum$type)<-c(gettext("measured"),gettext("calculated"),gettext("expert"),gettext("direct"))
superpose.polygon<-lattice::trellis.par.get("plot.polygon")
superpose.polygon$col= c("black","deepskyblue","chartreuse2","indianred")
superpose.polygon$border=rep("transparent",6)
@@ -368,8 +367,8 @@
bar<-lattice::barchart(number/1000~mois,
groups=type,
- xlab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.14),
- ylab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.15),
+ xlab=gettext("Month"),
+ ylab=gettext("Number (x1000)"),
# main=list(label=paste("Donnees mensuelles")),
data=tableaum,
allow.multiple=FALSE,
@@ -398,7 +397,7 @@
# jour_mois=FALSE,
# heure=FALSE)
# stktab$ind<-factor(stktab$ind, levels = c("MESURE","CALCULE","EXPERT","PONCTUEL"))
-# fillname<-gettext(get("msg",envir=envir_stacomi)$fungraph.7[2] #type)
+# fillname<-gettext("type")
# mypalette<-rev(c("black","deepskyblue","chartreuse2","indianred"))
# g<-ggplot(stktab, aes(x=mois,y=values,fill=ind))+
# geom_bar(position="dodge", stat="identity")+
@@ -406,8 +405,8 @@
# "CALCULE"=mypalette[3],
# "EXPERT"=mypalette[2],
# "PONCTUEL"=mypalette[1]))+
-# xlab(gettext(get("msg",envir=envir_stacomi)$fungraph.7[4])+ # mois or month+)
-# ylab(gettext(get("msg",envir=envir_stacomi)$fungraph.7[1]) # Nombre ou Numbers)
+# xlab(gettext("month")+ # mois or month+)
+# ylab(gettext("Numbers") # Nombre ou Numbers)
# nothing<-print(g)
# pour l'instant je ne peux pas combiner avec les autres => deux graphes
return(invisible(NULL))
Modified: pkg/stacomir/R/fungraph_civelle.r
===================================================================
--- pkg/stacomir/R/fungraph_civelle.r 2017-01-28 12:29:47 UTC (rev 256)
+++ pkg/stacomir/R/fungraph_civelle.r 2017-01-28 15:04:15 UTC (rev 257)
@@ -219,7 +219,7 @@
legend (x= debut,
y=1.2,
- legend= c(gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.10,nomperiode)),
+ legend= c(gettext("work"),gettext("stop"),nomperiode),
pch=c(15,15),
col=c(mypalette[4],mypalette[6],mypalette[1:length(listeperiode)]),
bty="n",
@@ -240,7 +240,7 @@
xlab="",
xaxt="n",
yaxt="n",
- ylab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.12),
+ ylab=gettext("CD"),
bty="n",
cex=1.2)
###################################
@@ -266,7 +266,7 @@
border = NA,
lwd = 1)
legend( x= "bottom",
- legend=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.9),
+ legend=c(gettext("working"),gettext("stopped"),gettext("normal operation")),
pch=c(16,16),
col=c(mypalette[4],mypalette[6],mypalette[1]),
#horiz=TRUE,
@@ -317,7 +317,7 @@
legend (x= debut,
y=1.2,
- legend= c(gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.10,nomperiode)),
+ legend= c("working","stopped",nomperiode),
pch=c(15,15),
col=c(mypalette[4],mypalette[6],mypalette[1:length(listeperiode)]),
bty="n",
@@ -338,7 +338,7 @@
xlab="",
xaxt="n",
yaxt="n",
- ylab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.13),
+ ylab=gettext("Op"),
bty="n",
cex=1.2)
###################################
@@ -389,12 +389,12 @@
bar<-lattice::barchart(eff/1000~as.factor(mois),
groups=as.factor(type),
- xlab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.14),
- ylab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.15),
+ xlab=gettext("Month"),
+ ylab=gettext("Number (x1000)"),
# main=list(label=paste("Donnees mensuelles")),
data=tablemens,
allow.multiple=FALSE,
-# key=lattice::simpleKey(text=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.16),
+# key=lattice::simpleKey(text=c(gettext("weight of monthly number"),gettext("monthly number counted")),
# rectangles = TRUE,
# points=FALSE,
# space="right",
Modified: pkg/stacomir/R/funstat.r
===================================================================
--- pkg/stacomir/R/funstat.r 2017-01-28 12:29:47 UTC (rev 256)
+++ pkg/stacomir/R/funstat.r 2017-01-28 15:04:15 UTC (rev 257)
@@ -11,7 +11,7 @@
#' @author Cedric Briand \email{cedric.briand"at"eptb-vilaine.fr}
#' @export
funstat=function(tableau,time.sequence,taxon,stade,DC,silent){
- if (!silent) funout(gettext(get("msg",envir=envir_stacomi)$funstat.1))
+ if (!silent) funout(gettext("Calculation of the monthly balance sheet\n"))
mois=strftime(as.POSIXlt(time.sequence),"%m")
moislab=unique(mois)
annee=paste(unique(strftime(as.POSIXlt(time.sequence),"%Y")),collapse=",")
@@ -43,7 +43,7 @@
# funout(paste(DC,taxon,stade,annee,"\n"))
#funout(paste("DC","code_taxon","code_stade","annee","\n"))
if(!silent) {
- funout(gettext(get("msg",envir=envir_stacomi)$funstat.1) )
+ funout(gettext("Calculation of the monthly balance sheet\n"))
print( resum["somme",])
}
return(resum)
Modified: pkg/stacomir/R/funtraitement_poids.r
===================================================================
--- pkg/stacomir/R/funtraitement_poids.r 2017-01-28 12:29:47 UTC (rev 256)
+++ pkg/stacomir/R/funtraitement_poids.r 2017-01-28 15:04:15 UTC (rev 257)
@@ -7,14 +7,14 @@
#' @export
funtraitement_poids=function(tableau,time.sequence) {
index=tableau$No.pas+1
- funout(gettext(get("msg",envir=envir_stacomi)$funtraitement_poids.1))
+ funout(gettext("Conversion weight / number\n"))
tableaupoids=subset(tableau,tableau$type_de_quantite==unique(tableau$type_de_quantite)[2])
tableaueffectif=subset(tableau,tableau$type_de_quantite==unique(tableau$type_de_quantite)[1])
# Conversion des poids en effectifs
tableauconvert=tableaupoids[,c("MESURE","CALCULE","EXPERT","PONCTUEL","Effectif_total")]
tableauconvert=tableauconvert*tableaupoids$coe_valeur_coefficient # les coeff sont du type 2.54 et non 0.3
- if (sum(tableaupoids$coe_valeur_coefficient)==0) funout(gettext(get("msg",envir=envir_stacomi)$funtraitement_poids.2))
+ if (sum(tableaupoids$coe_valeur_coefficient)==0) funout(gettext("Attention sum=0, you didn't enter the coefficient of conversion\n"))
# creation d'une tableau (matricepoids) a 5 colonnes comprenant les effectifs convertis
matricepoids=cbind(tableaupoids[,1],tableauconvert,tableaupoids[,c("MESURE","CALCULE","EXPERT","PONCTUEL","Effectif_total")],tableaupoids$coe_valeur_coefficient)
dimnames(matricepoids)=list(1:length(tableaupoids[,1]),c(
@@ -57,8 +57,8 @@
#annees bissextiles and missing data
if (length(coe$coe_valeur_coefficient)<length(tableau$Effectif_total.e)){
if (sum(tableaupoids$coe_valeur_coefficient)>0){
- funout(gettext(get("msg",envir=envir_stacomi)$funtraitement_poids.3)) #there are some coefficient but they are incomplete
- warnings(gettext(get("msg",envir=envir_stacomi)$funtraitement_poids.3))
+ funout(gettext("Attention there are probably missing coefficients in the database, verify or the conversion from number to weights and weights to number might be wrong\n"))
+ warnings(gettext("Attention there are probably missing coefficients in the database, verify or the conversion from number to weights and weights to number might be wrong\n"))
}
mtch<-match(as.character(coe$coe_date_debut),as.character(as.Date(round(time.sequence,"day"))))
tableau$poids_depuis_effectifs<-0
Modified: pkg/stacomir/R/interface_BilanAgedemer.r
===================================================================
--- pkg/stacomir/R/interface_BilanAgedemer.r 2017-01-28 12:29:47 UTC (rev 256)
+++ pkg/stacomir/R/interface_BilanAgedemer.r 2017-01-28 15:04:15 UTC (rev 257)
@@ -43,8 +43,7 @@
choice_c(bilan_adm at taxons,2220)
choice_c(bilan_adm at stades,c('5','11','BEC','BER','IND'))
choice_c(bilan_adm at par,c('1786','1785','C001'))
- #gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.7 => dotplot ou graphe de dispersion)
- aplot1=gWidgets::gaction(label="plot-1",
+ aplot1=gWidgets::gaction(label="plot-1",
icon="gWidgetsRGtk2-cloud",
handler=funplotBilanAgedemer,
action="1",
Modified: pkg/stacomir/R/interface_BilanArgentee.r
===================================================================
--- pkg/stacomir/R/interface_BilanArgentee.r 2017-01-28 12:29:47 UTC (rev 256)
+++ pkg/stacomir/R/interface_BilanArgentee.r 2017-01-28 15:04:15 UTC (rev 257)
@@ -39,7 +39,6 @@
choice_c(bilan_arg at taxons,2038)
choice_c(bilan_arg at stades,'AGG')
choice_c(bilan_arg at par,c('1786','CCCC','BBBB','CONT','LINP','A111','PECT'))
- #gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.7 => dotplot ou graphe de dispersion)
aplot1=gWidgets::gaction(label="plot-1",
icon="gWidgetsRGtk2-cloud",
handler=funplotBilanArgentee,
Modified: pkg/stacomir/R/interface_Bilan_carlot.r
===================================================================
--- pkg/stacomir/R/interface_Bilan_carlot.r 2017-01-28 12:29:47 UTC (rev 256)
+++ pkg/stacomir/R/interface_Bilan_carlot.r 2017-01-28 15:04:15 UTC (rev 257)
@@ -7,7 +7,7 @@
bilan_carlot=new("Bilan_carlot")
assign("bilan_carlot",bilan_carlot,envir = envir_stacomi)
- funout(gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.1))
+ funout(gettext("Loading of the view vue_ope_lot, and choice of the counting device and of the time steps\n"))
bilan_carlot at dc=charge(bilan_carlot at dc)
bilan_carlot at taxons=charge(bilan_carlot at taxons)
bilan_carlot at stades=charge(bilan_carlot at stades)
@@ -17,20 +17,20 @@
assign("group",group,envir = .GlobalEnv)
gWidgets::add(ggroupboutons,group)
- gl=glabel(text=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.2,container=group))
+ gl=glabel(text=gettext("Batch summary"),container=group)
# dans l'ordre
# dans le handler, modifier le contenu de l'object fils si il existe
# supprimer les widgets fils si ils existent (appel de la methode delete)
# appeller la methode choice pour l'affichage du fils si il existe
- choice(bilan_carlot at horodatedebut,label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.3),
+ choice(bilan_carlot at horodatedebut,label=gettext("Fist timestamp"),
nomassign="bilan_carlot_date_debut",
- funoutlabel=gettext("Beginning date has been chosen\n"),
+ funoutlabel=gettext("The beginning date has been chosen\n"),
decal=-2)
- choice(bilan_carlot at horodatefin,label=gettext("End of timestamp"),
+ choice(bilan_carlot at horodatefin,label=gettext("Last timestamp"),
nomassign="bilan_carlot_date_fin",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.6),
+ funoutlabel=gettext("The ending date has been chosen"),
decal=-1)
choice(bilan_carlot at dc,objectBilan=bilan_carlot,is.enabled=TRUE)
@@ -42,23 +42,26 @@
#toolbarlist$Calc$icon = "dataframe"
#getStockIcons(toolkit=guiToolkit())
- #gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.7 => dotplot ou graphe de dispersion)
- aPoint=gWidgets::gaction(label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.7),
+ aPoint=gWidgets::gaction(label=gettext("dotplot"),
icon="gWidgetsRGtk2-cloud",
handler=funpointBilan_carlot,
- tooltip=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.7))
- #gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.11 => density)
- aDensity=gWidgets::gaction(label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.11),
+ tooltip=gettext("dotplot"))
+
+ aDensity=gWidgets::gaction(label=gettext("density"),
icon="gWidgetsRGtk2-density",
handler=fundensityBilan_carlot,
- tooltip=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.11))
- #gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.10 => boxplot)
- aBoxplot=gWidgets::gaction(label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.10),
+ tooltip=gettext("density"))
+ aBoxplot=gWidgets::gaction(label=gettext("boxplot"),
icon="gWidgetsRGtk2-boxplot",
handler=funboxplotBilan_carlot,
- tooltip=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.10))
- aTable=gWidgets::gaction(label="table",icon="dataframe",handler=funtableBilan_carlot,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_carlot.8))
- aQuit=gWidgets::gaction(label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.9,icon="close", handler=quitte,tooltip=get("msg",envir=envir_stacomi)$interface_Bilan_lot.9))
+ tooltip=gettext("boxplot"))
+ aTable=gWidgets::gaction(label=gettext("table"),
+ icon="dataframe",
+ handler=funtableBilan_carlot,
+ tooltip=gettext("dataframe"))
+ aQuit=gWidgets::gaction(label=gettext("Exit"),
+ icon="close",
+ handler=quitte,tooltip="Exit")
toolbarlist <- list(
plot=aPoint,
More information about the Stacomir-commits
mailing list