From c55345f3a7ab06de5dac80b6b51cb52121a27b0c Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Fri, 17 Apr 2020 16:10:39 +0200
Subject: [PATCH] v0.2.10.17 UPDATE: in the GUI, the GR2M model diagram now
displays the Pr flux #14
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/Utils.R | 13 +++++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 33879b5..49d5f7f 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
-Version: 0.2.10.16
+Version: 0.2.10.17
Date: 2020-04-17
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
diff --git a/NEWS.md b/NEWS.md
index 570173b..60a0248 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 0.2.10.16 Release Notes (2020-04-17)
+### 0.2.10.17 Release Notes (2020-04-17)
#### New features
diff --git a/R/Utils.R b/R/Utils.R
index 205752c..0e932fd 100644
--- a/R/Utils.R
+++ b/R/Utils.R
@@ -441,6 +441,19 @@ if (getRversion() >= "2.15.1") {
segments(x0 = x_PnPs, x1 = x_PnPs,
y0 = y_percolation, y1 = y_entreeUH+tmp_decal/2)
+
+ if (HydroModel == "GR2M") {
+ # Pr
+ plotrix::boxed.labels(x = x_PnPs, y = y_percolation, labels = "Pr",
+ bg = col_mod_bg, border = NA, xpad = xpad, ypad = ypad)
+ if (OutputsModel$PR[i_pdt] != 0) {
+ points(x = x_PnPs[1], y = y_entreeUH+tmp_decal,
+ type = "p", pch = tri_B, col = col_P,
+ cex = cex_tri(OutputsModel$PR[i_pdt], fact = fact_triangle, max = cex_max_poly))
+ }
+ }
+
+
if (HydroModel %in% c("GR4J", "GR6J")) {
# --------------------------------------------------------------------------------
--
GitLab