[Stacomir-commits] r269 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jan 31 21:40:28 CET 2017
Author: briand
Date: 2017-01-31 21:40:27 +0100 (Tue, 31 Jan 2017)
New Revision: 269
Modified:
pkg/stacomir/R/RefStades.r
pkg/stacomir/R/RefTaxon.r
pkg/stacomir/R/Refpar.r
pkg/stacomir/R/Refparqual.r
Log:
Some other bugs found
Modified: pkg/stacomir/R/RefStades.r
===================================================================
--- pkg/stacomir/R/RefStades.r 2017-01-31 20:11:08 UTC (rev 268)
+++ pkg/stacomir/R/RefStades.r 2017-01-31 20:40:27 UTC (rev 269)
@@ -105,9 +105,9 @@
stade_selectionne=get("refStades",envir_stacomi)@data$std_code)
if (exists("frame_parqual")) delete(group,frame_parqual)
- choice(objectBilan at parqual,label=gettext("Qualitative feature",
+ choice(objectBilan at parqual,label=gettext("Qualitative feature",domain="R-stacomiR"),
nomassign="refparqual",
- frameassign="frame_parqual",is.enabled=TRUE))
+ frameassign="frame_parqual",is.enabled=TRUE)
}
#il y a bien un object parquan dans l'object Bilan
if (class(try(objectBilan at parquan,silent=TRUE))!="try-error") {
@@ -193,9 +193,9 @@
dc_selectionne=get("refDC",envir_stacomi)@dc_selectionne,
taxon_selectionne=get("refTaxon",envir_stacomi)@data$tax_code,
stade_selectionne=get("refStades",envir_stacomi)@data$std_code)
- choicemult(objectBilan at parqual,label=gettext("Qualitative feature",
+ choicemult(objectBilan at parqual,label=gettext("Qualitative feature",domain="R-stacomiR"),
nomassign="refparqual",frameassign="frame_parqual",
- is.enabled=TRUE))
+ )
}
#il y a bien un object parquan dans l'object Bilan
if (class(try(objectBilan at parquan,silent=TRUE))!="try-error") {
@@ -211,9 +211,9 @@
is.na(objectBilan at parquan@data$par_code)|objectBilan at parquan@data$par_code=="C001",] # aucune
}
}
- choicemult(objectBilan at parquan,label=gettext("Quantitative feature",
+ choicemult(objectBilan at parquan,label=gettext("Quantitative feature",domain="R-stacomiR"),
nomassign="refparquan",frameassign="frame_parquan",
- is.enabled=TRUE))
+ is.enabled=TRUE)
}
if (svalue(notebook)<length(notebook)){
svalue(notebook)<-svalue(notebook)+1
@@ -228,11 +228,11 @@
groupstd<-ggroup()
assign("goupstd",groupstd,envir=.GlobalEnv)
add(notebook,groupstd,label="stade")
- framestdsource<-gframe(gettext("Stage selection",container=groupstd,domain="R-stacomiR"))
+ framestdsource<-gframe(gettext("Stage selection",domain="R-stacomiR"),container=groupstd)
tbsourcestd = gtable(std_libelle,container=framestdsource,expand = TRUE, fill = TRUE)
size(tbsourcestd)<-c(160,300)
#TODO addmsg
- framestddest<-gframe("deposez ici",container=groupstd)
+ framestddest<-gframe(gettext("drop here",domain="R-stacomiR"),container=groupstd)
# need for a fixed size data.frame otherwise errors when adding new lines
xx<-data.frame(choice=rep("",8))
xx$choice<-as.character(xx$choice)
@@ -295,7 +295,7 @@
funout(gettext("No value for argument stage\n",domain="R-stacomiR"),arret=TRUE)
}
libellemanquants<-stades[!stades%in%object at data$std_code]
- if (length(libellemanquants)>0&!silent) funout(gettextf("No data for this counting device and this taxon\n %s",stringr::str_c(libellemanquants,collapse=", ")))
+ if (length(libellemanquants)>0&!silent) funout(gettextf("No data for this counting device and this taxon\n %s",stringr::str_c(libellemanquants,collapse=", "),domain="R-stacomiR"))
object at data<-object at data[object at data$std_code%in%stades,]
if (nrow(object at data)==0 ) {
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/RefTaxon.r
===================================================================
--- pkg/stacomir/R/RefTaxon.r 2017-01-31 20:11:08 UTC (rev 268)
+++ pkg/stacomir/R/RefTaxon.r 2017-01-31 20:40:27 UTC (rev 269)
@@ -147,12 +147,12 @@
grouptaxon<-ggroup()
assign("grouptaxon",grouptaxon,.GlobalEnv)
add(notebook,grouptaxon,label="taxon")
- frametaxonsource<-gframe(gettext("Taxon selection",container=grouptaxon,domain="R-stacomiR"))
+ frametaxonsource<-gframe(gettext("Taxon selection",domain="R-stacomiR"),container=grouptaxon)
tbsourcetaxon = gtable(tax_libelle,container=frametaxonsource,expand = TRUE, fill = TRUE)
size(tbsourcetaxon)<-c(160,300) # les dimensions sont testees a la main
# pour s'ajuster aux dimensions du notebook (largeur 400)
#TODO addmsg
- frametaxondest<-gframe("deposez ici",container=grouptaxon)
+ frametaxondest<-gframe(gettext("drop here",domain="R-stacomiR"),container=grouptaxon)
# need for a fixed size data.frame otherwise errors when adding new lines
xx<-data.frame(choice=rep("",8))
xx$choice<-as.character(xx$choice)
@@ -215,11 +215,11 @@
funout(gettext("No value for argument taxon\n",domain="R-stacomiR"),arret=TRUE)
} else if (class(taxons)=="character"){
libellemanquants<-taxons[!taxons%in%object at data$tax_nom_latin]
- if (length(libellemanquants)>0) warning(gettextf("Taxa not present :\n %s",stringr::str_c(libellemanquants,collapse=", ")))
+ if (length(libellemanquants)>0) warning(gettextf("Taxa not present :\n %s",stringr::str_c(libellemanquants,collapse=", "),domain="R-stacomiR"))
object at data<-object at data[object at data$tax_nom_latin%in%taxons,]
} else if (class(taxons)=="numeric"){
codemanquants<-taxons[!taxons%in%object at data$tax_code]
- if (length(codemanquants)>0) warning(gettextf("Taxa not present :\n %s",stringr::str_c(codemanquants,collapse=", ")))
+ if (length(codemanquants)>0) warning(gettextf("Taxa not present :\n %s",stringr::str_c(codemanquants,collapse=", "),domain="R-stacomiR"))
object at data<-object at data[object at data$tax_code%in%taxons,]
}
if (nrow(object at data)==0 ) {
Modified: pkg/stacomir/R/Refpar.r
===================================================================
--- pkg/stacomir/R/Refpar.r 2017-01-31 20:11:08 UTC (rev 268)
+++ pkg/stacomir/R/Refpar.r 2017-01-31 20:40:27 UTC (rev 269)
@@ -157,7 +157,7 @@
concord<-object at par_selectionne%in%object at data$par_code
if (any(!concord)){
- warning(paste("No data for par",object at par_selectionne[!concord]))
+ warning(paste(gettextf("No data for par %s",object at par_selectionne[!concord],domain="R-stacomiR")))
}
assign("refpar",object,envir=envir_stacomi)
Modified: pkg/stacomir/R/Refparqual.r
===================================================================
--- pkg/stacomir/R/Refparqual.r 2017-01-31 20:11:08 UTC (rev 268)
+++ pkg/stacomir/R/Refparqual.r 2017-01-31 20:40:27 UTC (rev 269)
@@ -120,7 +120,7 @@
#' choice(object)
#' }
setMethod("choice",signature=signature("Refparqual"),definition=function(object,
- label="Choix d'une caracteristique qualitative de lot",
+ label=gettext("Choice of a sample characteristic",domain="R-stacomiR"),
nomassign="refpar",
frameassign="frame_par",
is.enabled=TRUE) {
More information about the Stacomir-commits
mailing list