From 67cc896430dba01859c0b5a91ad63b98cfe12f66 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Thu, 6 Jun 2019 11:19:38 +0200
Subject: [PATCH] v1.2.16.10 CLEAN: remove the word "regime" for the y-axis of
the regime plot in plot.OutputsModel
---
DESCRIPTION | 4 ++--
NEWS.rmd | 3 +--
R/plot.OutputsModel.R | 10 +++++-----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index b4d3fec2..5916662a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.16.9
-Date: 2019-05-24
+Version: 1.2.16.10
+Date: 2019-06-06
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"),
diff --git a/NEWS.rmd b/NEWS.rmd
index db95eed7..dfc54cc1 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,8 +13,7 @@ output:
-
-### 1.2.16.9 Release Notes (2019-05-23)
+6-065-23)
#### New features
diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R
index a14dab5d..66c61b81 100644
--- a/R/plot.OutputsModel.R
+++ b/R/plot.OutputsModel.R
@@ -630,9 +630,9 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
plot(0, 0, type = "n", xaxt = "n", yaxt = "n", xlab = "", ylab = "", ...)
mtext(side = 1, text = "", line = line, cex = cex.lab)
text(0, 0, labels = "NO ENOUGH VALUES", col = "grey40")
- txtlab <- "flow regime"
+ txtlab <- "flow"
if (BOOL_Pobs) {
- txtlab <- "precip. & flow regime"
+ txtlab <- "precip. & flow"
}
mtext(side = 2, paste(txtlab, plotunitregime), line = line, cex = cex.lab)
} else {
@@ -771,16 +771,16 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea =
axis(side = 2, at = pretty(ylimQ), labels = pretty(ylimQ), cex.axis = cex.axis, ...)
mtext(side = 1, labX, line = line, cex = cex.lab)
posleg <- "topright"
- txtlab <- "flow regime"
+ txtlab <- "flow"
if (BOOL_Pobs) {
posleg <- "right"
- txtlab <- "precip. & flow regime"
+ txtlab <- "precip. & flow"
}
mtext(side = 2, paste(txtlab, plotunitregime), line = line, cex = cex.lab)
if (!is.null(BasinArea)) {
Factor <- Factor_UNIT_M3S / (365.25 / 12)
axis(side = 4, at = pretty(ylimQ*Factor)/Factor, labels = pretty(ylimQ*Factor), cex.axis = cex.axis, ...)
- mtext(side = 4, paste("flow regime", "[m3/s]"), line = line, cex = cex.lab)
+ mtext(side = 4, paste("flow", "[m3/s]"), line = line, cex = cex.lab)
}
### posleg <- "topright"; if (BOOL_Pobs) {posleg <- "right";}
### legend(posleg, txtleg, col = colleg, lty = 1, lwd = lwdleg, bty = "o", bg = bg, box.col = bg, cex = cex.leg)
--
GitLab