diff --git a/DESCRIPTION b/DESCRIPTION index 70f369e392792366ac7565bad8a259de89dfe66e..3f365d0ed70a46ac9258824b3d6c07a1821ba958 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.11 +Version: 0.2.10.12 Date: 2020-04-14 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 9d48fef0c0135c2f3bc639af2ad9e15450dfc855..a3bed4b4f066bfea4be6fde0f14b8a25f0bc69dd 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 0.2.10.11 Release Notes (2020-04-14) +### 0.2.10.12 Release Notes (2020-04-14) #### New features diff --git a/inst/ShinyGR/server.R b/inst/ShinyGR/server.R index d2d57561a025a10b8782fdfb75c8fba8233b2734..1c00aed762d7588267f90d3a17de33222389c577 100644 --- a/inst/ShinyGR/server.R +++ b/inst/ShinyGR/server.R @@ -846,10 +846,17 @@ shinyServer(function(input, output, session) { # OutputsModel2 <- c(OutputsModel2, Qobs = list(getSim()$SIM$Qobs[IndPlot])) # OutputsModel2 <- getData()$OutputsModel + if (input$HydroModel == "GR2M") { + dd <- trunc(input$Period, units = "months") + dateEvent <- trunc(input$Event, units = "months") + } else { + dd <- trunc(input$Period, units = "days") + dateEvent <- trunc(input$Event, units = "months") + } par(getPlotPar()$par) try(.DiagramGR(OutputsModel = getData()$OutputsModel, Param = getSim()$PARAM, - SimPer = input$Period, EventDate = input$Event, + SimPer = dd, EventDate = dateEvent, HydroModel = input$HydroModel, CemaNeige = input$SnowModel == "CemaNeige"), silent = TRUE) }, bg = "transparent")