Commit 9f3c5e70 authored by unknown's avatar unknown
Browse files

v0.1.0 the package is renamed airGRteaching and now depends on airGR >=...

v0.1.0 the package is renamed airGRteaching and now depends on airGR >= 1.0.5.4 (plot_OutputsModel deprecated)
parent 2dedcf42
^.*\.Rproj$
^\.Rproj\.user$
Package: airGRscholar
Package: airGRteaching
Type: Package
Title: Tools to simplify the use of the airGR hydrological package for education (among others a Shiny application)
Version: 0.0.3.15
Date: 2016-12-14
Version: 0.1.0
Date: 2017-01-19
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")))
Author: Olivier Delaigue, Laurent Coron and Pierre Brigode
Maintainer: Olivier Delaigue <airGR@irstea.fr>
Depends: airGR (>= 1.0.2)
Depends: airGR (>= 1.0.5.4)
Imports: xts, dygraphs, shiny, plotrix
Description: This package provides 3 functions which allows to run very simply the airGR hydrological modelling steps. It also provides plotting function to help student to explore observed data and to interprete the results of calibration and simulation of the GR hydrological models.
License: GPL-2
......
......@@ -23,6 +23,7 @@ plot.SimGR Synthetic plotting of model outputs
Shiny interface:
====================
shiny.SimGR4J Interactive web applications to run manually
the GR4J hydrological model without CemaNeige
shiny.SimGR Interactive web applications to run manually
......
......@@ -13,7 +13,7 @@ plot.CalGR <- function(x, which = c("perf", "hist", "time"), ...) {
nmParam <- c(sprintf("X%i", 1:nbParamX), sprintf("C%i", seq_len(nbParamC)))
if (any(which[1L] %in% c("perf"))) {
plot_OutputsModel(x$OutputsModel, Qobs = x$Qobs, ...)
plot(x$OutputsModel, Qobs = x$Qobs, ...)
}
if (any(which[1L] %in% c("hist"))) {
......
......@@ -4,6 +4,6 @@ plot.SimGR <- function(x, ...) {
stop("Non convenient data for x argument. Must be of class \"SimGR\"")
}
plot_OutputsModel(x$OutputsModel, Qobs = x$Qobs, ...)
plot(x$OutputsModel, Qobs = x$Qobs, ...)
}
\ No newline at end of file
......@@ -11,3 +11,7 @@ Encoding: UTF-8
RnwWeave: knitr
LaTeX: pdfLaTeX
BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
......@@ -122,7 +122,7 @@ shinyServer(function(input, output, session) {
}
if (getplotType() == 1) {
plot_OutputsModel(OutputsModel = OutputsModel, Qobs = SIM$Qobs, IndPeriod_Plot = IndPlot)
plot(OutputsModel, Qobs = SIM$Qobs, IndPeriod_Plot = IndPlot)
}
if (getplotType() == 4) {
......
......@@ -49,7 +49,7 @@ shinyServer(function(input, output) {
mtext(side = 3, line = 1, paste("Period ", format(OutputsModel$DatesR[IndPlot[1]], "%d/%m/%Y"), " - ", format(OutputsModel$DatesR[tail(IndPlot, 1)], "%d/%m/%Y"), sep = ""))
}
if (getplotType() == 2) {
plot_OutputsModel(OutputsModel = OutputsModel, Qobs = SIM$Qobs, IndPeriod_Plot = IndPlot)
plot(OutputsModel, Qobs = SIM$Qobs, IndPeriod_Plot = IndPlot)
}
# if (getplotType() == 3) {
# Tmp <- FALSE
......
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