[Stacomir-commits] r267 - pkg/stacomir/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jan 31 20:32:07 CET 2017
Author: briand
Date: 2017-01-31 20:32:07 +0100 (Tue, 31 Jan 2017)
New Revision: 267
Modified:
pkg/stacomir/R/BilanAnnuels.r
pkg/stacomir/R/BilanMigrationInterAnnuelle.r
pkg/stacomir/R/PasDeTempsJournalier.r
Log:
Correction d'une erreur li?\195?\169e ?\195?\160 un gettext parenth?\195?\168se mal ferm?\195?\169e, bilanmigration
Modified: pkg/stacomir/R/BilanAnnuels.r
===================================================================
--- pkg/stacomir/R/BilanAnnuels.r 2017-01-31 18:38:05 UTC (rev 266)
+++ pkg/stacomir/R/BilanAnnuels.r 2017-01-31 19:32:07 UTC (rev 267)
@@ -420,11 +420,7 @@
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){
@@ -433,11 +429,7 @@
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){
@@ -446,11 +438,7 @@
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){
@@ -459,11 +447,7 @@
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){
@@ -473,11 +457,7 @@
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){
@@ -486,11 +466,7 @@
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){
@@ -499,11 +475,7 @@
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){
@@ -521,11 +493,7 @@
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 18:38:05 UTC (rev 266)
+++ pkg/stacomir/R/BilanMigrationInterAnnuelle.r 2017-01-31 19:32:07 UTC (rev 267)
@@ -256,11 +256,7 @@
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
@@ -352,11 +348,7 @@
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
@@ -442,7 +434,7 @@
g<-g+ theme_minimal()
print(g, vp=vplayout(1,1))
assign(paste("g",1,sep=""),g,envir_stacomi)
- if (!silent) funout(gettextf("Writing the graphical object into envir_stacomi environment : write g=get(\"gi\",envir_stacomi) with \" i=%s",paste(1:length(the_choice),collapse=",")))
+ if (!silent) funout(gettextf("\"Writing the graphical object into envir_stacomi environment : write g=get(gi\",envir_stacomi) with \" i=%s",paste(1:length(the_choice),collapse=",")))
} # end if
@@ -517,7 +509,7 @@
g<-g+ theme_minimal()
print(g, vp=vplayout(1,1))
assign(paste("g",1,sep=""),g,envir_stacomi)
- if (!silent) funout(gettextf("writing the graphical object into envir_stacomi environment : write g=get(\"gi\",envir_stacomi) with i=%s",paste(1:length(the_choice),collapse=",")))
+ if (!silent) funout(gettextf("\"Writing the graphical object into envir_stacomi environment : write g=get(gi\",envir_stacomi) with \" i=%s",paste(1:length(the_choice),collapse=",")))
} # end if
#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -565,11 +557,7 @@
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/PasDeTempsJournalier.r
===================================================================
--- pkg/stacomir/R/PasDeTempsJournalier.r 2017-01-31 18:38:05 UTC (rev 266)
+++ pkg/stacomir/R/PasDeTempsJournalier.r 2017-01-31 19:32:07 UTC (rev 267)
@@ -68,7 +68,7 @@
funout(gettext("Time steps loaded\n",domain="R-stacomiR"))
#dispose(winpa)
}
- winpa=gframe(gettext("Time steps choice (1 year duration)",container=group,horizontal=FALSE,domain="R-stacomiR"))
+ winpa=gframe(gettext("Time steps choice (1 year duration)",domain="R-stacomiR"),container=group,horizontal=FALSE)
pg<-glayout(container=winpa)
pg[1,1]<-glabel(gettext("Start date",domain="R-stacomiR"))
datedeb<-gedit(as.Date(getdateDebut(object)),handler=hwinpa,width=10)
@@ -81,7 +81,7 @@
pg[3,2]<-glabel(gettext("Number of days",domain="R-stacomiR"))
choicenbStep=gedit("365",coerce.with=as.numeric,handler=hwinpa,width=5)
pg[4,2]<-choicenbStep
- pg[1,2]<-glabel(gettext("End date",container=pg,domain="R-stacomiR"))
+ pg[1,2]<-glabel(gettext("End date",domain="R-stacomiR"),container=pg)
datedefin<-gedit("...",width=10) # heigth=30
enabled(datedefin)<-FALSE
pg[2,2]<-datedefin
More information about the Stacomir-commits
mailing list