diff --git a/DESCRIPTION b/DESCRIPTION index 7626952c1bfd7e4866ba23c16a84750878f0ab02..0fc062bcdba6239bdee8aa05dfb8e6d2685e0afe 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.29 +Version: 0.2.10.30 Date: 2020-04-29 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 5f09f5eca32ae86b1495e841c8ca3746fd29a409..3a226d0f018a381833521142e3774e80d1ba862d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 0.2.10.29 Release Notes (2020-04-29) +### 0.2.10.30 Release Notes (2020-04-29) #### New features diff --git a/inst/ShinyGR/server.R b/inst/ShinyGR/server.R index bb33246c4634ea3529020dd90ea280d166228ddc..0facdd1b9d75f07ec15ee88a8948265f3fa2ea3e 100644 --- a/inst/ShinyGR/server.R +++ b/inst/ShinyGR/server.R @@ -966,7 +966,7 @@ shinyServer(function(input, output, session) { ParamTitle <- c("X1", "X2" , "X3", "X4", "X5", "X6")[seq_len(getPrep()$TMGR$NbParam)] ParamUnits <- c("mm", "mm/%s", "mm", "%s", "", "mm") if (input$HydroModel == "GR2M") { - ParamUnits[2] <- "-%s" + ParamUnits[2] <- "[-]%s" } ParamUnits <- ParamUnits[seq_len(getPrep()$TMGR$NbParam)] if (input$SnowModel == "CemaNeige") { @@ -974,6 +974,9 @@ shinyServer(function(input, output, session) { ParamUnits <- c(ParamUnits, "", "mm/°C/%s") } ParamTitle <- paste(ParamTitle, paste(getSim()$PARAM, sprintf(ParamUnits, getPrep()$TMGR$TimeUnit)), sep = " = ", collapse = ", ") + if (input$HydroModel == "GR2M") { + ParamTitle <- gsub("\\[-\\].*", "[-]", ParamTitle) + } ParamTitle <- gsub(" ,", ",", ParamTitle) PngTitle <- sprintf("%s - %s/%s\n%s\n%s", input$Dataset, input$HydroModel, ifelse(input$SnowModel == "CemaNeige", "CemaNeige", "No snow model"),