Commit a1de2a7b authored by unknown's avatar unknown
Browse files

v0.1.5.0 ui.R and server.R files cleaned,period slider is linked to the...

v0.1.5.0 ui.R and server.R files cleaned,period slider is linked to the dygraphs selected period, no possibility to show model diagram with GR6J #4845
parent 7f49231d
Package: airGRteaching
Type: Package
Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Application)
Version: 0.1.4.2
Version: 0.1.5.0
Date: 2017-07-21
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.8.0)
......
......@@ -3,7 +3,7 @@ dyplot.default <- function(x, col.Precip = "royalblue", col.Q = c("black", "oran
plot.na = TRUE, RangeSelector = TRUE, Roller = FALSE,
LegendShow = c("follow", "auto", "always", "onmouseover", "never"), ...) {
barChartPrecip <- scan(file = system.file("ShinyGR/www/js/barChartPrecip.js", package = "airGRteaching"),
barChartPrecip <- scan(file = system.file("plugins/barChartPrecip.js", package = "airGRteaching"),
what = "character", quiet = TRUE)
if (! any(class(x) %in% c("ObsGR", "CalGR", "SimGR"))) {
......
This diff is collapsed.
......@@ -31,13 +31,15 @@ navbarPage(title = div("airGRteaching",
h4("Choose a dataset:"),
fluidRow(
column(12, selectInput("Dataset", label = NULL, choices = .ShinyGR.args$ObsBV))
column(width = 12, selectInput("Dataset", label = NULL, choices = .ShinyGR.args$ObsBV))
),
h4("Choose a model:"),
fluidRow(
column(6, selectInput("TypeModel", label = "Hydrological model", choices = c("GR4J", "GR5J", "GR6J"))),
column(6, selectInput("CemaNeige", label = "Snow module" , choices = c("None", "CemaNeige")))
column(width = 6, selectInput("TypeModel", label = "Hydrological model",
choices = c("GR4J", "GR5J", "GR6J"))),
column(width = 6, selectInput("CemaNeige", label = "Snow module",
choices = c("None", "CemaNeige")))
),
......@@ -97,10 +99,10 @@ navbarPage(title = div("airGRteaching",
h4("Automatic calibration:"),
fluidRow(
column(6, selectInput("TypeCrit", label = "Objective function",
column(width = 6, selectInput("TypeCrit", label = "Objective function",
choices = c("NSE [Q]", "NSE [sqrt(Q)]", "NSE [log(Q)]",
"KGE [Q]", "KGE [sqrt(Q)]", "KGE [log(Q)]"))),
column(6, actionButton("CalButton", label = "Run", width = "100%",
column(width = 6, actionButton("CalButton", label = "Run", width = "100%",
icon = icon("refresh"),
style = ifelse(.GlobalEnv$.ShinyGR.args$theme != "Cerulean",
"color: #fff; background-color: #A4C400; border-color: #A4C400; margin-top: 25px; padding:6px;",
......@@ -112,11 +114,11 @@ navbarPage(title = div("airGRteaching",
mainPanel(width = 9,
fluidRow(
column(2,
column(width = 2,
selectInput("PlotType", label = "Choose a plot:",
choices = c("Flow time series", "Model performance", "State variables", "Model diagram"))#, "user-defined"))
choices = c("Flow time series", "Model performance", "State variables", "Model diagram"))
),
column(4, offset = 1,
column(width = 4, offset = 1,
sliderInput("Period", label = "Select the time window:",
min = as.POSIXct(.ShinyGR.args$SimPer[1L], tz = "UTC"),
max = as.POSIXct(.ShinyGR.args$SimPer[2L], tz = "UTC"),
......@@ -126,7 +128,7 @@ navbarPage(title = div("airGRteaching",
animate = FALSE)
),
conditionalPanel(condition = "input.PlotType == 'Model diagram' & (input.TypeModel == 'GR4J' || input.TypeModel == 'GR5J' || input.TypeModel == 'GR6J')",
column(4, offset = 0,
column(width = 4, offset = 0,
sliderInput("Event", label = "Select the target date:",
min = as.POSIXct(.ShinyGR.args$SimPer[1L], tz = "UTC"),
max = as.POSIXct(.ShinyGR.args$SimPer[2L], tz = "UTC"),
......@@ -142,17 +144,22 @@ navbarPage(title = div("airGRteaching",
),
fluidRow(conditionalPanel(condition = "input.PlotType == 'Model performance'",
column(10, plotOutput("myPlot", width = "100%", height = "665px"))),
column(width = 10,
plotOutput("stPlotMP", width = "100%", height = "665px"))),
conditionalPanel(condition = "input.PlotType == 'Flow time series'",
column(10, dygraphOutput("myDyPlot1", width = "100%", height = "400px"))),
column(width = 10,
dygraphOutput("dyPlotTS", width = "100%", height = "400px"))),
conditionalPanel(condition = "input.PlotType == 'State variables'",
column(10, dygraphOutput("myDyPlot2", width = "100%", height = "320px"),
dygraphOutput("myDyPlot3", width = "100%", height = "320px"))),
column(width = 10,
dygraphOutput("dyPlotSVs", width = "100%", height = "325px"),
dygraphOutput("dyPlotSVq", width = "100%", height = "355px"))),
conditionalPanel(condition = "input.PlotType == 'Model diagram'",
column(06, dygraphOutput("myDyPlot4", width = "100%", height = "210px"),
dygraphOutput("myDyPlot5", width = "100%", height = "210px"),
dygraphOutput("myDyPlot6", width = "100%", height = "210px")),
column(04, plotOutput("myPlot2", width = "100%", height = "665px"))),
column(width = 06,
dygraphOutput("dyPlotMDp", width = "100%", height = "190px"),
dygraphOutput("dyPlotMDe", width = "100%", height = "215px"),
dygraphOutput("dyPlotMDq", width = "100%", height = "235px")),
column(width = 04,
plotOutput("stPlotMD", width = "100%", height = "665px"))),
column(02, tableOutput("Criteria"))
)
......
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