Commit 5d8a37c9 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v0.2.10.15 UPDATE: in the GUI, the GR2M model diagram now displays the Ps flux...

v0.2.10.15 UPDATE: in the GUI, the GR2M model diagram now displays the Ps flux and the "Pn - Ps" label is replaced by "Pn" #14
parent eb529e77
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
Version: 0.2.10.14
Date: 2020-04-14
Version: 0.2.10.15
Date: 2020-04-16
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
person("Laurent", "Coron", role = c("aut"), comment = c(ORCID = "0000-0002-1503-6204")),
......
......@@ -4,7 +4,7 @@
### 0.2.10.14 Release Notes (2020-04-14)
### 0.2.10.16 Release Notes (2020-04-14)
#### New features
......
......@@ -326,13 +326,13 @@ if (getRversion() >= "2.15.1") {
segments(x0 = x_Ps, x1 = x_Ps,
y0 = y_rendement+2*tmp_decal, y1 = y_rendement)
# Pn vers Pn - Ps
# Pn vers Pn - Ps (P vers Pn si GR2M)
segments(x0 = xy_P[1], x1 = x_PnPs,
y0 = y_rendement+2*tmp_decal, y1 = y_rendement+2*tmp_decal)
segments(x0 = x_PnPs , x1 = x_PnPs,
y0 = y_rendement+2*tmp_decal, y1 = y_rendement)
# Pn - Ps vers Pr
# Pn - Ps vers Pr (Pn vers Pr si GR2M)
segments(x0 = x_PnPs, x1 = x_PnPs,
y0 = y_rendement, y1 = y_percolation)
......@@ -365,14 +365,18 @@ if (getRversion() >= "2.15.1") {
}
# Pn et Ps
points(x = x_Ps, y = y_rendement+1.2*tmp_decal,
type = "p", pch = tri_B, col = col_P,
cex = cex_tri(OutputsModel$Ps[i_pdt], fact = fact_triangle, max = cex_max_poly))
if (HydroModel != "GR2M") {
points(x = x_Ps, y = y_rendement+1.2*tmp_decal,
points(x = x_PnPs, y = y_rendement+1.2*tmp_decal,
type = "p", pch = tri_B, col = col_P,
cex = cex_tri(OutputsModel$Pn[i_pdt] - OutputsModel$Ps[i_pdt], fact = fact_triangle, max = cex_max_poly))
} else {
points(x = x_PnPs, y = y_rendement+1.2*tmp_decal,
type = "p", pch = tri_B, col = col_P,
cex = cex_tri(OutputsModel$Ps[i_pdt], fact = fact_triangle, max = cex_max_poly))
cex = cex_tri(OutputsModel$Pn[i_pdt], fact = fact_triangle, max = cex_max_poly))
}
points(x = x_PnPs, y = y_rendement+1.2*tmp_decal,
type = "p", pch = tri_B, col = col_P,
cex = cex_tri(OutputsModel$Pn[i_pdt] - OutputsModel$Ps[i_pdt], fact = fact_triangle, max = cex_max_poly))
# --------------------------------------------------------------------------------
......@@ -390,10 +394,10 @@ if (getRversion() >= "2.15.1") {
cex = cex_tri(OutputsModel$AE[i_pdt], fact = fact_triangle, max = cex_max_poly))
}
# Ps et Pn - Ps
# Ps et Pn - Ps (Ps et Pn si GR2M)
plotrix::boxed.labels(x = x_Ps , y = y_rendement, labels = "Ps" ,
bg = col_mod_bg, border = NA, xpad = xpad, ypad = ypad)
plotrix::boxed.labels(x = x_PnPs, y = y_rendement, labels = "Pn - Ps",
plotrix::boxed.labels(x = x_PnPs, y = y_rendement, labels = ifelse(HydroModel != "GR2M", "Pn - Ps", "Pn"),
bg = col_mod_bg, border = NA, xpad = xpad, ypad = ypad)
# Reservoir de production
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment