v0.1.9.17 missing exchange added on exp. store when plotting GR6J model diagram in ShinyGR

DESCRIPTION

 Package: airGRteaching
 Type: Package
 Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface)
-Version: 0.1.9.16
-Date: 2018-01-26
+Version: 0.1.9.17
+Date: 2018-01-29
 Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb")))
 Depends: airGR (>= 1.0.9.43)
 Imports: devtools, dygraphs (>= 1.1.1.4), markdown, plotrix, shiny, shinyjs, xts

R/Utils.R

@@ -686,8 +686,8 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, HydroModel) {
   arrows(x0 = xy_min_ROUT[1]+base_res, x1 = 1025,
          y0 = y_Ech_Q9               , y1 = y_Ech_Q9,
          length = 0.075, angle = 20, code = 3)
-  pch = ifelse(OutputsModel$AExch1[i_pdt] < 0, tri_R, tri_L)
-  points(x = xy_min_ROUT[1]+base_res+100, y = y_Ech_Q9,
+  pch <- ifelse(OutputsModel$AExch1[i_pdt] < 0, tri_R, tri_L)
+  points(x = xy_min_ROUT[1]+base_res+130, y = y_Ech_Q9,
          type = "p", pch = pch, col = col_P,
          cex = cex_tri(OutputsModel$AExch1[i_pdt], fact = fact_triangle, max = cex_max_poly))
   
@@ -695,10 +695,21 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, HydroModel) {
   arrows(x0 = xy_Q1[1], x1 = 1025,
          y0 = y_Ech_Q1, y1 = y_Ech_Q1,
          length = 0.075, angle = 20, code = 3)
-  pch = ifelse(OutputsModel$AExch2[i_pdt] < 0, tri_R, tri_L)
+  pch <- ifelse(OutputsModel$AExch2[i_pdt] < 0, tri_R, tri_L)
   points(x = xy_Q1[1]+100, y = y_Ech_Q1,
          type = "p", pch = pch, col = col_P,
-         cex = cex_tri(OutputsModel$AExch2[i_pdt], fact = fact_triangle, max = cex_max_poly))  
+         cex = cex_tri(OutputsModel$AExch2[i_pdt], fact = fact_triangle, max = cex_max_poly)) 
+  
+  # Actual exchange Q9 exp.
+  if (HydroModel%in% c("GR6J")) {
+    arrows(x0 = xy_min_EXPO[1]+base_res[1], x1 = 1025,
+           y0 = xy_min_EXPO[2], y1 = xy_min_EXPO[2],
+           length = 0.075, angle = 20, code = 3)
+    pch <- ifelse(OutputsModel$Exch[i_pdt] < 0, tri_R, tri_L)
+    points(x = xy_Q1[1]+100, y = xy_min_EXPO[2],
+           type = "p", pch = pch, col = col_P,
+           cex = cex_tri(OutputsModel$Exch[i_pdt], fact = fact_triangle, max = cex_max_poly)) 
+  }
   
   if (HydroModel%in% c("GR4J", "GR6J")) {