diff --git a/plotting/panel.R b/plotting/panel.R index 2183d16665c32787889cd95f190d71529bcc7979..76ed6a651d043736e3bfedd56059c1c5c4b1f2f1 100644 --- a/plotting/panel.R +++ b/plotting/panel.R @@ -1375,7 +1375,7 @@ matrice_panel = function (list_df2plot, df_meta, trend_period, mean_period, slic code = subCode[k] name = df_meta[df_meta$code == code,]$nom - ncharMax = 40 + ncharMax = 38 if (nchar(name) > ncharMax) { name = paste(substr(name, 1, ncharMax), '...', sep='') } @@ -1619,7 +1619,7 @@ map_panel = function (list_df2plot, df_meta, df_shapefile, idPer=1, outdirTmp='' ymin = gpct(5, ylim, shift=TRUE) ymax = ymin + gpct(1, ylim) size = 3 - sizekm = 3 + sizekm = 2.5 } else { xmin = gpct(5, xlim, shift=TRUE) xint = c(0, 100*1E3) @@ -1667,6 +1667,7 @@ map_panel = function (list_df2plot, df_meta, df_shapefile, idPer=1, outdirTmp='' fill = c() shape = c() trend = c() + p_threshold_Ok = c() for (code in Code) { @@ -1734,6 +1735,8 @@ map_panel = function (list_df2plot, df_meta, df_shapefile, idPer=1, outdirTmp='' fill = c(fill, filltmp) shape = c(shape, shapetmp) trend = c(trend, trendMean) + p_threshold_Ok = c(p_threshold_Ok, + df_trend_code_per$p <= p_threshold) } @@ -1872,6 +1875,8 @@ map_panel = function (list_df2plot, df_meta, df_shapefile, idPer=1, outdirTmp='' yTrend = (trend - minTrendMean[idPer, i]) / (maxTrendMean[idPer, i] - minTrendMean[idPer, i]) * valNorm + + yTrend = yTrend[p_threshold_Ok] xTrend = rnorm(length(yTrend), mean=1.75, sd=0.1) plot_trend = tibble(xTrend=xTrend, yTrend=yTrend) diff --git a/script.R b/script.R index 4e0a9ae72729009c2420ab202694731bcea352fd..8bfe70ffa69bcfd078fff6ce9e5b6b0e4c1e3294 100644 --- a/script.R +++ b/script.R @@ -22,7 +22,7 @@ filedir = ### MANUAL SELECTION ### # Name of the file that will be analysed from the AG directory filename = - # "" + "" # c( # "S2235610_HYDRO_QJM.txt", @@ -32,9 +32,9 @@ filename = # "Q7002910_HYDRO_QJM.txt" # ) - c("S4214010_HYDRO_QJM.txt", - "O0384010_HYDRO_QJM.txt", - "Q7002910_HYDRO_QJM.txt") + # c("S4214010_HYDRO_QJM.txt", + # "O0384010_HYDRO_QJM.txt", + # "Q7002910_HYDRO_QJM.txt") @@ -44,8 +44,8 @@ AGlistdir = "" AGlistname = - "" - # "Liste-station_RRSE.docx" + # "" + "Liste-station_RRSE.docx" ### NIVALE SELECTION ### @@ -235,13 +235,13 @@ res_VCN10trend = get_VCN10trend(df_data, df_meta, # filename_opt='time') -# df_shapefile = ini_shapefile(computer_data_path, fr_shpdir, fr_shpname, bs_shpdir, bs_shpname, rv_shpdir, rv_shpname, riv=FALSE) +df_shapefile = ini_shapefile(computer_data_path, fr_shpdir, fr_shpname, bs_shpdir, bs_shpname, rv_shpdir, rv_shpname, riv=TRUE) panels_layout(isplot=c( - 'datasheet' - # 'matrix' - # 'map' + 'datasheet', + 'matrix', + 'map' ), df_data=list(res_QAtrend$data, res_QMNAtrend$data, res_VCN10trend$data),