[Stacomir-commits] r258 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jan 28 18:25:45 CET 2017
Author: briand
Date: 2017-01-28 18:25:45 +0100 (Sat, 28 Jan 2017)
New Revision: 258
Modified:
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_Bilan_taille.r
pkg/stacomir/R/interface_bilan_poids_moyen.r
Log:
Modified: pkg/stacomir/R/interface_BilanAgedemer.r
===================================================================
--- pkg/stacomir/R/interface_BilanAgedemer.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_BilanAgedemer.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -7,7 +7,7 @@
bilan_adm=new("BilanAgedemer")
assign("bilan_adm",bilan_adm,envir = envir_stacomi)
- funout(gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.1))
+ funout(gettext("Loading view vue_ope_lot, and choice of counting device and time steps\n"))
bilan_adm at dc=charge(bilan_adm at dc)
bilan_adm at taxons=charge(bilan_adm at taxons)
bilan_adm at stades=charge(bilan_adm at stades)
@@ -24,13 +24,13 @@
# appeller la methode choice pour l'affichage du fils si il existe
- choice(bilan_adm at horodatedebut,label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.3),
+ choice(bilan_adm at horodatedebut,label=gettext("Start"),
nomassign="bilan_adm_date_debut",
funoutlabel=gettext("Beginning date has been chosen\n"),
decal=-2)
- choice(bilan_adm at horodatefin,label=gettext("End of timestamp"),
+ choice(bilan_adm at horodatefin,label=gettext("End"),
nomassign="bilan_adm_date_fin",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.6),
+ funoutlabel=gettext("Ending date has been chosen\n"),
decal=-1)
bilan_adm at dc<-choice(bilan_adm at dc,objectBilan=bilan_adm,is.enabled=TRUE)
bilan_adm at limit1hm<-charge(bilan_adm at limit1hm,title="Limit s1 for 1sw (L(1sw)<=s1), click to edit",label="0")
@@ -64,8 +64,8 @@
handler=funplotBilanAgedemer,
action="4",
tooltip="4")
- asummary=gWidgets::gaction(label="summary",icon="dataframe",handler=funtableBilanAgedemer,tooltip="summary")
- 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))
+ asummary=gWidgets::gaction(label="Summary",icon="dataframe",handler=funtableBilanAgedemer,tooltip="Summary")
+ aquit=gWidgets::gaction(label=gettext("Exit",icon="close", handler=quitte,tooltip="Exit"))
toolbarlist <- list(
plot1= aplot1,
Modified: pkg/stacomir/R/interface_BilanAnnuels.r
===================================================================
--- pkg/stacomir/R/interface_BilanAnnuels.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_BilanAnnuels.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -29,13 +29,13 @@
choice(bilanAnnuels at anneedebut,
nomassign="anneedebut",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigrationInterannuelle.2),
- titleFrame=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigrationInterannuelle.3),
+ funoutlabel=gettext("The year of beginning has been chosen\n"),
+ titleFrame=gettext("First year"),
preselect=which(bilanAnnuels at anneedebut@data==min(bilanAnnuels at anneedebut@data)))
choice(bilanAnnuels at anneefin,
nomassign="anneefin",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigrationInterannuelle.4),
- titleFrame=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigrationInterannuelle.5),
+ funoutlabel=gettext("The last year has been chosen\n"),
+ titleFrame=gettext("Last year"),
preselect=which(bilanAnnuels at anneefin@data==max(bilanAnnuels at anneefin@data)))
choicemult(bilanAnnuels at dc,objectBilan=bilanAnnuels,is.enabled=TRUE)
svalue(notebook)<-1
@@ -45,10 +45,10 @@
gWidgets::add(ggroupboutons,ggroupboutonsbas)
toolbarlist = list(
- aGraph=gWidgets::gaction(label="barplot",icon="barplot",handler=hbarplotBilanAnnuels,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigrationInterannuelle.6)),
- aGraph2=gWidgets::gaction(label="plot",icon="plot",handler=hplotBilanAnnuels,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigrationInterannuelle.6)),
+ aGraph=gWidgets::gaction(label="barplot",icon="barplot",handler=hbarplotBilanAnnuels,tooltip=gettext("Migration of all the years in the same graphic")),
+ aGraph2=gWidgets::gaction(label="plot",icon="plot",handler=hplotBilanAnnuels,tooltip=gettext("Migration of all the years in the same graphic")),
aTable=gWidgets::gaction(handler=hxtableBilanAnnuels, icon="dataframe", label="xtable", tooltip="xtable"),
- aQuit=gWidgets::gaction(label="fermer",icon="close", handler=quitte,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigrationInterannuelle.9))
+ aQuit=gWidgets::gaction(label="fermer",icon="close", handler=quitte,tooltip=gettext("Exit"))
)
add(ggroupboutonsbas, gtoolbar(toolbarlist))
Modified: pkg/stacomir/R/interface_BilanArgentee.r
===================================================================
--- pkg/stacomir/R/interface_BilanArgentee.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_BilanArgentee.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -7,7 +7,7 @@
bilan_arg=new("BilanArgentee")
assign("bilan_arg",bilan_arg,envir = envir_stacomi)
- funout(gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.1))
+ funout(gettext("Loading view vue_ope_lot, and choice of counting device and time steps\n"))
bilan_arg at dc=charge(bilan_arg at dc)
bilan_arg at taxons=charge(bilan_arg at taxons)
bilan_arg at stades=charge(bilan_arg 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("Silver eel 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_arg at horodatedebut,label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.3),
+ choice(bilan_arg at horodatedebut,label=gettext("First date"),
nomassign="bilan_arg_date_debut",
- funoutlabel=gettext("Beginning date has been chosen\n"),
+ funoutlabel=gettext("The beginning date has been chosen\n"),
decal=-2)
- choice(bilan_arg at horodatefin,label=gettext("End of timestamp"),
+ choice(bilan_arg at horodatefin,label=gettext("Last date"),
nomassign="bilan_arg_date_fin",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.6),
+ funoutlabel=gettext("Ending date has been chosen\n"),
decal=-1)
bilan_arg at dc<-choice(bilan_arg at dc,objectBilan=bilan_arg,is.enabled=TRUE)
@@ -60,8 +60,8 @@
handler=funplotBilanArgentee,
action="4",
tooltip="4")
- asummary=gWidgets::gaction(label="summary",icon="dataframe",handler=funtableBilanArgentee,tooltip="summary")
- 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))
+ asummary=gWidgets::gaction(label=gettext("summary"),icon="dataframe",handler=funtableBilanArgentee,tooltip=gettext("summary"))
+ aquit=gWidgets::gaction(label=gettext("Exit"),icon="close", handler=quitte,tooltip=gettext("Exit"))
toolbarlist <- list(
plot1= aplot1,
Modified: pkg/stacomir/R/interface_BilanConditionEnv.r
===================================================================
--- pkg/stacomir/R/interface_BilanConditionEnv.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_BilanConditionEnv.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -6,7 +6,7 @@
{
quitte()
bilanConditionEnv=new("BilanConditionEnv")
- funout(gettext(get("msg",envir=envir_stacomi)$interface_BilanConditionEnv.1))
+ funout(gettext("Loading of the monitoring stations\n"))
bilanConditionEnv at stationMesure=charge(bilanConditionEnv at stationMesure)
assign("bilanConditionEnv",bilanConditionEnv,envir=envir_stacomi)
@@ -16,15 +16,15 @@
gWidgets::add(ggroupboutons,group)
# date de debut et de fin
- choice(bilanConditionEnv at horodate,label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.3),
+ choice(bilanConditionEnv at horodate,label=gettext("Begginning"),
nomassign="bilanConditionEnv_date_debut",
funoutlabel=gettext("Beginning date has been chosen\n"),
decal=-2,
affichecal=FALSE)
choice(bilanConditionEnv at horodate,
- label=gettext("End of timestamp"),
+ label=gettext("End"),
nomassign="bilanConditionEnv_date_fin",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.6),
+ funoutlabel=gettext("Ending date has been chosen\n"),
decal=-1,
affichecal=FALSE)
choice(bilanConditionEnv at stationMesure)
@@ -35,9 +35,9 @@
toolbarlist = list(
#Calc=gWidgets::gaction(handler=hbilanConditionEnvcalc , action=bilanConditionEnv,icon = "new",label="calcul",tooltip="calcul des conditions environnementales entre deux dates"),
- Graph=gWidgets::gaction(handler=hbilanConditionEnvgraph , icon = "graph",label="graph",tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanConditionEnv.2)),
- Stat =gWidgets::gaction(handler=hbilanConditionEnvstat , icon = "matrix",label="stat",tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanConditionEnv.3)),
- annuler=gWidgets::gaction(handler= quitte,icon = "close",label=gettext(get("msg",envir=envir_stacomi)$interface_BilanConditionEnv.4)))
+ Graph=gWidgets::gaction(handler=hbilanConditionEnvgraph , icon = "graph",label="graph",tooltip=gettext("Summary graphic")),
+ Stat =gWidgets::gaction(handler=hbilanConditionEnvstat , icon = "matrix",label="stat",tooltip=gettext("Summary tables in .csv")),
+ annuler=gWidgets::gaction(handler= quitte,icon = "close",label=gettext("Exit")))
gWidgets::add(ggroupboutonsbas, gtoolbar(toolbarlist))
gWidgets::addSpring(group)
#graphes=ggraphics(width=600,height=400)
Modified: pkg/stacomir/R/interface_BilanFonctionnementDC.r
===================================================================
--- pkg/stacomir/R/interface_BilanFonctionnementDC.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_BilanFonctionnementDC.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -9,7 +9,7 @@
bilanFonctionnementDC=new("BilanFonctionnementDC")
assign("bilanFonctionnementDC",bilanFonctionnementDC,envir=envir_stacomi)
- funout(gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.1))
+ funout(gettext("Loading of the list for fishways and choice of the time step\n"))
bilanFonctionnementDC at dc=charge(bilanFonctionnementDC at dc)
group <- gWidgets::ggroup(horizontal=FALSE) # doit toujours s'appeller group
@@ -19,36 +19,51 @@
gWidgets::add(ggroupboutons,group)
choice(bilanFonctionnementDC at dc)
choice(bilanFonctionnementDC at horodatedebut,
- label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.3),
+ label=gettext("Start"),
nomassign="bilanFonctionnementDC_date_debut",
funoutlabel=gettext("Beginning date has been chosen\n"),
decal=-2)
choice(bilanFonctionnementDC at horodatefin,
- label=gettext("End of timestamp"),
+ label=gettext("End"),
nomassign="bilanFonctionnementDC_date_fin",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.6),
+ funoutlabel=gettext("Ending date has been chosen\n"),
decal=-1)
#toolbarlist$Calc$handler = connect(bilanFonctionnementDC)
#toolbarlist$Calc$icon = "dataframe"
#getStockIcons(toolkit=guiToolkit())
- aBarchart=gWidgets::gaction(label="barchart",icon="barplot",handler=funbarchartDC,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.2) )
- aBarchart1=gWidgets::gaction(label="barchart_fct",icon="barplot",handler=funbarchart1DC,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.2) )
-
- aBox=gWidgets::gaction(label="boites",icon="graph2",handler=funboxDC,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.3))
- aTable=gWidgets::gaction(label="table",icon="dataframe",handler=funtableDC,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.4))
- aQuit=gWidgets::gaction(label="Quitter",icon="close", handler=quitte,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.5))
- aOut=gWidgets::gaction(label="code",handler=houtDC, icon="gtk-info", tooltip=gettext(get("msg",envir=envir_stacomi)$BilanMigrationMult.1) )
-
+ aBarchart=gWidgets::gaction(label="barchart",
+ icon="barplot",
+ handler=funbarchartDC,
+ tooltip=gettext("Monthly graph"))
+ aBarchart1=gWidgets::gaction(label="barchart_fct",
+ icon="barplot",
+ handler=funbarchart1DC,
+ tooltip=gettext("Another monthly graph"))
+ aBox=gWidgets::gaction(label=getext("box"),
+ icon="graph2",
+ handler=funboxDC,
+ tooltip=gettext("Boxplot"))
+ aTable=gWidgets::gaction(label=gettext("table"),
+ icon="dataframe",
+ handler=funtableDC,
+ tooltip=gettext("Table"))
+ aQuit=gWidgets::gaction(label="Quitter",
+ icon="close",
+ handler=quitte,
+ tooltip=gettext("Exit"))
+ aOut=gWidgets::gaction(label=gettex("code"),
+ handler=houtDC,
+ icon="gtk-info",
+ tooltip=gettext("code"))
toolbarlist <- list(
barchart=aBarchart,
barchart1=aBarchart1,
box= aBox,
table=aTable,
out=aOut,
- Quit = aQuit)
-
+ Quit = aQuit)
add(group, gmenu(toolbarlist))
gWidgets::addSpring(group)
}
\ No newline at end of file
Modified: pkg/stacomir/R/interface_BilanFonctionnementDF.r
===================================================================
--- pkg/stacomir/R/interface_BilanFonctionnementDF.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_BilanFonctionnementDF.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -6,7 +6,7 @@
bilanFonctionnementDF=new("BilanFonctionnementDF")
assign("bilanFonctionnementDF",bilanFonctionnementDF,envir=envir_stacomi)
- funout(gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.1))
+ funout(gettext("Loading of the list for fishways and choice of the time step\n"))
bilanFonctionnementDF at df=charge(bilanFonctionnementDF at df)
group <- gWidgets::ggroup(horizontal=FALSE) # doit toujours s'appeller group
assign("group",group,envir=.GlobalEnv)
@@ -15,23 +15,23 @@
choice(bilanFonctionnementDF at df)
# here decale =-1 or -2 will make the bilan for the year preceeding the current date
choice(bilanFonctionnementDF at horodatedebut,
- label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.3),
+ label=gettext("start"),
nomassign="bilanFonctionnementDF_date_debut",
- funoutlabel=gettext("Beginning date has been chosen\n"),
+ funoutlabel=gettext("The beginning date has been chosen\n"),
decal=-2)
choice(bilanFonctionnementDF at horodatefin,
- label=gettext("End of timestamp"),
+ label=gettext("End"),
nomassign="bilanFonctionnementDF_date_fin",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.6),
+ funoutlabel=gettext("The ending date has been chosen\n"),
decal=-1)
- aBarchart=gWidgets::gaction(label="barchart_typefct",icon="barplot",handler=funbarchartDF,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.2) )
- aBarchart1=gWidgets::gaction(label="barchart_fct",icon="barplot",handler=funbarchart1DF,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.2) )
- aBox=gWidgets::gaction(label="box",icon="graph2",handler=funboxDF,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.3))
- aChart=gWidgets::gaction(label="chart",icon="graph",handler=funchartDF,tooltip="Calendar")
- aTable=gWidgets::gaction(label="table",icon="dataframe",handler=funtableDF,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.4))
- aOut=gWidgets::gaction(label="code",handler=houtDF, icon="gtk-info", tooltip=gettext(get("msg",envir=envir_stacomi)$BilanMigrationMult.1) )
- aQuit=gWidgets::gaction(label="Close",icon="close", handler=quitte,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanFonctionnementDC.5))
+ aBarchart=gWidgets::gaction(label="barchart_typefct",icon="barplot",handler=funbarchartDF,tooltip=gettext("Monthly graph"))
+ aBarchart1=gWidgets::gaction(label="barchart_fct",icon="barplot",handler=funbarchart1DF,tooltip=gettext("Monthly graph"))
+ aBox=gWidgets::gaction(label="box",icon="graph2",handler=funboxDF,tooltip=gettext("Boxplot"))
+ aChart=gWidgets::gaction(label="chart",icon="graph",handler=funchartDF,tooltip=gettext("Calendar"))
+ aTable=gWidgets::gaction(label="table",icon="dataframe",handler=funtableDF,tooltip=gettext("Table"))
+ aOut=gWidgets::gaction(label="code",handler=houtDF, icon="gtk-info", tooltip=gettext("Code"))
+ aQuit=gWidgets::gaction(label="Close",icon="close", handler=quitte,tooltip=gettext("Exit"))
toolbarlist <- list(
barchart=aBarchart,
Modified: pkg/stacomir/R/interface_BilanMigration.r
===================================================================
--- pkg/stacomir/R/interface_BilanMigration.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_BilanMigration.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -20,7 +20,7 @@
# this is used internally by refDC
objectBilan="bilanMigration"
assign("objectBilan",objectBilan,envir=envir_stacomi)
- funout(gettext(get("msg",envir=envir_stacomi)$interface_BilanMigration.1))
+ funout(gettext("Loading of the lists for taxons, stages and counting devices\n"))
bilanMigration at taxons=charge(bilanMigration at taxons)
bilanMigration at stades=charge(bilanMigration at stades)
bilanMigration at dc=charge(bilanMigration at dc)
@@ -33,12 +33,12 @@
assign("ggroupboutonsbas",ggroupboutonsbas,envir=.GlobalEnv)
gWidgets::add(ggroupboutons,ggroupboutonsbas)
toolbarlist = list(
- Calc=gWidgets::gaction(handler=hbilanMigrationcalc, action=bilanMigration, icon="new", label="calcul", tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigration.2)),
- Graph=gWidgets::gaction(handler=hbilanMigrationgraph, icon="graph", label="graph", tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigration.3)),
- Graph2=gWidgets::gaction(handler=hbilanMigrationgraph2, icon="graph2", label="grcum", tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigration.4)),
- Stat=gWidgets::gaction(handler=hTableBilanMigration, icon="dataframe", label="stat", tooltip=gettext(get("msg",envir=envir_stacomi)$interface_BilanMigration.5)),
- write=gWidgets::gaction(handler=hbilanMigrationwrite, icon="gtk-harddisk", label="write", tooltip=gettext(get("msg",envir=envir_stacomi)$fn_EcritBilanJournalier.5)),
- Out=gWidgets::gaction(handler=houtBilanMigration, icon="gtk-info", label="code", tooltip=gettext(get("msg",envir=envir_stacomi)$BilanMigrationMult.1)),
+ Calc=gWidgets::gaction(handler=hbilanMigrationcalc, action=bilanMigration, icon="new", label=gettext("calculate"), tooltip=gettext("Calculation of numbers by time step")),
+ Graph=gWidgets::gaction(handler=hbilanMigrationgraph, icon="graph", label=gettext("graph"), tooltip=gettext("Balance graphic")),
+ Graph2=gWidgets::gaction(handler=hbilanMigrationgraph2, icon="graph2", label=gettext("grcum"), tooltip=gettext("Cumulative graphic")),
+ Stat=gWidgets::gaction(handler=hTableBilanMigration, icon="dataframe", label=gettext("stat"), tooltip=gettext("Balance sheet in .csv")),
+ write=gWidgets::gaction(handler=hbilanMigrationwrite, icon="gtk-harddisk", label=gettext("write"), tooltip=gettext("Writing daily summary in the database")),
+ Out=gWidgets::gaction(handler=houtBilanMigration, icon="gtk-info", label=gettext("code"), tooltip=gettext("Code")),
annuler=gWidgets::gaction(handler= quitte,icon = "close",label="quitter")
)
gWidgets::add(ggroupboutonsbas, gtoolbar(toolbarlist))
Modified: pkg/stacomir/R/interface_Bilan_taille.r
===================================================================
--- pkg/stacomir/R/interface_Bilan_taille.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_Bilan_taille.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -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(get("msg",envir=envir_stacomi)$interface_Bilan_taille.1,container=group))
+ gl=glabel(text=gettext("Size report",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)
@@ -23,23 +23,23 @@
choice(bilan_taille at horodate,
- label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.3),
+ label=gettext("First timestamp"),
nomassign="bilan_taille_date_debut",
- funoutlabel=gettext("Beginning date has been chosen\n"),
+ funoutlabel=gettext("The beginning date has been chosen\n"),
decal=-2,
affichecal=FALSE)
choice(bilan_taille at horodate,
- label=gettext("End of timestamp"),
+ label=gettext("Last timestamp"),
nomassign="bilan_taille_date_fin",
- funoutlabel=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.6),
+ funoutlabel=gettext("The ending date has been chosen\n"),
decal=-1,
affichecal=FALSE)
choice(bilan_taille at dc,objectBilan=bilan_taille,is.enabled=TRUE)
- aGrint=gWidgets::gaction(label="ggplot",icon="gWidgetsRGtk2-bubbles",handler=fungraphInteract_tail,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.7))
- aTable=gWidgets::gaction(label="table",icon="dataframe",handler=funtableBilan_tail,tooltip=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_lot.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))
- aCalc=gWidgets::gaction(handler=hcalculeBilanTaille,action=bilan_taille,icon = "new",label="calcul",tooltip=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_taille.2))
+ aGrint=gWidgets::gaction(label="ggplot",icon="gWidgetsRGtk2-bubbles",handler=fungraphInteract_tail,tooltip=gettext("dotplot"))
+ aTable=gWidgets::gaction(label=gettext("table"),icon="dataframe",handler=funtableBilan_tail,tooltip=gettext("Table"))
+ aQuit=gWidgets::gaction(label=gettext("Exit"),icon="close", handler=quitte,tooltip=gettext("Exit"))
+ aCalc=gWidgets::gaction(handler=hcalculeBilanTaille,action=bilan_taille,icon = "new",label="calcul",tooltip=gettext("crossed query length / qualitative feature"))
toolbarlist <- list(
# barchart=aBarchart,
Calc=aCalc,
Modified: pkg/stacomir/R/interface_bilan_poids_moyen.r
===================================================================
--- pkg/stacomir/R/interface_bilan_poids_moyen.r 2017-01-28 15:04:15 UTC (rev 257)
+++ pkg/stacomir/R/interface_bilan_poids_moyen.r 2017-01-28 17:25:45 UTC (rev 258)
@@ -8,12 +8,12 @@
bilPM at dc=charge(bilPM at dc)
bilPM at anneedebut=charge(bilPM at anneedebut)
bilPM at anneefin=charge(bilPM at anneefin)
- bilPM at liste=charge(object=bilPM at liste,listechoice=c("=1",">1","tous"),label=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_poids_moyen.5))
+ bilPM at liste=charge(object=bilPM at liste,listechoice=c("=1",">1",gettext("tous")),label=gettext("choice of number in sample (one, several, all"))
# choice of number type
group <- gWidgets::ggroup(horizontal=FALSE) # must always be named group
assign("group",group,envir = .GlobalEnv)
gWidgets::add(ggroupboutons,group)
- gl=glabel(text=gettext(get("msg",envir=envir_stacomi)$interface_Bilan_poids_moyen.1,container=group))
+ gl=glabel(text=gettext("Mean weight report"),container=group)
### first toobar
gWidgets::addSpring(group)
More information about the Stacomir-commits
mailing list