diff --git a/plotting/layout.R b/plotting/layout.R index 1f4c725e7560755f4b387ca386582316819f13b3..6211d69af631889c72bb17287b274ae5aa337831 100644 --- a/plotting/layout.R +++ b/plotting/layout.R @@ -49,7 +49,6 @@ source('plotting/datasheet.R', encoding='UTF-8') source('plotting/map.R', encoding='UTF-8') source('plotting/matrix.R', encoding='UTF-8') source('plotting/break.R', encoding='UTF-8') -source('plotting/color_manager.R', encoding='UTF-8') source('plotting/tools.R', encoding='UTF-8') diff --git a/processing/extract.R b/processing/extract.R index ba0ac8e51d8a666976b7b3e53da7bb8c3067834f..d52307a35fe9488f63e7a4ad8bf99ca99124da57 100644 --- a/processing/extract.R +++ b/processing/extract.R @@ -489,7 +489,9 @@ extract_data = function (computer_data_path, filedir, filename, df_data = tibble(Date=as.Date(as.character(df_data$Date), format="%Y%m%d"), Value=df_data$Qls * 1E-3, - df_data[-1:-2], + Qmmj=df_data$Qmmj, + val_H=as.character(df_data$val_H), + val_I=as.character(df_data$val_I), code=code) return (df_data) diff --git a/script.R b/script.R index a79824a90e9a88368938a0e9075e0d34b7c7ff89..b59d74f1bc67206eafd084b9e7fda650a079f903 100644 --- a/script.R +++ b/script.R @@ -55,21 +55,21 @@ filedir = # Name of the file that will be analysed from the BH directory # (if 'all', all the file of the directory will be chosen) filename = - # "" + "" # "all" - c( + # c( # "S2235610_HYDRO_QJM.txt", # "P1712910_HYDRO_QJM.txt", # "P0885010_HYDRO_QJM.txt", # "O5055010_HYDRO_QJM.txt", # "O0384010_HYDRO_QJM.txt", # "S4214010_HYDRO_QJM.txt", - "Q7002910_HYDRO_QJM.txt", - "Q0214010_HYDRO_QJM.txt" + # "Q7002910_HYDRO_QJM.txt", + # "Q0214010_HYDRO_QJM.txt" # "O3035210_HYDRO_QJM.txt", # "O0554010_HYDRO_QJM.txt", # "O1584610_HYDRO_QJM.txt" - ) + # ) ## AGENCE EAU ADOUR GARONNE SELECTION @@ -79,8 +79,8 @@ AEAGlistdir = "" AEAGlistname = - "" - # "Liste-station_RRSE.docx" + # "" + "Liste-station_RRSE.docx" ## NIVALE SELECTION @@ -91,9 +91,8 @@ INRAElistdir = "" INRAElistname = - "" - # "example.txt" - # "INRAE_selection.txt" + # "" + "INRAE_selection.txt" ## TREND ANALYSIS @@ -133,7 +132,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') +source('processing/read_write.R', encoding='UTF-8') # Result directory resdir = file.path(computer_work_path, 'results') @@ -373,9 +372,9 @@ df_shapefile = ini_shapefile(resources_path, ### 5.2. Analysis layout _____________________________________________ datasheet_layout(toplot=c( - 'datasheet', - 'matrix', - 'map' + 'datasheet' + # 'matrix', + # 'map' ), df_meta=df_meta,