[Stacomir-commits] r268 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jan 31 21:11:08 CET 2017
Author: briand
Date: 2017-01-31 21:11:08 +0100 (Tue, 31 Jan 2017)
New Revision: 268
Modified:
pkg/stacomir/R/BilanEspeces.r
pkg/stacomir/R/Bilan_poids_moyen.r
pkg/stacomir/R/Bilan_stades_pigm.r
pkg/stacomir/R/PasdeTemps.r
pkg/stacomir/R/RefDC.r
pkg/stacomir/R/RefDF.r
pkg/stacomir/R/RefStades.r
pkg/stacomir/R/RefTaxon.r
pkg/stacomir/R/interface_BilanArgentee.r
pkg/stacomir/R/interface_BilanMigration.r
pkg/stacomir/R/interface_Bilan_taille.r
Log:
Pb BilanMigration solved
Modified: pkg/stacomir/R/BilanEspeces.r
===================================================================
--- pkg/stacomir/R/BilanEspeces.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/BilanEspeces.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -283,7 +283,7 @@
gWidgets::add(ggroupboutons,ggroupboutonsbas)
toolbarlist = list(
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"),
+ 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"))
Modified: pkg/stacomir/R/Bilan_poids_moyen.r
===================================================================
--- pkg/stacomir/R/Bilan_poids_moyen.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/Bilan_poids_moyen.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -82,7 +82,7 @@
object at coe@datefin=requete at datefin
object at coe<-charge(object at coe)
funout(gettext("The query to load the coefficients of conversion is finished\n",domain="R-stacomiR"))
- funout(gettextf("%1.0f lines found for the conversion coefficients\n",nrow(object at coe)))
+ funout(gettextf("%1.0f lines found for the conversion coefficients\n",nrow(object at coe),domain="R-stacomiR"))
assign(x="bilan_poids_moyen",value=object,envir=envir_stacomi)
return(object)
})
@@ -194,7 +194,7 @@
"duree","datemoy"),
c("lot","date","date_fin","effectif","poids","w","time.sequence","date"))
# correction de manques d'effectifs dans la base
- if (sum(is.na(donnees$effectif))>0) warnings(gettextf("size is missing, lots %s",paste(unique(donnees$lot[is.na(donnees$effectif)]),collapse=" ")))
+ if (sum(is.na(donnees$effectif))>0) warnings(gettextf("size is missing, lots %s",paste(unique(donnees$lot[is.na(donnees$effectif)]),collapse=" "),domain="R-stacomiR"))
bilPM at calcdata[["data"]]<-donnees[,c(8,6,4,1)]
bilPM at calcdata[["coe"]]<-coeff[order(coeff$date),c(10,9)]
assign("bilan_poids_moyen",bilPM,envir=envir_stacomi)
@@ -254,7 +254,7 @@
main=gettextf("Seasonal trend of %s, from %s to %s",
type_poids,
bilPM at anneedebut@annee_selectionnee,
- bilPM at anneefin@annee_selectionnee))
+ bilPM at anneefin@annee_selectionnee,domain="R-stacomiR"))
points(coe$date,coe$w,type="l",col="black",lty=2)
#legend("topright",c("Obs.", "Coeff base"), col=c("black","cyan"),pch="o",cex = 0.8)
@@ -438,7 +438,7 @@
colnames(summary_harmonic)=c("source","$\\gamma$","$s_0(cm)$","$\\phi$")
xt_summary_harmonic<-xtable( summary_harmonic,
caption=gettext("Comparison of the coefficients obtained by \\citet{desaunay_seasonal_1997} and in the present modelling
- of estuarine samples."),
+ of estuarine samples.",domain="R-stacomiR"),
label=gettext("summary_harmonic",domain="R-stacomiR"),
digits=c(0,0,3,3,0))
tabname<-stringr::str_c(get("datawd",envir=envir_stacomi),"/summary_harmonic.tex")
@@ -474,7 +474,7 @@
utils::write.table(import_coe,file=fileout, row.names = FALSE,sep=";")
assign("import_coe",import_coe,envir=envir_stacomi)
funout(gettext("To obtain the table, type : import_coe=get(import_coe\",envir_stacomi",domain="R-stacomiR"))
- funout(paste(gettextf("data directory :%s",fileout)))
+ funout(paste(gettextf("data directory :%s",fileout,domain="R-stacomiR")))
bilPM at calcdata[["import_coe"]]<-import_coe
Modified: pkg/stacomir/R/Bilan_stades_pigm.r
===================================================================
--- pkg/stacomir/R/Bilan_stades_pigm.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/Bilan_stades_pigm.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -497,8 +497,8 @@
strftime(as.POSIXlt(dates[length(dates)]),"%Y")) {
strftime(as.POSIXlt(dates[1]),"%Y")} else { paste(
strftime(as.POSIXlt(dates[1]),"%Y"),"-",
- strftime(as.POSIXlt(dates[length(dates)]),"%Y"))})
- bilan_stades_pigm at labelretro=gettext("incoming dates in estuary")
+ strftime(as.POSIXlt(dates[length(dates)]),"%Y"))},domain="R-stacomiR")
+ bilan_stades_pigm at labelretro=gettext("incoming dates in estuary",domain="R-stacomiR")
enabled(toolbarlist[["SetTitle"]])<-TRUE
enabled(toolbarlist[["Graph"]])<-TRUE
enabled(toolbarlist[["Graphgg"]])<-TRUE
@@ -817,7 +817,7 @@
group1<-gWidgets::ggroup(horizontal=FALSE,container=wintitle)
titre1 <- gWidgets::glabel(text= gettext("Pigmentary sages graph title (graphstades = TRUE)",domain="R-stacomiR"), editable=FALSE,container=group1)
titre2 <- gWidgets::gtext( text= bilan_stades_pigm at labelgraphstades,font.attr= c(foreground.colors="blueblue"),height=40,container=group1)
- titre3 <- gWidgets::glabel(text= "Titre du graphique de retrocalcul quand il est seul (graphstades = FALSE)", editable=FALSE,container=group1)
+ titre3 <- gWidgets::glabel(text= gettext("Titre du graphique de retrocalcul quand il est seul (graphstades = FALSE)",domain="R-stacomiR"), editable=FALSE,container=group1)
titre4 <- gWidgets::gtext(text= bilan_stades_pigm at labelretro, editable=TRUE,height=40,container=group1)
aOK=gWidgets::gaction(label="OK",icon="gtk-ok",handler=hgettext)
Modified: pkg/stacomir/R/PasdeTemps.r
===================================================================
--- pkg/stacomir/R/PasdeTemps.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/PasdeTemps.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -341,7 +341,7 @@
assign("groupdate",groupdate,envir=.GlobalEnv)
winpa=gframe(gettext("Time steps choice",domain="R-stacomiR"),container=groupdate,horizontal=FALSE)
pg<-ggroup(horizontal=FALSE,container=winpa)
- glabel("Date de debut",container=pg)
+ glabel(gettext("Starting date",domain="R-stacomiR"),container=pg)
datedeb<-gedit(getdateDebut(object),container=pg,handler=hchoicepas,width=15)
datedebut2=as.character(strftime(object at dateDebut,"%Y-%m-%d"))
datedeb2<-gcalendar(datedebut2,container=pg,handler=function(h,...){
@@ -355,7 +355,7 @@
choicepas=gdroplist(pas_libelle,selected = 8,container=winpa,handler=hchoicepas)
glabel(gettext("Number of time steps choice",domain="R-stacomiR"),container=winpa)
choicenbStep=gedit("365",container=winpa,coerce.with=as.numeric,handler=hchoicepas,width=15)
- datedefin<-gtext(gettext("End date",domain="R-stacomiR"),height=50,container=winpa) # Date de fin)
+ datedefin<-gtext(gettext("Ending date",domain="R-stacomiR"),height=50,container=winpa) # Date de fin)
gbutton("OK", container=winpa,handler=hwinpa,icon="execute")
} else funout(gettext("Internal error : no entry in time steps table\n",domain="R-stacomiR"), arret=TRUE)
})
Modified: pkg/stacomir/R/RefDC.r
===================================================================
--- pkg/stacomir/R/RefDC.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/RefDC.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -128,7 +128,7 @@
}
# Handler d'affichage du tableau
hDCi=function(h,...){
- w=gwindow(gettext("Counting devices data",width=400,domain="R-stacomiR"))
+ w=gwindow(gettext("Counting devices data",domain="R-stacomiR",width=400))
wg=ggroup(horizontal=FALSE,container=w)
tab=gtable(object at data[,c(1,4,7,8,11,12)],chosencol=1,multiple=FALSE,expand=TRUE, container=wg)
bg<-ggroup(container=wg)
@@ -139,7 +139,7 @@
add(group,frame_DC)
DC_identifiant=object at data$dc
choice=gdroplist(DC_identifiant,container=frame_DC,handler=hDC)
- gbutton(gettext("Table", container=frame_DC,handler=hDCi) )
+ gbutton(gettext("Table",domain="R-stacomiR"), container=frame_DC,handler=hDCi)
enabled(frame_DC)<-is.enabled
gbutton("OK", container=frame_DC,handler=hDC)
} else {
@@ -202,7 +202,7 @@
dispose(notebook) ## dispose current tab
}}
choicemult(objectBilan at taxons,objectBilan,is.enabled=TRUE)
- funout(gettext("Select taxa for this counting device (for all periods)\n") )
+ funout(gettext("Select taxa for this counting device (for all periods)\n",domain="R-stacomiR"))
}
}
# changing tab of notebook to next tab
@@ -260,7 +260,7 @@
addHandlerDoubleclick(tbdestdc,handler=function(h,...) {
removedc()
})
- gbutton("ok", container = groupdc, handler = hDC)
+ gbutton("OK", container = groupdc, handler = hDC)
} else {
funout(gettext("Error : no counting device in the database (the query returns 0 entry)\n",domain="R-stacomiR"),arret=TRUE)
}
Modified: pkg/stacomir/R/RefDF.r
===================================================================
--- pkg/stacomir/R/RefDF.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/RefDF.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -101,7 +101,7 @@
frameDF=gframe(gettext("Fishway choice",domain="R-stacomiR"),container=group)
DF_identifiant=object at data$df
choice=gdroplist(DF_identifiant,container=frameDF,handler=hDF)
- gbutton(gettext("Table"), container=frameDF,handler=hDFi)
+ gbutton(gettext("Table",domain="R-stacomiR"), container=frameDF,handler=hDFi)
gbutton("OK", container=frameDF,handler=hDF)
} else {
funout(gettext("No fishway in the database (the query returns 0 entry)\n",domain="R-stacomiR"),arret=TRUE)
Modified: pkg/stacomir/R/RefStades.r
===================================================================
--- pkg/stacomir/R/RefStades.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/RefStades.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -268,7 +268,7 @@
addHandlerDoubleclick(tbdeststd,handler=function(h,...) {
removestd()
})
- gbutton("ok", container = groupstd, handler = hstd)
+ gbutton("OK", container = groupstd, handler = hstd)
} else {
funout(gettext("Error : no counting device in the database (the query returns 0 entry)\n",domain="R-stacomiR"),arret=TRUE)
}
Modified: pkg/stacomir/R/RefTaxon.r
===================================================================
--- pkg/stacomir/R/RefTaxon.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/RefTaxon.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -188,7 +188,7 @@
addHandlerDoubleclick(tbdesttaxon,handler=function(h,...) {
removetaxon()
})
- gbutton("ok", container = grouptaxon, handler = htax)
+ gbutton("OK", container = grouptaxon, handler = htax)
} else {
funout(gettext("Stop there is no line in the taxons table (problem with the ODBC link ?)\n",domain="R-stacomiR"),arret=TRUE)
}
Modified: pkg/stacomir/R/interface_BilanArgentee.r
===================================================================
--- pkg/stacomir/R/interface_BilanArgentee.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/interface_BilanArgentee.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -17,7 +17,7 @@
assign("group",group,envir = .GlobalEnv)
gWidgets::add(ggroupboutons,group)
- gl=glabel(text=gettext("Silver eel summary",container=group,domain="R-stacomiR"))
+ gl=glabel(text=gettext("Silver eel summary",domain="R-stacomiR"),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)
Modified: pkg/stacomir/R/interface_BilanMigration.r
===================================================================
--- pkg/stacomir/R/interface_BilanMigration.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/interface_BilanMigration.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -28,18 +28,18 @@
assign("group",group,envir = .GlobalEnv)
add(ggroupboutons,group)
choice(bilanMigration at pasDeTemps)
- choice(bilanMigration at dc,objectBilan=bilanMigration,is.enabled=TRUE)
+ choice(object=bilanMigration at dc,objectBilan=bilanMigration,is.enabled=TRUE)
ggroupboutonsbas = gWidgets::ggroup(horizontal=FALSE)
assign("ggroupboutonsbas",ggroupboutonsbas,envir=.GlobalEnv)
gWidgets::add(ggroupboutons,ggroupboutonsbas)
toolbarlist = list(
- Calc=gWidgets::gaction(handler=hbilanMigrationcalc, action=bilanMigration, icon="new", label=gettext("calculate",,domain="R-stacomiR"), tooltip=gettext("Calculation of numbers by time step",domain="R-stacomiR")),
+ Calc=gWidgets::gaction(handler=hbilanMigrationcalc, action=bilanMigration, icon="new", label=gettext("calculate",domain="R-stacomiR"), tooltip=gettext("Calculation of numbers by time step",domain="R-stacomiR")),
Graph=gWidgets::gaction(handler=hbilanMigrationgraph, icon="graph", label=gettext("graph",domain="R-stacomiR"), tooltip=gettext("Balance graphic",domain="R-stacomiR")),
Graph2=gWidgets::gaction(handler=hbilanMigrationgraph2, icon="graph2", label=gettext("grcum",domain="R-stacomiR"), tooltip=gettext("Cumulative graphic",domain="R-stacomiR")),
Stat=gWidgets::gaction(handler=hTableBilanMigration, icon="dataframe", label=gettext("stat",domain="R-stacomiR"), tooltip=gettext("Balance sheet in .csv",domain="R-stacomiR")),
write=gWidgets::gaction(handler=hbilanMigrationwrite, icon="gtk-harddisk", label=gettext("write",domain="R-stacomiR"), tooltip=gettext("Writing daily summary in the database",domain="R-stacomiR")),
Out=gWidgets::gaction(handler=houtBilanMigration, icon="gtk-info", label=gettext("code",domain="R-stacomiR"), tooltip=gettext("Code",domain="R-stacomiR")),
- annuler=gWidgets::gaction(handler= quitte,icon = "close",label=gettext("quit"),domain="R-stacomiR")
+ annuler=gWidgets::gaction(handler= quitte,icon = "close",label=gettext("quit",domain="R-stacomiR"))
)
gWidgets::add(ggroupboutonsbas, gtoolbar(toolbarlist))
gWidgets::addSpring(group)
Modified: pkg/stacomir/R/interface_Bilan_taille.r
===================================================================
--- pkg/stacomir/R/interface_Bilan_taille.r 2017-01-31 19:32:07 UTC (rev 267)
+++ pkg/stacomir/R/interface_Bilan_taille.r 2017-01-31 20:11:08 UTC (rev 268)
@@ -15,7 +15,7 @@
group <- gWidgets::ggroup(horizontal=FALSE) # doit toujours s'appeller group
assign("group",group,envir = .GlobalEnv)
add(ggroupboutons,group)
- gl=glabel(text=gettext("Size report",container=group,domain="R-stacomiR"))
+ gl=glabel(text=gettext("Size report",domain="R-stacomiR"),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)
More information about the Stacomir-commits
mailing list