[Stacomir-commits] r266 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jan 31 19:38:05 CET 2017
Author: briand
Date: 2017-01-31 19:38:05 +0100 (Tue, 31 Jan 2017)
New Revision: 266
Modified:
pkg/stacomir/R/BilanAnnuels.r
pkg/stacomir/R/BilanMigrationInterAnnuelle.r
pkg/stacomir/R/Bilan_carlot.r
pkg/stacomir/R/Bilan_poids_moyen.r
Log:
Modified: pkg/stacomir/R/BilanAnnuels.r
===================================================================
--- pkg/stacomir/R/BilanAnnuels.r 2017-01-31 17:12:11 UTC (rev 265)
+++ pkg/stacomir/R/BilanAnnuels.r 2017-01-31 18:38:05 UTC (rev 266)
@@ -420,7 +420,11 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
} else if (length(lestax)==1 & length(lesstd)==1){
@@ -429,7 +433,11 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
} else if (length(lestax)==1 & length(lesdic)==1){
@@ -438,7 +446,11 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
} else if (length(lesdic)==1 & length(lesstd)==1){
@@ -447,7 +459,11 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
} else if (length(lestax)==1){
@@ -457,7 +473,11 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
} else if (length(lesstd)==1){
@@ -466,7 +486,11 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
} else if (length(lesdic)==1){
@@ -475,7 +499,11 @@
theme_bw()
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
} else {
if (length(lesdic)<3){
@@ -493,7 +521,11 @@
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
}
}
}
Modified: pkg/stacomir/R/BilanMigrationInterAnnuelle.r
===================================================================
--- pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-01-31 17:12:11 UTC (rev 265)
+++ pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-01-31 18:38:05 UTC (rev 266)
@@ -256,7 +256,11 @@
scale_x_datetime(name="date")
print(g)
assign("g",g,envir=envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
} else if (plot.type=="standard"){
dat=bilanMigrationInterAnnuelle at data
@@ -348,7 +352,11 @@
g<-g+scale_colour_hue(name=gettext("year",domain="R-stacomiR"),l=70, c=150)# annee
print(g)
assign("g",g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
} else if (plot.type=="barchart"){
dat=bilanMigrationInterAnnuelle at data
@@ -557,7 +565,11 @@
g<-g+ theme_minimal()
print(g)
assign(paste("g",sep=""),g,envir_stacomi)
+<<<<<<< .mine
+ if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get('g',envir_stacomi)\n",domain="R-stacomiR"))
+=======
if (!silent) funout(gettext("Writing the graphical object into envir_stacomi environment : write g=get(\"g\",envir_stacomi)\n",domain="R-stacomiR"))
+>>>>>>> .r265
} else {
if (!silent) funout(gettext("Warning : you have to complete a migration summary for at least one of the selected year before launching a inter-annual summary",domain="R-stacomiR"))
Modified: pkg/stacomir/R/Bilan_carlot.r
===================================================================
--- pkg/stacomir/R/Bilan_carlot.r 2017-01-31 17:12:11 UTC (rev 265)
+++ pkg/stacomir/R/Bilan_carlot.r 2017-01-31 18:38:05 UTC (rev 266)
@@ -152,12 +152,12 @@
bilan_carlot at par<-choice_c(bilan_carlot at par,par,silent=silent)
bilan_carlot at horodatedebut<-choice_c(object=bilan_carlot at horodatedebut,
nomassign="bilan_carlot_date_debut",
- funoutlabel=gettext("Beginning date has been chosen\n"),
+ funoutlabel=gettext("Beginning date has been chosen\n",domain="R-stacomiR"),
horodate=horodatedebut,
silent=silent)
bilanFonctionnementDC at horodatefin<-choice_c(bilanFonctionnementDC at horodatefin,
nomassign="bilan_carlot_date_fin",
- funoutlabel=gettext("Ending date has been chosen\n"),
+ funoutlabel=gettext("Ending date has been chosen\n",domain="R-stacomiR"),
horodate=horodatefin,
silent=silent)
return(bilan_carlot)
Modified: pkg/stacomir/R/Bilan_poids_moyen.r
===================================================================
--- pkg/stacomir/R/Bilan_poids_moyen.r 2017-01-31 17:12:11 UTC (rev 265)
+++ pkg/stacomir/R/Bilan_poids_moyen.r 2017-01-31 18:38:05 UTC (rev 266)
@@ -451,7 +451,7 @@
width="0.6\\textwidth",
sanitize.colnames.function=function(x){x})
- funout(gettextf("summary coefficients written in %s",tabname))
+ funout(gettextf("summary coefficients written in %s",tabname,domain="R-stacomiR"))
} else if (model.type=="manual"){
if (!silent) funout(gettext("Table for predictions newcoe assigned to envir_stacomi",domain="R-stacomiR"))
More information about the Stacomir-commits
mailing list