[Stacomir-commits] r256 - in pkg: stacomir/R stacomirtools/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Jan 28 13:29:47 CET 2017
Author: briand
Date: 2017-01-28 13:29:47 +0100 (Sat, 28 Jan 2017)
New Revision: 256
Modified:
pkg/stacomir/R/BilanAgedemer.r
pkg/stacomir/R/BilanArgentee.r
pkg/stacomir/R/BilanEspeces.r
pkg/stacomir/R/BilanOperation.r
pkg/stacomir/R/Bilan_stades_pigm.r
pkg/stacomir/R/Bilan_taille.r
pkg/stacomir/R/fungraph_civelle.r
pkg/stacomirtools/R/ConnectionODBC.r
pkg/stacomirtools/R/RequeteODBC.r
Log:
Modified: pkg/stacomir/R/BilanAgedemer.r
===================================================================
--- pkg/stacomir/R/BilanAgedemer.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomir/R/BilanAgedemer.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -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(get("msg",envir_stacomi)$BilanArgentee.3))
+ funout(gettext("Size (BL mm)"))
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/BilanArgentee.r
===================================================================
--- pkg/stacomir/R/BilanArgentee.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomir/R/BilanArgentee.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -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(get("msg",envir=envir_stacomi)$BilanArgentee.9),
- ylab=gettext(get("msg",envir=envir_stacomi)$BilanArgentee.10),
+ xlab=gettext("Size (mm)"),
+ ylab=gettext("Weight(g)"),
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)
@@ -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(get("msg",envir_stacomi)$BilanArgentee.3))
+ funout(gettext("Size (BL mm)"))
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/BilanEspeces.r
===================================================================
--- pkg/stacomir/R/BilanEspeces.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomir/R/BilanEspeces.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -284,7 +284,7 @@
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(get("msg",envir=envir_stacomi)$interface_BilanEspeces.5),action="graph"),
+ 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"))
)
Modified: pkg/stacomir/R/BilanOperation.r
===================================================================
--- pkg/stacomir/R/BilanOperation.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomir/R/BilanOperation.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -56,9 +56,8 @@
req at select<-paste("SELECT * FROM ",get("sch",envir=envir_stacomi),"t_operation_ope ")
req at and=paste("AND ope_dic_identifiant in",stringr::str_c("(",stringr::str_c(lesdc,collapse=","),")"))
req<-stacomirtools::connect(req) # appel de la methode connect de l'object ODBCWHEREDATE
- object at data<-req at query
-
- if (!silent) funout(gettext(get("msg",envir=envir_stacomi)$BilanOperation.1))
+ object at data<-req at query
+ if (!silent) funout(gettext("Loading data for operations"))
return(object)
})
Modified: pkg/stacomir/R/Bilan_stades_pigm.r
===================================================================
--- pkg/stacomir/R/Bilan_stades_pigm.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomir/R/Bilan_stades_pigm.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -876,7 +876,7 @@
aSetTitle=gWidgets::gaction(label="title",icon="rename",handler=funtitle_bilan_stades_pigm,tooltip=gettext("Title choice"))
aGraph=gWidgets::gaction(label="graph",icon="gWidgetsRGtk2-contour",handler=hfungraphstades,tooltip="Graphique Principal")
aGraphgg=gWidgets::gaction(label="graphgg",icon="gWidgetsRGtk2-bubbles",handler=fungraphgg,tooltip="Graphique supplementaire avec ggplot")
- aQuit=gWidgets::gaction(label=gettext("Exit",icon="close", handler=quitte,tooltip="Exit"))
+ aQuit=gWidgets::gaction(label=gettext("Exit"),icon="close", handler=quitte,tooltip="Exit")
toolbarlist <- list(
Calcul=aCalcul,
Modified: pkg/stacomir/R/Bilan_taille.r
===================================================================
--- pkg/stacomir/R/Bilan_taille.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomir/R/Bilan_taille.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -113,7 +113,7 @@
object at requete@sql=sql
#object at requete@where=#defini dans la methode ODBCwheredate
object at requete<-stacomirtools::connect(object at requete) # appel de la methode stacomirtools::connect de l'object requeteODBC
- funout(gettext(get("msg",envir=envir_stacomi)$l1))
+ funout(gettext("The query has been launched for Bilan_taille"))
return(object)
})
Modified: pkg/stacomir/R/fungraph_civelle.r
===================================================================
--- pkg/stacomir/R/fungraph_civelle.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomir/R/fungraph_civelle.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -140,7 +140,7 @@
xlab="",
xaxt="n",
yaxt="n",
- ylab=gettext(get("msg",envir=envir_stacomi)$fungraph_civelle.11),
+ ylab="Fishway",
bty="n",
cex=1.2)
@@ -165,7 +165,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,
Modified: pkg/stacomirtools/R/ConnectionODBC.r
===================================================================
--- pkg/stacomirtools/R/ConnectionODBC.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomirtools/R/ConnectionODBC.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -51,7 +51,7 @@
object at baseODBC<-get("baseODBC",envir=envir_stacomi)
} else {
if(exists("envir_stacomi")){# the program is called within stacomiR
- funout(get("msg",envir_stacomi)$ConnectionODBC.1,arret=TRUE)
+ funout(gettext(get("msg",envir_stacomi)$ConnectionODBC.1),arret=TRUE)
} else {
stop("you need to define a vector baseODBC with the ODBC link, user and password")
}
@@ -79,7 +79,7 @@
# sends the result of a trycatch connection in the
#l'object (current connection), e.g. a character vector
connection_error<-if(exists("envir_stacomi")){
- error=paste(get("msg",envir_stacomi)$ConnectionODBC.4,object at baseODBC[1])
+ error=paste(gettext(get("msg",envir_stacomi)$ConnectionODBC.4,object at baseODBC[1]))
} else {
error="impossible connection"
}
@@ -87,7 +87,7 @@
if (class(currentConnection)=="RODBC") {
if (!object at silent){
if(exists("envir_stacomi")){
- print(get("msg",envir_stacomi)$ConnectionODBC.5)
+ print(gettext(get("msg",envir_stacomi)$ConnectionODBC.5))
} else {
print("connection successful")
}
Modified: pkg/stacomirtools/R/RequeteODBC.r
===================================================================
--- pkg/stacomirtools/R/RequeteODBC.r 2017-01-27 14:45:54 UTC (rev 255)
+++ pkg/stacomirtools/R/RequeteODBC.r 2017-01-28 12:29:47 UTC (rev 256)
@@ -31,12 +31,12 @@
# the function is intended to work with stacomiR package but will work outside hence the workanyway function
if (exists("envir_stacomi")){
if (exists("msg",envir_stacomi)){
- msg1<-get("msg",envir=envir_stacomi)$RequeteODBC.1
- msg2<-get("msg",envir=envir_stacomi)$RequeteODBC.2
- msg3<-get("msg",envir=envir_stacomi)$RequeteODBC.3
- msg4<-get("msg",envir=envir_stacomi)$RequeteODBC.4
- msg5<-get("msg",envir=envir_stacomi)$RequeteODBC.5
- msg6<-get("msg",envir=envir_stacomi)$RequeteODBC.6
+ msg1<-gettext(get("msg",envir=envir_stacomi)$RequeteODBC.1)
+ msg2<-gettext(get("msg",envir=envir_stacomi)$RequeteODBC.2)
+ msg3<-gettext(get("msg",envir=envir_stacomi)$RequeteODBC.3)
+ msg4<-gettext(get("msg",envir=envir_stacomi)$RequeteODBC.4)
+ msg5<-gettext(get("msg",envir=envir_stacomi)$RequeteODBC.5)
+ msg6<-gettext(get("msg",envir=envir_stacomi)$RequeteODBC.6)
verbose<-exists("showmerequest",envir=envir_stacomi)
} else {
# msg not changed loaded at the beginning
More information about the Stacomir-commits
mailing list