diff --git a/plotting/panel.R b/plotting/panel.R index f52008299b1042f687827ed01a91477438416346..dfea80c1ecc5a3efe7f4352393469cd1c68a07b1 100644 --- a/plotting/panel.R +++ b/plotting/panel.R @@ -1017,7 +1017,7 @@ matrice_panel = function (list_df2plot, df_meta, trend_period, mean_period, slic nMat = as.integer(nsubCodefL/slice) + 1 - print(nMat) + # print(nMat) for (imat in 1:nMat) { subCode = subCodefL[(slice*(imat-1)+1):(slice*imat)] @@ -1482,9 +1482,9 @@ map_panel = function (list_df2plot, df_meta, computer_data_path, fr_shpdir, fr_s df_bassin = tibble(fortify(bassin)) # Réseau hydrographique - # river = readOGR(dsn=rv_shppath, verbose=FALSE) ### trop long ### - # river = river[which(river$Classe == 1),] - # df_river = tibble(fortify(river)) + river = readOGR(dsn=rv_shppath, verbose=FALSE) ### trop long ### + river = river[which(river$Classe == 1),] + df_river = tibble(fortify(river)) nbp = length(list_df2plot) @@ -1618,9 +1618,9 @@ map_panel = function (list_df2plot, df_meta, computer_data_path, fr_shpdir, fr_s aes(x=long, y=lat, group=group), color=NA, fill="grey97") + - # geom_path(data=df_river, - # aes(x=long, y=lat, group=group), - # color="grey85", size=0.3) + + geom_path(data=df_river, + aes(x=long, y=lat, group=group), + color="grey85", size=0.3) + geom_polygon(data=df_bassin, aes(x=long, y=lat, group=group), diff --git a/script.R b/script.R index 09c9e59bf323698bda0917c7fdbe243403189a22..fb06055c392cbec52faaafec7cefa6439f66bc8d 100644 --- a/script.R +++ b/script.R @@ -142,7 +142,7 @@ if (AGlistname != ""){ filename = df_selec_AG[df_selec_AG$ok,]$filename ##### - filename = filename[(1):(25)] + filename = filename[(1):(20)] ##### # Extract metadata about selected stations @@ -234,7 +234,7 @@ res_VCN10trend = get_VCN10trend(df_data, df_meta, # figdir=figdir, # filename_opt='time') -panels_layout(isplot=c('matrix'), +panels_layout(isplot=c('datasheet', 'matrix', 'map'), df_data=list(res_QAtrend$data, res_QMNAtrend$data, res_VCN10trend$data), layout_matrix=c(1, 2, 3),