From 15e3b4ab1a90a58f287fb9b1b13eebf3def4e34d Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 21 Dec 2020 07:41:36 +0000
Subject: [PATCH] v0.2.10.100 refactor(GUI): display a space separator between
thousands places in numbers in the GUI Refs #32
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
inst/ShinyGR/ui.R | 27 ++++++++++++++++++---------
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 10be377..13c6eb8 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.99
+Version: 0.2.10.100
Date: 2020-12-21
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 5449f2b..9daf97c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 0.2.10.99 Release Notes (2020-12-21)
+### 0.2.10.100 Release Notes (2020-12-21)
#### New features
diff --git a/inst/ShinyGR/ui.R b/inst/ShinyGR/ui.R
index c1828b2..a0b3543 100644
--- a/inst/ShinyGR/ui.R
+++ b/inst/ShinyGR/ui.R
@@ -62,60 +62,69 @@ navbarPage(title = div("airGRteaching",
min = 0,
max = 2500,
step = 10,
- value = 1250),
+ value = 1250,
+ sep = " "),
conditionalPanel(condition = "input.HydroModel == 'GR2M'",
sliderInput("X2GR2M", label = "X2 (groundwater exchange coeff.)",
post = " [-]",
min = +0.05,
max = +4,
step = 0.05,
- value = 2)),
+ value = 2,
+ sep = " ")),
conditionalPanel(condition = "input.HydroModel != 'GR2M'",
sliderInput("X2", label = "X2 (intercatchment exchange coeff.)",
post = " [mm/d]",
min = -5,
max = +5,
step = 0.05,
- value = 0),
+ value = 0,
+ sep = " "),
sliderInput("X3", label = "X3 (routing store capacity)",
post = " [mm]",
min = 0,
max = 1000,
step = 5,
- value = 500),
+ value = 500,
+ sep = " "),
sliderInput("X4", label = "X4 (unit hydrograph time constant)",
post = " [d]",
min = 0.5,
max = 10,
step = 0.1,
- value = 5.2)),
+ value = 5.2,
+ sep = " ")),
conditionalPanel(condition = "input.HydroModel == 'GR5J' || input.HydroModel =='GR6J'",
sliderInput("X5", label = "X5 (intercatchment exchange threshold)",
post = " [-]",
min = -4,
max = +4,
step = 0.05,
- value = 0)),
+ value = 0,
+ sep = " ")),
conditionalPanel(condition = "input.HydroModel == 'GR6J'",
sliderInput("X6", label = "X6 (exponential store depletion coeff.)",
post = " [mm]",
min = 0,
max = 20,
step = 0.5,
- value = 10)),
+ value = 10,
+ sep = " ")),
conditionalPanel(condition = "input.SnowModel == 'CemaNeige'",
sliderInput("C1", label = "C1 (weighting coeff. for snow pack thermal state)",
post = " [-]",
min = 0,
max = 1,
step = 0.01,
- value = 0.5),
+ value = 0.5,
+ sep = " "),
sliderInput("C2", label = "C2 (degree-day melt coefficient)",
post = " [mm/°C/d]",
min = 0,
max = 10,
step = 0.5,
- value = 5)),
+ value = 5,
+ sep = " ")),
h4("Automatic calibration:"),
fluidRow(
--
GitLab