From 95235f4488db856051c45543555f923b4ae3667c Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Fri, 7 Jun 2019 10:08:55 +0200
Subject: [PATCH] v1.2.16.25 CLEAN: warning msg improved in plot.OutputsModel
fun
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/plot.OutputsModel.R | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index c64d3845..10222c29 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.16.24
+Version: 1.2.16.25
Date: 2019-06-07
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.rmd b/NEWS.rmd
index de29c732..cdbc93b0 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.2.16.24 Release Notes (2019-06-07)
+### 1.2.16.25 Release Notes (2019-06-07)
#### New features
diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R
index 6c0355f6..04dad71e 100644
--- a/R/plot.OutputsModel.R
+++ b/R/plot.OutputsModel.R
@@ -117,12 +117,12 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
}
if (is.null(Qobs)) {
if (length(which) == 1 & any(which %in% c("CorQQ", "Error"))) {
- stop(sprintf("the %s time series cannot be drawn if there is no 'Qobs'", shQuote(which)))
+ stop(sprintf("the %s plot(s) cannot be drawn if there is no 'Qobs'", shQuote(which)))
}
if (length(which) != 1 & any(which %in% c("CorQQ", "Error"))) {
BOOL_CorQQ <- FALSE
BOOL_Error <- FALSE
- warning(sprintf("the %s time series cannot be drawn if there is no 'Qobs'",
+ warning(sprintf("the %s plot(s) cannot be drawn if there is no 'Qobs'",
paste0(shQuote(c("CorQQ", "Error")), collapse = " and ")))
}
}
--
GitLab