[Stacomir-commits] r565 - pkg/stacomir/R

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

Author: briand
Date: 2020-08-03 12:18:50 +0200 (Mon, 03 Aug 2020)
New Revision: 565

Modified:
   pkg/stacomir/R/report_mig_interannual.R
Log:
256: bug affichage bmi civelles 
This should be fixed
Added information about host, port, and dbname when SILENT = FALSE
Task-Url: http://w3.eptb-vilaine.fr:8080/tracstacomi/ticket/256

Modified: pkg/stacomir/R/report_mig_interannual.R
===================================================================
--- pkg/stacomir/R/report_mig_interannual.R	2020-04-02 08:51:50 UTC (rev 564)
+++ pkg/stacomir/R/report_mig_interannual.R	2020-08-03 10:18:50 UTC (rev 565)
@@ -86,7 +86,21 @@
 			#---------------------------------------------------------------------------------------
 			# this function will be run several times if missing data or mismatching data are found
 			# later in the script (hence the encapsulation)
-			#---------------------------------------------------------------------------------------
+			
+			# if not silent display information about the connection 
+			if (!silent){
+				host <- get("sqldf.options",envir=envir_stacomi)["sqldf.RPostgreSQL.host"]
+				funout(gettextf("host:%s",host,domain="R-StacomiR"))
+				port <- get("sqldf.options",envir=envir_stacomi)["sqldf.RPostgreSQL.port"]		
+				funout(gettextf("port:%s",port,hostdomain="R-StacomiR"))
+				# getting the database name
+				dbname <- get("sqldf.options",envir=envir_stacomi)["sqldf.RPostgreSQL.dbname"]
+				funout(gettextf("dbname:%s",dbname,hostdomain="R-StacomiR"))				
+			}
+				
+				#---------------------------------------------------------------------------------------
+			
+			
 			fn_connect<-function(){
 				les_annees = (object at start_year@annee_selectionnee):(object at end_year@annee_selectionnee)
 				tax = object at taxa@data$tax_code
@@ -773,8 +787,8 @@
 						g <- g+geom_crossbar(data=newdat,aes_string(x=timesplit, 
 										y="moyenne",
 										ymin="mintab",ymax="maxtab"),fill="grey60",alpha=0.5,size=0.5,fatten=3,col="grey60")
-						g <- g+geom_bar(stat="identity",aes_string(ymin="valeur",ymax="valeur",col="comp"),fill=NA,width=0.6)
-						g <- g+geom_bar(stat="identity",aes_string(ymin="valeur",ymax="valeur",fill="comp"),alpha=0.5,width=0.6)
+						g <- g+geom_bar(stat="identity",aes_string(y="valeur",col="comp"),fill=NA,width=0.6)
+						g <- g+geom_bar(stat="identity",aes_string(y="valeur",fill="comp"),alpha=0.5,width=0.6)
 						#g <- g+scale_x_date(name=paste("mois"),breaks="month",minor_breaks=getvalue(new("ref_period"),label=date_format("%b"),timesplit))
 						#lim=as.POSIXct(c(Hmisc::truncPOSIXt((min(tmp[tmp$com!="0",timesplit])),"month")-delai,
 						#				Hmisc::ceil((max(tmp[tmp$com!="0",timesplit])),"month")+delai)) 
@@ -802,7 +816,7 @@
 						
 						g <- g+labs(title=paste(report_mig_interannual at taxa@data$tax_nom_latin, ",", 
 										report_mig_interannual at stage@data$std_libelle,
-										", report par", 
+										", bilan par", 
 										timesplit, 
 										unique(as.character(tmp$annee)), "/", amplitude))
 						g <- g+ theme_minimal()