Plot for all station for 3 variables

plotting/panel.R

@@ -94,11 +94,15 @@ panel = function (df_data, df_meta, figdir, filedir_opt='', filename_opt='', var
         # Print code of the station for the current plotting
         print(paste("Plotting for sation :", code))
         
-        P = vector(mode='list', length=nbp)
+        nbg = nbp+1
+        P = vector(mode='list', length=nbg)
         # P = as.list(rep(void, nbp))
         # print(nbp)
         # print(P)
-
+        
+        gtext = text_panel(code, df_meta)
+        P[[1]] = gtext
+        
         for (i in 1:nbp) {
             df_data = list_df2plot[[i]]$data
             df_trend = list_df2plot[[i]]$trend
@@ -118,16 +122,18 @@ panel = function (df_data, df_meta, figdir, filedir_opt='', filename_opt='', var
             p = time_panel(code, df_data, df_trend, missRect,
                            p_threshold, unit2day, type)
 
-            P[[i]] = p
+            P[[i+1]] = p
 
         }
-        
-        gtext = text_panel(code, df_meta)
-        
 
-        plot = grid.arrange(gtext, P[[1]], P[[2]], P[[3]], P[[4]],
-                            heights=c(1/8, 1/8, 2/8, 2/8, 2/8), 
-                            ncol=1, nrow=5)
+        # plot = grid.arrange(gtext, P[[1]], P[[2]], P[[3]], P[[4]],
+                            # heights=c(1/8, 1/8, 2/8, 2/8, 2/8), 
+                            # ncol=1, nrow=5)
+
+        plot = grid.arrange(grobs=P,
+                            heights=c(rep(1/((nbg-2)*2+2), 2),
+                                      rep(2/((nbg-2)*2+2), nbg-2)), 
+                            ncol=1, nrow=nbg)
 
         # plot = grid.arrange(gtext, P[[1]], void, void, void,
                             # heights=c(1/7, 3/7, 1/7, 1/7, 1/7), 

processing/analyse.R

@@ -139,6 +139,8 @@ get_QMNAtrend = function (df_data, period) {
                             pos.datetime=1,
                             na.rm=TRUE)
 
+    print(df_QMNAEx)
+
     ### /!\ NOM DE COLONNE PAS CONSERVER ###
     df_QMNAlist = reprepare(df_QMNAEx, df_QMNAlist, colnamegroup=c('code'))
 
@@ -149,11 +151,13 @@ get_QMNAtrend = function (df_data, period) {
                             pos.datetime=1,
                             na.rm=TRUE)
 
+    print(df_QMNAEx)
+
     df_QMNAtrend = Estimate.stats(data.extract=df_QMNAEx)
 
     res_QMNAtrend = clean(df_QMNAtrend, df_QMNAEx, df_QMNAlist)
 
-    return (res_QAtrend)
+    return (res_QMNAtrend)
 }
 
 

processing/format.R

@@ -22,14 +22,16 @@ join = function (df_data_BH, df_data_NV, df_meta_BH, df_meta_NV) {
     } else if (is.null(df_data_NV) & !is.null(df_data_BH)) {
         df_meta = df_meta_BH
         df_data = df_data_BH
+        df_data_NVadd = NULL
     } else if (!is.null(df_data_NV) & is.null(df_data_BH)) {
         df_meta = df_meta_NV
         df_data = df_data_NV
+        df_data_NVadd = df_data_NV
     } else {
         stop('No data')
     }
     
-    return (list(data=df_data, meta=df_meta))
+    return (list(data=df_data, meta=df_meta, NVadd=df_data_NVadd))
 }
 
 

script.R

@@ -77,7 +77,7 @@ source('processing/extractNV.R')
 source('processing/format.R')
 source('processing/analyse.R')
 source('plotting/panel.R')
-source('plotting/layout.R')
+# source('plotting/layout.R')
 
 # Usefull library
 
@@ -147,7 +147,7 @@ df_meta = df_join$meta
 res_QAtrend = get_QAtrend(df_data, period)
 
 # QMNA TREND #
-# res_QMNAtrend = get_QMNAtrend(df_data, period)
+res_QMNAtrend = get_QMNAtrend(df_data, period)
 
 # VCN10 TREND #
 res_VCN10trend = get_VCN10trend(df_data, df_meta, period)

script_install.R

@@ -9,6 +9,8 @@ install.packages("lubridate")
 install.packages('zoo')
 install.packages("qpdf")
 install.packages("gridtext")
+install.packages("lubridate")
+
 
 library(devtools)
 install_github("https://github.com/benRenard/BFunk") #type '1'