[Stacomir-commits] r358 - in pkg/stacomir: R inst/examples

[noreply at r-forge.r-project.org]

Author: briand
Date: 2017-05-08 19:47:50 +0200 (Mon, 08 May 2017)
New Revision: 358

Modified:
   pkg/stacomir/R/BilanMigrationCar.r
   pkg/stacomir/R/Bilan_poids_moyen.r
   pkg/stacomir/R/fungraph_civelle.r
   pkg/stacomir/R/interface_BilanMigrationCar.r
   pkg/stacomir/inst/examples/bilanMigrationCar-example.R
   pkg/stacomir/inst/examples/bilanMigrationMult_Arzal.R
Log:


Modified: pkg/stacomir/R/BilanMigrationCar.r
===================================================================
--- pkg/stacomir/R/BilanMigrationCar.r	2017-05-08 13:37:07 UTC (rev 357)
+++ pkg/stacomir/R/BilanMigrationCar.r	2017-05-08 17:47:50 UTC (rev 358)
@@ -405,7 +405,7 @@
 						theme_bw()
 				
 				assign("g",g,envir_stacomi)
-				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"))
 				print(g)
 			} #end plot.type = "qual"
 			if (plot.type=="quant") { 
@@ -424,7 +424,7 @@
 								guide = "legend")+
 						theme_bw()
 				assign("g",g,envir_stacomi)
-				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"))
 				print(g)
 			} #end plot.type="quant"
 			if (plot.type=="crossed") { 
@@ -444,7 +444,7 @@
 								guide = "legend")+
 						theme_bw()
 				assign("g",g,envir_stacomi)
-				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"))
 				print(g)
 			} #end plot.type="xyplot"
 		})

Modified: pkg/stacomir/R/Bilan_poids_moyen.r
===================================================================
--- pkg/stacomir/R/Bilan_poids_moyen.r	2017-05-08 13:37:07 UTC (rev 357)
+++ pkg/stacomir/R/Bilan_poids_moyen.r	2017-05-08 17:47:50 UTC (rev 358)
@@ -376,7 +376,7 @@
 						theme_minimal()+
 						theme(panel.border = element_blank(),
 								axis.line = element_line())+
-						xlab("Jour dans la saison, debut au 1er août")#,
+						xlab("Jour dans la saison, debut au 1er aout")#,
 				#plot.background=element_rect(fill="darkseagreen"))#,
 				#panel.background = element_rect(fill = "grey90", colour = NA))
 				

Modified: pkg/stacomir/R/fungraph_civelle.r
===================================================================
--- pkg/stacomir/R/fungraph_civelle.r	2017-05-08 13:37:07 UTC (rev 357)
+++ pkg/stacomir/R/fungraph_civelle.r	2017-05-08 17:47:50 UTC (rev 358)
@@ -242,7 +242,7 @@
 		legend(  x= "bottom",
 				legend= gettext("Unknown working","Unknow operation type",domain="R-stacomiR"),
 				pch=c(16,16),
-				col=c(grey,grey40),
+				col=c("grey","grey40"),
 				horiz=TRUE,
 				bty="n"
 		)

Modified: pkg/stacomir/R/interface_BilanMigrationCar.r
===================================================================
--- pkg/stacomir/R/interface_BilanMigrationCar.r	2017-05-08 13:37:07 UTC (rev 357)
+++ pkg/stacomir/R/interface_BilanMigrationCar.r	2017-05-08 17:47:50 UTC (rev 358)
@@ -16,7 +16,7 @@
 	bilanMigrationPar at dc=charge(bilanMigrationPar at dc)
 	bilanMigrationPar at parquan=charge(bilanMigrationPar at parquan)
 	bilanMigrationPar at parqual=charge(bilanMigrationPar at parqual)
-	#TODO transformer la valeur logique de échantillon en un refchoix correct (radiobutton)
+	#TODO transformer la valeur logique de echantillon en un refchoix correct (radiobutton)
 	bilanMigrationPar at echantillon=charge(bilanMigrationPar at echantillon,vecteur=gettext("with","without",domain="R-stacomiR"),
 			label=gettext("Choice of batch type, inclusion of samples ?",domain="R-stacomiR"), 
 					selected=as.integer(1))

Modified: pkg/stacomir/inst/examples/bilanMigrationCar-example.R
===================================================================
--- pkg/stacomir/inst/examples/bilanMigrationCar-example.R	2017-05-08 13:37:07 UTC (rev 357)
+++ pkg/stacomir/inst/examples/bilanMigrationCar-example.R	2017-05-08 17:47:50 UTC (rev 358)
@@ -27,6 +27,7 @@
 }	
 # load the dataset generated by previous lines
 data("bmC")
+# age will be plotted as a qualitative variable
 bmC<-setasqualitative(bmC,par='A124',breaks=c(0,1.5,2.5,10),label=c("age 1","age 2","age 3"))
 bmC<-calcule(bmC,silent=TRUE)
 plot(bmC,plot.type="quant",silent=TRUE)

Modified: pkg/stacomir/inst/examples/bilanMigrationMult_Arzal.R
===================================================================
--- pkg/stacomir/inst/examples/bilanMigrationMult_Arzal.R	2017-05-08 13:37:07 UTC (rev 357)
+++ pkg/stacomir/inst/examples/bilanMigrationMult_Arzal.R	2017-05-08 17:47:50 UTC (rev 358)
@@ -59,7 +59,7 @@
 #changing the reference table names to english should shift all to english.
 #same for spanish.
 # combined plot for ggplot2
-plot(bMM_Arzal,plot.type="multiple"=silent=TRUE)
+plot(bMM_Arzal,plot.type="multiple",silent=TRUE)
 # data will be written in the data directory specified in 
 # the stacomi/calcmig.csv file
 \dontrun{