diff --git a/DESCRIPTION b/DESCRIPTION index a52e1fcb45404ab3835a12530ff3e5f7b1494761..9caeb499ad4cc25dc7715919f97c10e90d160f14 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.31 +Version: 0.2.10.32 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 65ab846b6a032befe82f1efe93fe6af1dd791cf8..0250695f1bc27647d14840051540cc100491c501 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 0.2.10.31 Release Notes (2020-04-29) +### 0.2.10.32 Release Notes (2020-04-29) #### New features diff --git a/inst/ShinyGR/server.R b/inst/ShinyGR/server.R index 0facdd1b9d75f07ec15ee88a8948265f3fa2ea3e..970225916a872d1e586c1a9477cfc8c42d424bfe 100644 --- a/inst/ShinyGR/server.R +++ b/inst/ShinyGR/server.R @@ -973,10 +973,12 @@ shinyServer(function(input, output, session) { ParamTitle <- c(ParamTitle, "C1", "C2") 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) + ParamUnits <- gsub("\\[-\\].*", "", ParamUnits) } + ParamUnits <- sprintf("[%s]", ParamUnits) + ParamUnits <- gsub("\\[\\]", "[-]", ParamUnits) + ParamTitle <- paste(ParamTitle, paste(getSim()$PARAM, sprintf(ParamUnits, getPrep()$TMGR$TimeUnit)), sep = " = ", collapse = ", ") ParamTitle <- gsub(" ,", ",", ParamTitle) PngTitle <- sprintf("%s - %s/%s\n%s\n%s", input$Dataset, input$HydroModel, ifelse(input$SnowModel == "CemaNeige", "CemaNeige", "No snow model"),