Commit 1f49ddc2 authored by unknown's avatar unknown
Browse files

v0.1.2.26 new themes for the shiny interface

parent e7f13f27
Package: airGRteaching
Type: Package
Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Application)
Version: 0.1.2.25
Version: 0.1.2.26
Date: 2017-04-07
Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb")))
Depends: airGR (>= 1.0.5.22)
......
......@@ -53,12 +53,12 @@ DiagramGR4J <- function(OutputsModel, Param, SimPer, EventDate) {
# --------------------------------------------------------------------------------
# Parametres
mgp <- c(3,0.5,0)
mgp <- c(3,0.75,0)
col_P <- rgb(066, 139, 202, maxColorValue = 255) #"royalblue"
col_E <- rgb(164, 196, 000, maxColorValue = 255) #"forestgreen"
col_Q <- "orangered"
col_SP <- adjustcolor("cyan4" , alpha.f = 0.25)
col_SR <- adjustcolor("darkblue", alpha.f = 0.25)
col_SP <- adjustcolor("cyan4" , alpha.f = 0.60)
col_SR <- adjustcolor("darkblue", alpha.f = 0.60)
col_R <- rgb(066, 139, 202, maxColorValue = 255) #rgb(037, 155, 210, maxColorValue = 255)
col_mod_bg <- rgb(245, 245, 245, maxColorValue = 255)
col_mod_bd <- rgb(231, 231, 231, maxColorValue = 255)
......@@ -99,12 +99,16 @@ DiagramGR4J <- function(OutputsModel, Param, SimPer, EventDate) {
tri_B <- -0x25BC
tri_L <- -0x25C4
par(col.axis = par("fg"), cex.axis = 1.2, cex.lab = 1.2)
par(col.axis = par("fg"), cex.axis = 1.3, cex.lab = 1.3)
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)
}
if (.GlobalEnv$.ShinyGR.args$theme == "Flatly") {
col_mod_bg <- "#ECF0F1"
col_mod_bd <- "#ECF0F1"
}
# Pas de temps
dates_deb <- EventDate
......
......@@ -104,7 +104,10 @@ shinyServer(function(input, output, session) {
RunOptions <- getRES()$SIM$OptionsSimul
if (.GlobalEnv$.ShinyGR.args$theme == "Cyborg") {
par(bg = "black", fg = "white", col.axis = "white", col.lab = "white")
par(bg = "black" , fg = "white", col.axis = "white", col.lab = "white")
}
if (.GlobalEnv$.ShinyGR.args$theme == "Flatly") {
par(fg = "#2C3E50", col.axis = "#2C3E50", col.lab = "#2C3E50")
}
observe({
......@@ -147,16 +150,16 @@ shinyServer(function(input, output, session) {
par(mfrow = c(2, 1), cex.axis = 1.2, cex.lab = 1.1, cex.lab = 1.1)
par(mar = c(2.5, 4.0, 2.5, 2.0), xaxt = "n")
plot(range(aaa$Dates), range(aaa$Prod, aaa$Rout), type = "n", xlab = "", ylab = "store [mm]")
polygon(c(aaa$Dates, rev(range(aaa$Dates))), c(aaa$Prod, rep(min(aaa$Prod, aaa$Rout), 2)), border = "darkblue", col = adjustcolor("darkblue", alpha.f = 0.25))
polygon(c(aaa$Dates, rev(range(aaa$Dates))), c(aaa$Rout, rep(min(aaa$Prod, aaa$Rout), 2)), border = "cyan4" , col = adjustcolor("cyan4" , alpha.f = 0.25))
legend("topright", bty = "n", legend = c("prod.", "rout."), fill = adjustcolor(c("darkblue", "cyan4"), alpha.f = 0.25))
polygon(c(aaa$Dates, rev(range(aaa$Dates))), c(aaa$Prod, rep(min(aaa$Prod, aaa$Rout), 2)), border = "darkblue", col = adjustcolor("darkblue", alpha.f = 0.30))
polygon(c(aaa$Dates, rev(range(aaa$Dates))), c(aaa$Rout, rep(min(aaa$Prod, aaa$Rout), 2)), border = "cyan4" , col = adjustcolor("cyan4" , alpha.f = 0.30))
legend("topright", bty = "n", legend = c("prod.", "rout."), fill = adjustcolor(c("darkblue", "cyan4"), alpha.f = 0.30))
par(mar = c(5.0, 4.0, 0.0, 2.0), xaxt = "s")
plot(aaa$DatesR, aaa$Qobs, type = "n", xlab = "", ylab = "flow [mm/d]")
polygon(c(aaa$Dates, rev(range(aaa$Dates))), c(aaa$QR+aaa$QD, rep(0, 2)), col = adjustcolor("orange", alpha.f = 0.75), border = NA)
polygon(c(aaa$Dates, rev(range(aaa$Dates))), c(aaa$QR , rep(0, 2)), col = adjustcolor("grey80", alpha.f = 0.99), border = NA)
polygon(c(aaa$Dates, rev(range(aaa$Dates))), c(aaa$QR+aaa$QD, rep(0, 2)), col = adjustcolor("orange", alpha.f = 0.65), border = NA)
polygon(c(aaa$Dates, rev(range(aaa$Dates))), c(aaa$QR , rep(0, 2)), col = adjustcolor("gold" , alpha.f = 0.99), border = NA)
lines(aaa$DatesR, aaa$Qsim, lwd = 1, col = "orangered")
lines(aaa$DatesR, aaa$Qobs, type = "l", lwd = 1, col = "black")
legend("topright", bty = "n", legend = c("obs.", "sim.", "Qd", "Qr"), col = c("black", "orangered", "orange", "grey80"), lwd = c(2, 2, NA, NA), pch = c(NA, NA, 15, 15))
lines(aaa$DatesR, aaa$Qobs, type = "l", lwd = 1, col = par("fg"))
legend("topright", bty = "n", legend = c("obs.", "sim.", "Qd", "Qr"), col = c(par("fg"), "orangered", "orange", "gold"), lwd = c(2, 2, NA, NA), pch = c(NA, NA, 15, 15))
}
......
......@@ -11,9 +11,13 @@ navbarPage(title = div("airGRteaching",
windowTitle = "airGRteaching",
theme = switch(.GlobalEnv$.ShinyGR.args$theme,
RStudio = "",
United = "bootstrap.min_United.css",
Cyborg = "bootstrap.min_Cyborg.css"),
RStudio = "",
Cyborg = "bootstrap.min_Cyborg.css",
Cerulean = "bootstrap.min_Cerulean.css",
Flatly = "bootstrap.min_Flatly.css",
United = "bootstrap.min_United.css",
Yeti = "bootstrap.min_Yeti.css"
),
tabPanel(title = "Interface",
......@@ -102,7 +106,9 @@ navbarPage(title = div("airGRteaching",
actionButton("CalButton", label = "Run automatic calibration", width = "100%",
icon = icon("refresh"),
style = "color: #fff; background-color: #A4C400; border-color: #A4C400")
style = ifelse(.GlobalEnv$.ShinyGR.args$theme != "Cerulean",
"color: #fff; background-color: #A4C400; border-color: #A4C400",
""))
),
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -6,7 +6,7 @@
<table border="0" width="100%" cellspacing="1" cellpadding="1">
<tbody>
<tr>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_airGRteaching.svg" alt="" /></td>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_airGRteaching_square.svg" alt="" /></td>
<td><h3>
<font color="#009EE0">
To be informed of the public release of the <strong><font color="#009EE0">airGRteaching</font></strong> package, send an email to <font color="#003A80"><strong>airGR@irstea.fr</strong></font>
......
......@@ -17,7 +17,7 @@ airGRteaching <- sprintf(formatGR, "airGRteaching")
<table border="0" width="100%" cellspacing="1" cellpadding="1">
<tbody>
<tr>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_airGRteaching.svg" alt="" /></td>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_airGRteaching_square.svg" alt="" /></td>
<td><h3>
<font color="#009EE0">
To be informed of the public release of the `r airGRteaching` package, send an email to <font color="#003A80"><strong>airGR@irstea.fr</strong></font>
......
This diff is collapsed.
......@@ -6,8 +6,8 @@
<table width="100%">
<tbody>
<tr>
<td width="110"><img style="border-width: 0px; border-style: solid; float: left; width: 110px;" src="logo_irstea.svg" alt="" /></td>
<td width="135"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_irstea_hydro.svg" alt="" /></td>
<td width="110"><img style="border-width: 0px; border-style: solid; float: left; width: 110px;" src="logo_irstea_square.svg" alt="" /></td>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 110px;" src="logo_irstea_hydro_square.svg" alt="" /></td>
<td>The developpement of the <strong><font color="#009EE0">GR</font></strong> models and the <strong><font color="#009EE0">airGR</font></strong> &amp; <strong><font color="#009EE0">airGRteaching</font></strong> are done by the <strong><i>Catchment Hydrology Team</i></strong> of the French <strong>National Research Institute of Science and Technology for Environment and Agriculture</strong> (<strong>IRSTEA</strong>) at Antony, France.
</tr>
......@@ -111,7 +111,7 @@
</tr>
<tr>
<td width="115"> <img style="border-width: 2px; border-color:rgba(0,0,0,0.0); border-style: solid; float: left; width: 100px;" src="logo_irstea_hydro.svg" alt="" /></td>
<td width="115"> <img style="border-width: 2px; border-color:rgba(0,0,0,0.0); border-style: solid; float: left; width: 100px;" src="logo_irstea_hydro_square.svg" alt="" /></td>
<td><strong>CATCHMENT HYDROLOGY TEAM</strong>
<br>Contributions to the Fortran codes
<br>Contributions to the GR models developpment
......
......@@ -17,8 +17,8 @@ airGRteaching <- sprintf(formatGR, "airGRteaching")
<table width="100%">
<tbody>
<tr>
<td width="110"><img style="border-width: 0px; border-style: solid; float: left; width: 110px;" src="logo_irstea.svg" alt="" /></td>
<td width="135"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_irstea_hydro.svg" alt="" /></td>
<td width="110"><img style="border-width: 0px; border-style: solid; float: left; width: 110px;" src="logo_irstea_square.svg" alt="" /></td>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 110px;" src="logo_irstea_hydro_square.svg" alt="" /></td>
<td>The developpement of the `r GR` models and the `r airGR` &amp; `r airGRteaching` are done by the <strong><i>Catchment Hydrology Team</i></strong> of the French <strong>National Research Institute of Science and Technology for Environment and Agriculture</strong> (<strong>IRSTEA</strong>) at Antony, France.
</tr>
......@@ -122,7 +122,7 @@ airGRteaching <- sprintf(formatGR, "airGRteaching")
</tr>
<tr>
<td width="115"> <img style="border-width: 2px; border-color:rgba(0,0,0,0.0); border-style: solid; float: left; width: 100px;" src="logo_irstea_hydro.svg" alt="" /></td>
<td width="115"> <img style="border-width: 2px; border-color:rgba(0,0,0,0.0); border-style: solid; float: left; width: 100px;" src="logo_irstea_hydro_square.svg" alt="" /></td>
<td><strong>CATCHMENT HYDROLOGY TEAM</strong>
<br>Contributions to the Fortran codes
<br>Contributions to the GR models developpment
......
This diff is collapsed.
......@@ -6,7 +6,7 @@
<table border="0" width="100%" cellspacing="1" cellpadding="1">
<tbody>
<tr>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_airGRteaching.svg" alt="" /></td>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_airGRteaching_square.svg" alt="" /></td>
<td><h3>
<font color="#009EE0">
To be informed of the public release of the <strong><font color="#009EE0">airGRteaching</font></strong> package, send an email to <font color="#003A80"><strong>airGR@irstea.fr</strong></font>
......@@ -215,6 +215,8 @@ Only daily models are currently available GR4J, GR5J, GR6J + CemaNeige).
It is also possible to change the interface look; different thema are propose (argument `theme`).
XXXX SCREENSHOTS
<div><center><image src="theme_rstudio.jpg", width="250"> <image src="theme_cerulean.jpg", width="250"> <image src="theme_cyborg.jpg", width="250"></img></center></div>
<br>
<div><center><image src="theme_flatly.jpg", width="250"> <image src="theme_united.jpg", width="250"> <image src="theme_yeti.jpg", width="250"></center></div>
......@@ -17,7 +17,7 @@ airGRteaching <- sprintf(formatGR, "airGRteaching")
<table border="0" width="100%" cellspacing="1" cellpadding="1">
<tbody>
<tr>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_airGRteaching.svg" alt="" /></td>
<td width="130"><img style="border-width: 0px; border-style: solid; float: left; width: 120px;" src="logo_airGRteaching_square.svg" alt="" /></td>
<td><h3>
<font color="#009EE0">
To be informed of the public release of the `r airGRteaching` package, send an email to <font color="#003A80"><strong>airGR@irstea.fr</strong></font>
......@@ -197,7 +197,7 @@ ShinyGR(ObsBV = "BasinObs", SimPer = c("1994-01-01", "1998-12-31"))
Only daily models are currently available GR4J, GR5J, GR6J + CemaNeige).
It is also possible to change the interface look; different thema are propose (argument `theme`).
XXXX SCREENSHOTS
<div><center><image src="theme_rstudio.jpg"> <image src="theme_cerulean.jpg"> <image src="theme_cyborg.jpg"></img></center></div>
<div><center><image src="theme_flatly.jpg"> <image src="theme_united.jpg"> <image src="theme_yeti.jpg"></center></div>
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