Commit 3915ecbc authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v0.2.9.23 REV: the theme agument of the ShinyGR function no more works when...

v0.2.9.23 REV: the theme agument of the ShinyGR function no more works when the user used the wrong character case
linked to commit d1a2eef7
parent d1a2eef7
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
Version: 0.2.9.22
Version: 0.2.9.23
Date: 2020-03-29
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
......
......@@ -4,7 +4,7 @@
### 0.2.9.22 Release Notes (2020-03-29)
### 0.2.9.23 Release Notes (2020-03-29)
#### New features
......@@ -14,7 +14,6 @@
#### User-visible changes
- the <code>theme</code> agument of the <code>ShinyGR()<.code> function now works even if the user used the wrong character case
____________________________________________________________________________________
......
......@@ -150,7 +150,7 @@ ShinyGR <- function(ObsDF = NULL, DatesR = NULL, Precip = NULL, PotEvap = NULL,
.GlobalEnv$.ShinyGR.args <- list(ObsDF = ObsDF, NamesObsBV = NamesObsBV,
DatesR = DatesR, Precip = Precip, PotEvap = PotEvap, Qobs = Qobs, TempMean = TempMean,
ZInputs = ZInputs, HypsoData = HypsoData, NLayers = NLayers, SimPer = SimPer,
theme = tolower(theme))
theme = theme)
## timezone used
# oTZ <- Sys.timezone()
......
......@@ -168,7 +168,7 @@ if (getRversion() >= "2.15.1") {
par(col.axis = par("fg"), cex.axis = 1.3, cex.lab = 1.3, cex = 0.7, mgp = mgp)
if (.GlobalEnv$.ShinyGR.args$theme == "cyborg") {
if (.GlobalEnv$.ShinyGR.args$theme == "Cyborg") {
col_mod_bg <- rgb(255-245, 255-245, 255-245, maxColorValue = 255)
col_mod_bd <- rgb(255-231, 255-231, 255-231, maxColorValue = 255)
}
......
......@@ -480,11 +480,11 @@ shinyServer(function(input, output, session) {
## Graphical parameters
getPlotPar <- reactive({
if (.GlobalEnv$.ShinyGR.args$theme == "cyborg") {
if (.GlobalEnv$.ShinyGR.args$theme == "Cyborg") {
col_bg <- "black"
col_fg <- "white"
par(bg = col_bg, fg = col_fg, col.axis = col_fg, col.lab = col_fg)
} else if (.GlobalEnv$.ShinyGR.args$theme == "flatly") {
} else if (.GlobalEnv$.ShinyGR.args$theme == "Flatly") {
col_bg <- "#2C3E50"
col_fg <- "black"
par(bg = col_bg, fg = col_fg, col.axis = col_bg, col.lab = col_bg)
......
......@@ -21,14 +21,14 @@ navbarPage(title = div("airGRteaching",
windowTitle = "airGRteaching",
theme = switch(.GlobalEnv$.ShinyGR.args$theme,
rstudio = "",
cyborg = "css/bootstrap.min_Cyborg.css",
cerulean = "css/bootstrap.min_Cerulean.css",
flatly = "css/bootstrap.min_Flatly.css",
united = "css/bootstrap.min_United.css",
yeti = "css/bootstrap.min_Yeti.css",
inrae = "css/bootstrap.min_Inrae.css",
saclay = "css/bootstrap.min_Saclay.css"
Rstudio = "",
Cyborg = "css/bootstrap.min_Cyborg.css",
Cerulean = "css/bootstrap.min_Cerulean.css",
Flatly = "css/bootstrap.min_Flatly.css",
United = "css/bootstrap.min_United.css",
Yeti = "css/bootstrap.min_Yeti.css",
Inrae = "css/bootstrap.min_Inrae.css",
Saclay = "css/bootstrap.min_Saclay.css"
),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment