Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
HYCAR-Hydro
airGRteaching
Commits
4beafc3b
Commit
4beafc3b
authored
Jan 23, 2018
by
unknown
Browse files
v0.1.9.12 label positions modified in model diagram of ShinyGR
parent
8f6d29c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
4beafc3b
Package: airGRteaching
Type: Package
Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface)
Version: 0.1.9.1
1
Version: 0.1.9.1
2
Date: 2018-01-23
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.9.43)
...
...
R/Utils.R
View file @
4beafc3b
...
...
@@ -350,8 +350,7 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, HydroModel) {
y0
=
xy_min_PROD
[
2
],
y1
=
xy_min_PROD
[
2
]
+
Param
[
1
]
*
fact_res
)
segments
(
x0
=
xy_min_PROD
[
1
]
+
base_res
,
x1
=
xy_min_PROD
[
1
]
+
base_res
,
y0
=
xy_min_PROD
[
2
],
y1
=
xy_min_PROD
[
2
]
+
Param
[
1
]
*
fact_res
)
text
(
x
=
30
,
y
=
xy_min_PROD
[
2
]
+
Param
[
1
]
*
fact_res
/
3
,
labels
=
"Prod.\nstore"
,
cex
=
1.4
,
pos
=
4
)
text
(
x
=
30
,
y
=
xy_min_PROD
[
2
]
+15
,
labels
=
"Prod.\nstore"
,
cex
=
1.4
,
pos
=
4
)
# --------------------------------------------------------------------------------
...
...
@@ -585,8 +584,7 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, HydroModel) {
y0
=
xy_min_ROUT
[
2
],
y1
=
xy_min_ROUT
[
2
]
+
Param
[
3
]
*
fact_res
+
tmp_triche
)
segments
(
x0
=
xy_min_ROUT
[
1
]
+
base_res
,
x1
=
xy_min_ROUT
[
1
]
+
base_res
,
y0
=
xy_min_ROUT
[
2
],
y1
=
xy_min_ROUT
[
2
]
+
Param
[
3
]
*
fact_res
+
tmp_triche
)
text
(
x
=
50
,
y
=
xy_min_ROUT
[
2
]
+
Param
[
3
]
*
fact_res
/
3
,
labels
=
"Routing\nstore"
,
cex
=
1.4
,
pos
=
4
)
text
(
x
=
30
,
y
=
xy_min_ROUT
[
2
]
+15
,
labels
=
"Routing\nstore"
,
cex
=
1.4
,
pos
=
4
)
# Sorties du reservoir
segments
(
x0
=
xy_min_ROUT
[
1
]
+
base_res
/
2
,
x1
=
xy_min_ROUT
[
1
]
+
base_res
/
2
,
...
...
@@ -645,11 +643,10 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, HydroModel) {
y0
=
xy_min_EXPO
[
2
],
y1
=
xy_min_EXPO
[
2
]
-
max
(
abs
(
OutputsModel
$
Exp
))
*
fact_res
-
tmp_triche
)
segments
(
x0
=
xy_min_EXPO
[
1
]
+
base_res
,
x1
=
xy_min_EXPO
[
1
]
+
base_res
,
y0
=
xy_min_EXPO
[
2
],
y1
=
xy_min_EXPO
[
2
]
-
max
(
abs
(
OutputsModel
$
Exp
))
*
fact_res
-
tmp_triche
)
text
(
x
=
50
,
y
=
xy_min_EXPO
[
2
]
+
Param
[
3
]
*
fact_res
/
3
,
labels
=
"Exp.\nstore"
,
cex
=
1.4
,
pos
=
4
)
points
(
x
=
180
,
y
=
xy_min_EXPO
[
2
]
+
Param
[
3
]
*
fact_res
/
3+05
,
pch
=
43
,
# +
text
(
x
=
30
,
y
=
xy_min_EXPO
[
2
]
+00
,
labels
=
"Exp.\nstore"
,
cex
=
1.4
,
pos
=
4
)
points
(
x
=
180
,
y
=
xy_min_EXPO
[
2
]
+20
,
pch
=
43
,
# +
cex
=
2.0
,
col
=
"#10B510"
)
points
(
x
=
178
,
y
=
xy_min_EXPO
[
2
]
+
Param
[
3
]
*
fact_res
/
3-35
,
pch
=
95
,
# -
points
(
x
=
178
,
y
=
xy_min_EXPO
[
2
]
-20
,
pch
=
95
,
# -
cex
=
1.6
,
col
=
"#FF0303"
)
# Valeur de QrExp
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment