From 3ba12138165792d899ceb541471da29b9e39d56f Mon Sep 17 00:00:00 2001
From: "louis.heraut" <louis.heraut@inrae.fr>
Date: Sun, 23 Jan 2022 23:54:13 +0100
Subject: [PATCH] INI variable
---
plotting/layout.R | 4 +++-
script.R | 13 ++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/plotting/layout.R b/plotting/layout.R
index 469b133..e46e4d5 100644
--- a/plotting/layout.R
+++ b/plotting/layout.R
@@ -233,7 +233,9 @@ datasheet_layout = function (df_data, df_meta, layout_matrix,
# If datasheets needs to be plot
if ('datasheet' %in% toplot) {
+
datasheet_panel(list_df2plot, df_meta, trend_period, info_header=info_header, time_header=time_header, layout_matrix=layout_matrix, info_ratio=info_ratio, time_ratio=time_ratio, var_ratio=var_ratio, outdirTmp=outdirTmp)
+
}
# If summarize matrix needs to be plot
@@ -251,7 +253,7 @@ datasheet_layout = function (df_data, df_meta, layout_matrix,
outdirTmp=outdirTmp,
margin=margin(t=5, r=0, b=5, l=5, unit="mm"))
}
-
+
# Combine independant pages into one PDF
pdf_combine(input=file.path(outdirTmp, list.files(outdirTmp)),
output=file.path(outdir, outfile))
diff --git a/script.R b/script.R
index bd33b66..d48b522 100644
--- a/script.R
+++ b/script.R
@@ -66,7 +66,8 @@ filename =
# "S4214010_HYDRO_QJM.txt",
# "Q7002910_HYDRO_QJM.txt",
# "O3035210_HYDRO_QJM.txt",
- # "O3121010_HYDRO_QJM.txt"
+ # "O3121010_HYDRO_QJM.txt"
+ # "O7635010_HYDRO_QJM.txt"
# )
@@ -134,6 +135,7 @@ source('processing/extract.R', encoding='UTF-8')
source('processing/format.R', encoding='UTF-8')
source('processing/analyse.R', encoding='UTF-8')
source('plotting/layout.R', encoding='UTF-8')
+source('processing/results_manager.R', encoding='UTF-8')
# Result directory
resdir = file.path(computer_work_path, 'results')
@@ -247,11 +249,12 @@ res_VCN10trend = get_VCN10trend(df_data, df_meta,
# res_tINItrend = get_tINItrend(df_data, df_meta,
# period=trend_period,
# p_thresold=p_thresold)
+res_tINItrend = read_listofdf(resdir, 'res_tINItrend')
# Center date for low water trend
-# res_tMIDtrend = get_tMIDtrend(df_data, df_meta,
- # period=trend_period,
- # p_thresold=p_thresold)
+res_tMIDtrend = get_tMIDtrend(df_data, df_meta,
+ period=trend_period,
+ p_thresold=p_thresold)
### 3.3. Break analysis
# df_break = get_break(res_QAtrend$data, df_meta)
@@ -271,7 +274,7 @@ df_shapefile = ini_shapefile(computer_data_path,
fr_shpdir, fr_shpname,
bs_shpdir, bs_shpname,
sbs_shpdir, sbs_shpname,
- rv_shpdir, rv_shpname, riv=FALSE)
+ rv_shpdir, rv_shpname, riv=TRUE)
### 4.1. Simple time panel to criticize station data
# Plot time panel of debit by stations
--
GitLab