mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Compare commits
171
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
40b48a2080 | ||
|
|
bddaad0193 | ||
|
|
49eb28056e | ||
|
|
ddb682dff6 | ||
|
|
89c6e8bb29 | ||
|
|
d4c596a6fe | ||
|
|
d15fa684b7 | ||
|
|
9879094661 | ||
|
|
5ce5478bf4 | ||
|
|
5fb36e7fbe | ||
|
|
0dbea26a2e | ||
|
|
b0e0dc75f1 | ||
|
|
318f6a4668 | ||
|
|
fdb5cd23e7 | ||
|
|
e064c1aee5 | ||
|
|
e0bc481ae2 | ||
|
|
081e6e7322 | ||
|
|
a0d8b9ea43 | ||
|
|
d97620ad56 | ||
|
|
6d4dc3a22b | ||
|
|
74d23386a7 | ||
|
|
9f46bcd853 | ||
|
|
bcc9dd1a0d | ||
|
|
fc40552d68 | ||
|
|
f41050fe5c | ||
|
|
97f487c0af | ||
|
|
499e16975f | ||
|
|
75f3c07cd9 | ||
|
|
0a0c00d877 | ||
|
|
8d2c18b6af | ||
|
|
2d2f83436c | ||
|
|
71914fdf57 | ||
|
|
2d7409debb | ||
|
|
beece68498 | ||
|
|
92fb653676 | ||
|
|
d8e9d786d9 | ||
|
|
7ef305e724 | ||
|
|
5da607865c | ||
|
|
1f5ce72fb2 | ||
|
|
b6be245764 | ||
|
|
46d0f52b3e | ||
|
|
80f0b181d1 | ||
|
|
9161c54e18 | ||
|
|
64d9e456b7 | ||
|
|
846aaeadf0 | ||
|
|
eaf8d7364a | ||
|
|
54bfff9623 | ||
|
|
237364a4e2 | ||
|
|
c3288b44bb | ||
|
|
70128bbdd1 | ||
|
|
a88a164ead | ||
|
|
d6aeb5df21 | ||
|
|
32db5795da | ||
|
|
a81a641d41 | ||
|
|
53da35d959 | ||
|
|
0f1d1b0797 | ||
|
|
6586a7b191 | ||
|
|
b7aab9f263 | ||
|
|
ef34fecc31 | ||
|
|
e9aa980c88 | ||
|
|
ab495efc65 | ||
|
|
14e13d6624 | ||
|
|
8db099c5c7 | ||
|
|
b503e54210 | ||
|
|
68e4dfb598 | ||
|
|
63dfab6654 | ||
|
|
707577521f | ||
|
|
3458a5df9f | ||
|
|
e19eeedcc3 | ||
|
|
c95de5e606 | ||
|
|
53f7f380ae | ||
|
|
2028d84554 | ||
|
|
da28bae6c5 | ||
|
|
944f99f14b | ||
|
|
8978cc3482 | ||
|
|
f08d4b1a37 | ||
|
|
824fbe506e | ||
|
|
deb84ca331 | ||
|
|
5b778af745 | ||
|
|
776d9ab610 | ||
|
|
587e5412d5 | ||
|
|
ef5430ae2c | ||
|
|
059d7203a9 | ||
|
|
82b6cbfd72 | ||
|
|
c170dbc46c | ||
|
|
890dbd9d32 | ||
|
|
f17b395c4c | ||
|
|
a44dddb51b | ||
|
|
0fdb362313 | ||
|
|
50fa4f7bd8 | ||
|
|
9309aa9d2d | ||
|
|
dd31ffc5a2 | ||
|
|
3d467c9620 | ||
|
|
f95c646ef3 | ||
|
|
c0000bb332 | ||
|
|
cdbcb2b539 | ||
|
|
252ac257fe | ||
|
|
afe0217655 | ||
|
|
516efb64e8 | ||
|
|
4cad251e57 | ||
|
|
48e9c14525 | ||
|
|
db62af6f71 | ||
|
|
b468a1eb70 | ||
|
|
b9ab202e3f | ||
|
|
129dde1c57 | ||
|
|
ff2d3926b1 | ||
|
|
fefc6ebc4f | ||
|
|
0076faf03a | ||
|
|
bbdd18e8ef | ||
|
|
87d31c134e | ||
|
|
ce04f5fd1e | ||
|
|
435ccd1f2d | ||
|
|
74c28d40a6 | ||
|
|
7b2c276643 | ||
|
|
0e1264ca4f | ||
|
|
53732744f4 | ||
|
|
5e95c286a9 | ||
|
|
6175e8a03e | ||
|
|
8e3d784e92 | ||
|
|
698e300690 | ||
|
|
e3fbe59585 | ||
|
|
0c7fecb123 | ||
|
|
78eed7af13 | ||
|
|
6f5743a030 | ||
|
|
d027946fb2 | ||
|
|
37ea83d42a | ||
|
|
ae39f33131 | ||
|
|
291f80e904 | ||
|
|
61baaeeffb | ||
|
|
68aabb343d | ||
|
|
f2d6e07931 | ||
|
|
123259c2ef | ||
|
|
816d7663b5 | ||
|
|
9b9202c739 | ||
|
|
57f82415bd | ||
|
|
36c93a0c93 | ||
|
|
3cd1dbab49 | ||
|
|
4e3da95b1d | ||
|
|
0d0c4f913e | ||
|
|
600f86aeb4 | ||
|
|
c9bb222bff | ||
|
|
456559ffe2 | ||
|
|
6d58c09104 | ||
|
|
bc87d6add1 | ||
|
|
3fe49b70d0 | ||
|
|
5287f30636 | ||
|
|
67433ae325 | ||
|
|
d27ce9d1d8 | ||
|
|
c8ea9bd774 | ||
|
|
885c8ea502 | ||
|
|
c8b32f9877 | ||
|
|
cf61fd8d09 | ||
|
|
cac20d4f24 | ||
|
|
965443a8f9 | ||
|
|
02be084faf | ||
|
|
bb2e83b6ce | ||
|
|
4a94c946d1 | ||
|
|
2dca5d2905 | ||
|
|
b5ae352af5 | ||
|
|
868215705c | ||
|
|
6d16d9dff4 | ||
|
|
b60ab881b1 | ||
|
|
f2d76a0d67 | ||
|
|
5dcc82d81e | ||
|
|
a01e47f205 | ||
|
|
c87563b7ed | ||
|
|
246b411114 | ||
|
|
b2ca1c2ab7 | ||
|
|
2cbfaec0c2 | ||
|
|
95dd648b90 | ||
|
|
333a8a0970 |
No files matched your search
+5
-2
@@ -229,7 +229,11 @@ for each reach"
|
|||||||
gls = []
|
gls = []
|
||||||
|
|
||||||
for edge in edges:
|
for edge in edges:
|
||||||
comp, incomp = edge.reach.compute_guidelines()
|
profiles = edge.reach.enabled_profiles
|
||||||
|
comp, incomp = edge.reach.compute_guidelines(
|
||||||
|
profiles=profiles,
|
||||||
|
update_cache=False
|
||||||
|
)
|
||||||
if len(incomp) != 0:
|
if len(incomp) != 0:
|
||||||
self._status = STATUS.WARNING
|
self._status = STATUS.WARNING
|
||||||
self._summary = "incomplete_guideline"
|
self._summary = "incomplete_guideline"
|
||||||
@@ -237,7 +241,6 @@ for each reach"
|
|||||||
|
|
||||||
gls.append(comp)
|
gls.append(comp)
|
||||||
|
|
||||||
profiles = edge.reach.profiles
|
|
||||||
for profile in profiles:
|
for profile in profiles:
|
||||||
if not profile.has_standard_named_points():
|
if not profile.has_standard_named_points():
|
||||||
self._status = STATUS.WARNING
|
self._status = STATUS.WARNING
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ class StudyGeometryChecker(AbstractModelChecker):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
for edge in edges:
|
for edge in edges:
|
||||||
if len(edge.reach.profiles) < 2:
|
if len(edge.reach.enabled_profiles) < 2:
|
||||||
summary = "no_geometry_defined"
|
summary = "no_geometry_defined"
|
||||||
status = STATUS.ERROR
|
status = STATUS.ERROR
|
||||||
ok = False
|
ok = False
|
||||||
@@ -132,8 +132,12 @@ class StudyInitialConditionsChecker(AbstractModelChecker):
|
|||||||
return ok
|
return ok
|
||||||
|
|
||||||
ic = river.initial_conditions[reach]
|
ic = river.initial_conditions[reach]
|
||||||
len_ic = len(ic)
|
enabled_profiles = set(reach.enabled_profiles)
|
||||||
len_reach = len(reach)
|
len_ic = sum(
|
||||||
|
data["section"] in enabled_profiles
|
||||||
|
for data in ic.data
|
||||||
|
)
|
||||||
|
len_reach = len(enabled_profiles)
|
||||||
|
|
||||||
if len_ic < len_reach:
|
if len_ic < len_reach:
|
||||||
self._summary = "initial_condition_missing_profile"
|
self._summary = "initial_condition_missing_profile"
|
||||||
|
|||||||
+101
-64
@@ -137,10 +137,11 @@ class InternalMeshing(AMeshingTool):
|
|||||||
p.points[k].z = pt1[k].z + \
|
p.points[k].z = pt1[k].z + \
|
||||||
dj*(pt2[k].z -
|
dj*(pt2[k].z -
|
||||||
pt1[k].z)
|
pt1[k].z)
|
||||||
p.rk = profiles[i].rk + \
|
p.rk = round(profiles[i].rk +
|
||||||
dj*(profiles[i+1].rk -
|
dj*(profiles[i+1].rk -
|
||||||
profiles[i].rk)
|
profiles[i].rk), 2)
|
||||||
p.name = f'interpol{p.rk}'
|
p.name = f'interpol{p.rk}'
|
||||||
|
p.interpolated = True
|
||||||
new_profiles2.append(p)
|
new_profiles2.append(p)
|
||||||
new_profiles.append(new_profiles2)
|
new_profiles.append(new_profiles2)
|
||||||
|
|
||||||
@@ -171,8 +172,8 @@ class InternalMeshing(AMeshingTool):
|
|||||||
|
|
||||||
ltot1 = 0.0
|
ltot1 = 0.0
|
||||||
ltot2 = 0.0
|
ltot2 = 0.0
|
||||||
alpha = []
|
alpha = [0.0]
|
||||||
beta = []
|
beta = [0.0]
|
||||||
# remove names
|
# remove names
|
||||||
sect2.points[start2].name = ''
|
sect2.points[start2].name = ''
|
||||||
sect2.points[end2].name = ''
|
sect2.points[end2].name = ''
|
||||||
@@ -195,67 +196,38 @@ class InternalMeshing(AMeshingTool):
|
|||||||
else: # regular case
|
else: # regular case
|
||||||
alpha = list(map(lambda x: x/ltot1, alpha)) # target ratios
|
alpha = list(map(lambda x: x/ltot1, alpha)) # target ratios
|
||||||
beta = list(map(lambda x: x/ltot2, beta)) # current ratios
|
beta = list(map(lambda x: x/ltot2, beta)) # current ratios
|
||||||
for i in range(len1 - len2):
|
match = self._match_indices(alpha, beta)
|
||||||
beta.append(1.0)
|
|
||||||
beta.append(0.0) # beta[-1]
|
|
||||||
# loop on the points to insert
|
|
||||||
for k in range(len1-len2):
|
|
||||||
trouve = False
|
|
||||||
for j0 in range(len2):
|
|
||||||
if trouve:
|
|
||||||
break
|
|
||||||
undeplus = True
|
|
||||||
for j1 in range(j0, len2):
|
|
||||||
if undeplus:
|
|
||||||
if beta[j1] <= alpha[j1]:
|
|
||||||
undeplus = False
|
|
||||||
break
|
|
||||||
if undeplus:
|
|
||||||
if j0 == len2:
|
|
||||||
trouve = True
|
|
||||||
else:
|
|
||||||
j1 = j0+1
|
|
||||||
if beta[j0]-alpha[j0] > alpha[j1]-beta[j0]:
|
|
||||||
trouve = True
|
|
||||||
|
|
||||||
if trouve:
|
insertions_per_segment = [] # liste de (index, [points])
|
||||||
len2 += 1
|
for j in range(len2):
|
||||||
for i in reversed(range(j0, len2)):
|
i_start = match[j]
|
||||||
beta[i+1] = beta[i]
|
i_end = match[j + 1]
|
||||||
if (beta[j0] == beta[j0-1]):
|
q_start = sect2.point(start2 + j)
|
||||||
# rien
|
q_end = sect2.point(start2 + j + 1)
|
||||||
pass
|
|
||||||
else:
|
new_points = []
|
||||||
ratio = (alpha[j0] - beta[j0-1]) \
|
if i_end - i_start > 1:
|
||||||
/ (beta[j0] - beta[j0-1])
|
u_start, u_end = alpha[i_start], alpha[i_end]
|
||||||
if ratio < 0.0:
|
span = u_end - u_start
|
||||||
logger.warning(f"ratio négatif {ratio}")
|
for k in range(i_start + 1, i_end):
|
||||||
# on double le point a gauche
|
ratio = (alpha[k] - u_start) / span # dans [0,1]
|
||||||
p = sect2.point(start2+j0-1).copy()
|
p = q_start.copy()
|
||||||
sect2.insert_point(start2+j0-1, p)
|
p.name = ''
|
||||||
sect2.point(start2+j0-1).name = ''
|
p.x = (1.0-ratio) * q_start.x + ratio * q_end.x
|
||||||
beta[j0] = beta[j0-1]
|
p.y = (1.0-ratio) * q_start.y + ratio * q_end.y
|
||||||
else:
|
p.z = (1.0-ratio) * q_start.z + ratio * q_end.z
|
||||||
p = sect2.point(start2+j0).copy()
|
new_points.append(p)
|
||||||
sect2.insert_point(start2+j0, p)
|
|
||||||
sect2.point(start2+j0+1).name = ''
|
# à insérer après l'indice j
|
||||||
sect2.point(start2+j0+1).x = \
|
insertions_per_segment.append((j, new_points))
|
||||||
(1.0-ratio) * sect2.point(start2+j0).x + \
|
|
||||||
ratio * sect2.point(start2+j0+2).x
|
# Insertion en ordre décroissant de j
|
||||||
sect2.point(start2+j0+1).y = \
|
# pour ne pas perturber les indices
|
||||||
(1.0-ratio) * sect2.point(start2+j0).y + \
|
for j, new_points in reversed(insertions_per_segment):
|
||||||
ratio * sect2.point(start2+j0+2).y
|
for offset, p in enumerate(new_points):
|
||||||
sect2.point(start2+j0+1).z = \
|
sect2.insert_point(start2 + j + 1 + offset, p)
|
||||||
(1.0-ratio) * sect2.point(start2+j0).z + \
|
len2 += 1
|
||||||
ratio * sect2.point(start2+j0+2).z
|
|
||||||
beta[j0] = (1.-ratio)*beta[j0-1] \
|
|
||||||
+ ratio*beta[j0+1]
|
|
||||||
|
|
||||||
if len1 > len2:
|
|
||||||
for i in range(len1 - len2):
|
|
||||||
p = sect2.point(start2+len2).copy()
|
|
||||||
sect2.insert_point(start2+len2, p)
|
|
||||||
sect2.point(start2+len2).name = ''
|
|
||||||
if tag1 != "un":
|
if tag1 != "un":
|
||||||
sect2.point(start2).name = tag1
|
sect2.point(start2).name = tag1
|
||||||
if tag2 != "np":
|
if tag2 != "np":
|
||||||
@@ -263,6 +235,71 @@ class InternalMeshing(AMeshingTool):
|
|||||||
|
|
||||||
sect2.modified()
|
sect2.modified()
|
||||||
|
|
||||||
|
def _match_indices(self, u_ref, v_target):
|
||||||
|
# appariement optimal (ordre croissant) par programmation dynamique
|
||||||
|
"""
|
||||||
|
Trouve, pour chaque v_target[j], un indice i_j dans u_ref tel que
|
||||||
|
i_0 < i_1 < ... < i_{m-1} et
|
||||||
|
Sum |u_ref[i_j] - v_target[j]| soit minimal.
|
||||||
|
|
||||||
|
Retourne la liste des indices i_j (longueur m),
|
||||||
|
avec i_0 = 0 et i_{m-1} = n-1 imposés
|
||||||
|
(les extrémités se correspondent forcément).
|
||||||
|
|
||||||
|
"""
|
||||||
|
n = len(u_ref)
|
||||||
|
m = len(v_target)
|
||||||
|
|
||||||
|
# Les extrémités sont fixées.
|
||||||
|
fixed_first, fixed_last = 0, n - 1
|
||||||
|
|
||||||
|
# DP sur les indices disponibles entre fixed_first+1 et fixed_last-1
|
||||||
|
# dp[j][i] = coût minimal pour apparier v_target[1..j] aux indices
|
||||||
|
# se terminant à l'indice i (i croissant strict), j de 1 à m-2.
|
||||||
|
if m == 2:
|
||||||
|
return [fixed_first, fixed_last]
|
||||||
|
|
||||||
|
# indices internes possibles
|
||||||
|
candidates = list(range(fixed_first + 1, fixed_last))
|
||||||
|
inner_targets = v_target[1:-1] # cibles internes (j = 1..m-2)
|
||||||
|
|
||||||
|
INF = float("inf")
|
||||||
|
# dp[j] : dict indice_candidat -> (coût_min, provenance)
|
||||||
|
dp = [{} for _ in range(len(inner_targets))]
|
||||||
|
|
||||||
|
for j, vt in enumerate(inner_targets):
|
||||||
|
for idx_pos, i in enumerate(candidates):
|
||||||
|
cost_here = abs(u_ref[i] - vt)
|
||||||
|
if j == 0:
|
||||||
|
# doit être > fixed_first
|
||||||
|
dp[j][i] = (cost_here, fixed_first)
|
||||||
|
else:
|
||||||
|
best = (INF, None)
|
||||||
|
for i_prev in candidates[:idx_pos]:
|
||||||
|
if i_prev in dp[j - 1]:
|
||||||
|
c = dp[j - 1][i_prev][0] + cost_here
|
||||||
|
if c < best[0]:
|
||||||
|
best = (c, i_prev)
|
||||||
|
if best[1] is not None:
|
||||||
|
dp[j][i] = best
|
||||||
|
|
||||||
|
# Reconstruction : on part du dernier niveau, on choisit le
|
||||||
|
# meilleur indice tel que la suite jusqu'à fixed_last
|
||||||
|
# reste croissante et valide.
|
||||||
|
last_level = dp[-1]
|
||||||
|
valid = {i: c for i, c in last_level.items() if i < fixed_last}
|
||||||
|
if not valid:
|
||||||
|
raise RuntimeError("Alignement impossible avec ces données.")
|
||||||
|
best_i = min(valid, key=lambda i: valid[i][0])
|
||||||
|
|
||||||
|
chain = [best_i]
|
||||||
|
for j in range(len(inner_targets) - 1, 0, -1):
|
||||||
|
prev_i = dp[j][chain[-1]][1]
|
||||||
|
chain.append(prev_i)
|
||||||
|
chain.reverse()
|
||||||
|
|
||||||
|
return [fixed_first] + chain + [fixed_last]
|
||||||
|
|
||||||
def update_rk(self, reach, begin_rk, end_rk,
|
def update_rk(self, reach, begin_rk, end_rk,
|
||||||
step: float = 50,
|
step: float = 50,
|
||||||
limites=[-1, -1],
|
limites=[-1, -1],
|
||||||
|
|||||||
@@ -531,7 +531,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
|
|||||||
new_0 = self._types[0](data[0].replace(",", "."))
|
new_0 = self._types[0](data[0].replace(",", "."))
|
||||||
new_1 = self._types[1](data[1].replace(",", "."))
|
new_1 = self._types[1](data[1].replace(",", "."))
|
||||||
|
|
||||||
return (new_0, new_1)
|
return Data(new_0, new_1, types=self._types, status=self._status)
|
||||||
|
|
||||||
def add(self, index: int):
|
def add(self, index: int):
|
||||||
value = Data(
|
value = Data(
|
||||||
@@ -543,7 +543,10 @@ class BoundaryConditionAdisTS(SQLSubModel):
|
|||||||
return value
|
return value
|
||||||
|
|
||||||
def insert(self, index: int, value):
|
def insert(self, index: int, value):
|
||||||
self._data.insert(index, value)
|
if value in self._data:
|
||||||
|
value.set_as_not_deleted()
|
||||||
|
else:
|
||||||
|
self._data.insert(index, value)
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
def delete_i(self, indexes):
|
def delete_i(self, indexes):
|
||||||
|
|||||||
@@ -0,0 +1,481 @@
|
|||||||
|
# BoundaryConditionsTemperature.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from tools import (
|
||||||
|
trace, timer,
|
||||||
|
old_pamhyr_date_to_timestamp,
|
||||||
|
date_iso_to_timestamp,
|
||||||
|
date_dmy_to_timestamp,
|
||||||
|
)
|
||||||
|
|
||||||
|
from Model.Tools.PamhyrDB import SQLSubModel
|
||||||
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
from Model.Scenario import Scenario
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class Data(SQLSubModel):
|
||||||
|
_sub_classes = []
|
||||||
|
|
||||||
|
def __init__(self,
|
||||||
|
data0, data1,
|
||||||
|
id: int = -1,
|
||||||
|
types=[float, float],
|
||||||
|
status=None,
|
||||||
|
owner_scenario=-1):
|
||||||
|
super(Data, self).__init__(
|
||||||
|
id=id, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._types = types
|
||||||
|
self._data = [data0, data1]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_create(cls, execute, ext=""):
|
||||||
|
execute(f"""
|
||||||
|
CREATE TABLE boundary_condition_data_temperature{ext}(
|
||||||
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
data0 TEXT NOT NULL,
|
||||||
|
data1 TEXT NOT NULL,
|
||||||
|
bca INTEGER,
|
||||||
|
{Scenario.create_db_add_scenario()},
|
||||||
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
|
FOREIGN KEY(bca)
|
||||||
|
REFERENCES boundary_condition_temperature(pamhyr_id)
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_update(cls, execute, version, data=None):
|
||||||
|
major, minor, release = version.strip().split(".")
|
||||||
|
created = False
|
||||||
|
if major == "0" and minor == "0":
|
||||||
|
if int(release) < 11:
|
||||||
|
cls._db_create(execute)
|
||||||
|
created = True
|
||||||
|
|
||||||
|
if major == "0" and (int(minor) < 2 or
|
||||||
|
(int(minor) == 2 and int(release) <= 7)):
|
||||||
|
if not cls.is_table_exists(execute,
|
||||||
|
"boundary_condition_data_temperature"):
|
||||||
|
cls._db_create(execute)
|
||||||
|
created = True
|
||||||
|
|
||||||
|
if not created:
|
||||||
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = []
|
||||||
|
status = data['status']
|
||||||
|
scenario = data["scenario"]
|
||||||
|
loaded = data['loaded_pid']
|
||||||
|
|
||||||
|
if scenario is None:
|
||||||
|
return new
|
||||||
|
|
||||||
|
bca = data["bca"]
|
||||||
|
|
||||||
|
table = execute(
|
||||||
|
"SELECT pamhyr_id, deleted, data0, data1, scenario FROM " +
|
||||||
|
"boundary_condition_data_temperature " +
|
||||||
|
f"WHERE scenario = {scenario.id} " +
|
||||||
|
# f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " +
|
||||||
|
f"AND bca = {bca.id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
if table is not None:
|
||||||
|
for row in table:
|
||||||
|
it = iter(row)
|
||||||
|
|
||||||
|
pid = next(it)
|
||||||
|
deleted = (next(it) == 1)
|
||||||
|
data0 = next(it)
|
||||||
|
data1 = next(it)
|
||||||
|
owner_scenario = next(it)
|
||||||
|
|
||||||
|
bc = cls(
|
||||||
|
data0, data1,
|
||||||
|
id=pid,
|
||||||
|
status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
if deleted:
|
||||||
|
bc.set_as_deleted()
|
||||||
|
|
||||||
|
loaded.add(pid)
|
||||||
|
new.append(bc)
|
||||||
|
|
||||||
|
data["scenario"] = scenario.parent
|
||||||
|
new += cls._db_load(execute, data)
|
||||||
|
data["scenario"] = scenario
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
if not self.must_be_saved():
|
||||||
|
return True
|
||||||
|
|
||||||
|
bca = data["bca"]
|
||||||
|
|
||||||
|
data0 = self._db_format(self._data[0])
|
||||||
|
data1 = self._db_format(self._data[1])
|
||||||
|
|
||||||
|
execute(
|
||||||
|
"INSERT INTO " +
|
||||||
|
"boundary_condition_data_temperature(" +
|
||||||
|
"pamhyr_id, deleted, data0, data1, bca, scenario) " +
|
||||||
|
f"VALUES ({self.id}, {self._db_format(self.is_deleted())}, " +
|
||||||
|
f"'{data0}', {data1}, {bca.id}, " +
|
||||||
|
f"{self._status.scenario_id})"
|
||||||
|
)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def __getitem__(self, key):
|
||||||
|
return self._types[key](self._data[key])
|
||||||
|
|
||||||
|
def __setitem__(self, key, value):
|
||||||
|
self._data[key] = self._types[key](value)
|
||||||
|
|
||||||
|
|
||||||
|
class BoundaryConditionTemperature(SQLSubModel):
|
||||||
|
_sub_classes = [Data]
|
||||||
|
|
||||||
|
def __init__(self, id: int = -1, status=None, owner_scenario=-1):
|
||||||
|
super(BoundaryConditionTemperature, self).__init__(
|
||||||
|
id=id, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._status = status
|
||||||
|
|
||||||
|
self._name = ""
|
||||||
|
self._node = None
|
||||||
|
self._data = []
|
||||||
|
self._header = []
|
||||||
|
self._types = [self.time_convert, float]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_create(cls, execute, ext=""):
|
||||||
|
execute(f"""
|
||||||
|
CREATE TABLE boundary_condition_temperature{ext}(
|
||||||
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
node INTEGER,
|
||||||
|
{Scenario.create_db_add_scenario()},
|
||||||
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
|
FOREIGN KEY(node) REFERENCES river_node(pamhyr_id)
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
|
if ext != "":
|
||||||
|
return True
|
||||||
|
|
||||||
|
return cls._create_submodel(execute)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_update(cls, execute, version, data=None):
|
||||||
|
major, minor, release = version.strip().split(".")
|
||||||
|
created = False
|
||||||
|
|
||||||
|
if major == "0" and (int(minor) < 2 or (
|
||||||
|
int(minor) == 2 and int(release) <= 7)):
|
||||||
|
if not cls.is_table_exists(execute,
|
||||||
|
"boundary_condition_temperature"):
|
||||||
|
cls._db_create(execute)
|
||||||
|
created = True
|
||||||
|
|
||||||
|
if not created:
|
||||||
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = []
|
||||||
|
status = data['status']
|
||||||
|
nodes = data['nodes']
|
||||||
|
scenario = data["scenario"]
|
||||||
|
loaded = data['loaded_pid']
|
||||||
|
|
||||||
|
if scenario is None:
|
||||||
|
return new
|
||||||
|
|
||||||
|
sql = (
|
||||||
|
"SELECT pamhyr_id, deleted, name, node, scenario "
|
||||||
|
"FROM boundary_condition_temperature " +
|
||||||
|
f"WHERE scenario = {scenario.id} "
|
||||||
|
)
|
||||||
|
|
||||||
|
table = execute(sql)
|
||||||
|
|
||||||
|
if table is not None:
|
||||||
|
for row in table:
|
||||||
|
it = iter(row)
|
||||||
|
|
||||||
|
pid = next(it)
|
||||||
|
deleted = (next(it) == 1)
|
||||||
|
bc_name = next(it)
|
||||||
|
node = next(it)
|
||||||
|
owner_scenario = next(it)
|
||||||
|
|
||||||
|
bc = cls(
|
||||||
|
id=pid,
|
||||||
|
status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
if deleted:
|
||||||
|
bc.set_as_deleted()
|
||||||
|
|
||||||
|
bc.name = bc_name
|
||||||
|
|
||||||
|
bc.node = None
|
||||||
|
if node != -1:
|
||||||
|
tmp = next(
|
||||||
|
filter(
|
||||||
|
lambda n: n.id == node, nodes
|
||||||
|
),
|
||||||
|
None
|
||||||
|
)
|
||||||
|
if tmp is not None:
|
||||||
|
bc.node = tmp.id
|
||||||
|
else:
|
||||||
|
bc.node = -1
|
||||||
|
|
||||||
|
data["bca"] = bc
|
||||||
|
bc._data = Data._db_load(execute, data=data)
|
||||||
|
|
||||||
|
loaded.add(pid)
|
||||||
|
new.append(bc)
|
||||||
|
|
||||||
|
data["scenario"] = scenario.parent
|
||||||
|
new += cls._db_load(execute, data)
|
||||||
|
data["scenario"] = scenario
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
if not self.must_be_saved():
|
||||||
|
return True
|
||||||
|
|
||||||
|
execute(
|
||||||
|
"DELETE FROM boundary_condition_temperature " +
|
||||||
|
f"WHERE pamhyr_id = {self.id} " +
|
||||||
|
f"AND scenario = {self._status.scenario_id} "
|
||||||
|
)
|
||||||
|
execute(
|
||||||
|
"DELETE FROM boundary_condition_data_temperature " +
|
||||||
|
f"WHERE bca = {self.id} " +
|
||||||
|
f"AND scenario = {self._status.scenario_id} "
|
||||||
|
)
|
||||||
|
|
||||||
|
node = -1
|
||||||
|
if self._node is not None:
|
||||||
|
node = self._node
|
||||||
|
|
||||||
|
execute(
|
||||||
|
"INSERT INTO " +
|
||||||
|
"boundary_condition_temperature(" +
|
||||||
|
"pamhyr_id, deleted, name, " +
|
||||||
|
"node, scenario) " +
|
||||||
|
"VALUES (" +
|
||||||
|
f"{self.id}, {self._db_format(self.is_deleted())}, " +
|
||||||
|
f"'{self._db_format(self._name)}', {node}, " +
|
||||||
|
f"{self._status.scenario_id}" +
|
||||||
|
")"
|
||||||
|
)
|
||||||
|
|
||||||
|
data["bca"] = self
|
||||||
|
|
||||||
|
ind = 0
|
||||||
|
for d in self._data:
|
||||||
|
data["ind"] = ind
|
||||||
|
|
||||||
|
d._db_save(execute, data)
|
||||||
|
|
||||||
|
ind += 1
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _data_traversal(self,
|
||||||
|
predicate=lambda obj, data: True,
|
||||||
|
modifier=lambda obj, data: None,
|
||||||
|
data={}):
|
||||||
|
if predicate(self, data):
|
||||||
|
modifier(self, data)
|
||||||
|
|
||||||
|
for d in self._data:
|
||||||
|
d._data_traversal(predicate, modifier, data)
|
||||||
|
|
||||||
|
def __len__(self):
|
||||||
|
return len(
|
||||||
|
list(
|
||||||
|
filter(
|
||||||
|
lambda el: el is not None and not el.is_deleted(),
|
||||||
|
self._data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def time_convert(cls, data):
|
||||||
|
if type(data) is str:
|
||||||
|
if data.count("-") == 2:
|
||||||
|
return date_iso_to_timestamp(data)
|
||||||
|
if data.count("/") == 2:
|
||||||
|
return date_dmy_to_timestamp(data)
|
||||||
|
if data.count(":") == 3:
|
||||||
|
return old_pamhyr_date_to_timestamp(data)
|
||||||
|
if data.count(":") == 2:
|
||||||
|
return old_pamhyr_date_to_timestamp("00:" + data)
|
||||||
|
if data.count(".") == 1:
|
||||||
|
return round(float(data))
|
||||||
|
|
||||||
|
return int(data)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def name(self):
|
||||||
|
return self._name
|
||||||
|
|
||||||
|
@name.setter
|
||||||
|
def name(self, name):
|
||||||
|
self._name = name
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def node(self):
|
||||||
|
return self._node
|
||||||
|
|
||||||
|
@node.setter
|
||||||
|
def node(self, node):
|
||||||
|
self._node = node
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def header(self):
|
||||||
|
return self._header.copy()
|
||||||
|
|
||||||
|
@header.setter
|
||||||
|
def header(self, header):
|
||||||
|
self._header = header
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def data(self):
|
||||||
|
return list(
|
||||||
|
filter(
|
||||||
|
lambda el: el is not None and not el.is_deleted(),
|
||||||
|
self._data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def _default_0(self):
|
||||||
|
return self._types[0](0)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def _default_1(self):
|
||||||
|
return self._types[1](0.0)
|
||||||
|
|
||||||
|
def new_from_data(self, header, data):
|
||||||
|
new_0 = self._default_0
|
||||||
|
new_1 = self._default_1
|
||||||
|
|
||||||
|
if len(header) != 0:
|
||||||
|
for i in [0, 1]:
|
||||||
|
for j in range(len(header)):
|
||||||
|
if self._header[i] == header[j]:
|
||||||
|
if i == 0:
|
||||||
|
new_0 = self._types[i](data[j].replace(",", "."))
|
||||||
|
else:
|
||||||
|
new_1 = self._types[i](data[j].replace(",", "."))
|
||||||
|
else:
|
||||||
|
new_0 = self._types[0](data[0].replace(",", "."))
|
||||||
|
new_1 = self._types[1](data[1].replace(",", "."))
|
||||||
|
|
||||||
|
return Data(new_0, new_1, types=self._types, status=self._status)
|
||||||
|
|
||||||
|
def add(self, index: int):
|
||||||
|
value = Data(
|
||||||
|
self._default_0, self._default_1,
|
||||||
|
status=self._status
|
||||||
|
)
|
||||||
|
self._data.insert(index, value)
|
||||||
|
self.modified()
|
||||||
|
return value
|
||||||
|
|
||||||
|
def insert(self, index: int, value):
|
||||||
|
if value in self._data:
|
||||||
|
value.set_as_not_deleted()
|
||||||
|
else:
|
||||||
|
self._data.insert(index, value)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def delete_i(self, indexes):
|
||||||
|
list(
|
||||||
|
map(
|
||||||
|
lambda e: e[1].set_as_deleted(),
|
||||||
|
filter(
|
||||||
|
lambda e: e[0] in indexes,
|
||||||
|
enumerate(self.data)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def sort(self, _reverse=False, key=None):
|
||||||
|
if key is None:
|
||||||
|
self._data.sort(reverse=_reverse)
|
||||||
|
else:
|
||||||
|
self._data.sort(reverse=_reverse, key=key)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def index(self, bc):
|
||||||
|
self._data.index(bc)
|
||||||
|
|
||||||
|
def get_i(self, index):
|
||||||
|
return self.data[index]
|
||||||
|
|
||||||
|
def get_range(self, _range):
|
||||||
|
lst = []
|
||||||
|
for r in _range:
|
||||||
|
lst.append(r)
|
||||||
|
return lst
|
||||||
|
|
||||||
|
def _set_i_c_v(self, index, column, value):
|
||||||
|
v = self._data[index]
|
||||||
|
v[column] = self._types[column](value)
|
||||||
|
self._data[index] = v
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def set_i_0(self, index: int, value):
|
||||||
|
self._set_i_c_v(index, 0, value)
|
||||||
|
|
||||||
|
def set_i_1(self, index: int, value):
|
||||||
|
self._set_i_c_v(index, 1, value)
|
||||||
+32
-20
@@ -1,5 +1,5 @@
|
|||||||
# OutputRKListAdists.py -- Pamhyr
|
# BoundaryConditionsTemperatureList.py -- Pamhyr
|
||||||
# Copyright (C) 2024-2025 INRAE
|
# Copyright (C) 2023-2025 INRAE
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -16,44 +16,56 @@
|
|||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from copy import copy
|
||||||
from tools import trace, timer
|
from tools import trace, timer
|
||||||
|
|
||||||
from Model.Except import NotImplementedMethodeError
|
|
||||||
from Model.Tools.PamhyrListExt import PamhyrModelList
|
from Model.Tools.PamhyrListExt import PamhyrModelList
|
||||||
from Model.OutputRKAdists.OutputRKAdists import OutputRKAdists
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
|
||||||
|
from Model.BoundaryConditionsTemperature.BoundaryConditionTemperature \
|
||||||
|
import BoundaryConditionTemperature
|
||||||
|
|
||||||
|
|
||||||
class OutputRKAdistsList(PamhyrModelList):
|
class BoundaryConditionsTemperatureList(PamhyrModelList):
|
||||||
_sub_classes = [OutputRKAdists]
|
_sub_classes = [
|
||||||
|
BoundaryConditionTemperature,
|
||||||
|
]
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_load(cls, execute, data=None):
|
def _db_load(cls, execute, data=None):
|
||||||
new = cls(status=data["status"])
|
new = cls(status=data['status'])
|
||||||
|
|
||||||
new._lst = OutputRKAdists._db_load(execute, data)
|
if data is None:
|
||||||
|
data = {}
|
||||||
|
|
||||||
|
new._lst = BoundaryConditionTemperature._db_load(execute, data)
|
||||||
|
|
||||||
return new
|
return new
|
||||||
|
|
||||||
def _db_save(self, execute, data=None):
|
def _db_save(self, execute, data=None):
|
||||||
ok = True
|
|
||||||
|
|
||||||
# Delete previous data
|
|
||||||
execute(
|
execute(
|
||||||
"DELETE FROM output_rk_adists " +
|
"DELETE FROM boundary_condition_temperature " +
|
||||||
|
f"WHERE scenario = {self._status.scenario_id}"
|
||||||
|
)
|
||||||
|
execute(
|
||||||
|
"DELETE FROM boundary_condition_data_temperature " +
|
||||||
f"WHERE scenario = {self._status.scenario_id}"
|
f"WHERE scenario = {self._status.scenario_id}"
|
||||||
)
|
)
|
||||||
|
|
||||||
for sl in self._lst:
|
if data is None:
|
||||||
ok &= sl._db_save(execute, data)
|
data = {}
|
||||||
|
|
||||||
return ok
|
for bca in self._lst:
|
||||||
|
bca._db_save(execute, data=data)
|
||||||
|
|
||||||
@property
|
return True
|
||||||
def OutputRK_List(self):
|
|
||||||
return self.lst
|
|
||||||
|
|
||||||
def new(self, lst, index):
|
def new(self, index):
|
||||||
n = OutputRKAdists(status=self._status)
|
n = BoundaryConditionTemperature(status=self._status)
|
||||||
self._lst.insert(index, n)
|
self._lst.insert(index, n)
|
||||||
self._status.modified()
|
self._status.modified()
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
@property
|
||||||
|
def BCs_Temperature_List(self):
|
||||||
|
return self.lst
|
||||||
@@ -275,3 +275,44 @@ class D90AdisTS(SQLSubModel):
|
|||||||
x.set_as_not_deleted()
|
x.set_as_not_deleted()
|
||||||
|
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
split_rk = profile.rk
|
||||||
|
reach_rks = reach.reach.get_rk()
|
||||||
|
if len(reach_rks) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
parts = [
|
||||||
|
(reach1.id, min(reach_rks), split_rk),
|
||||||
|
(reach2.id, split_rk, max(reach_rks)),
|
||||||
|
]
|
||||||
|
specifications = [
|
||||||
|
specification
|
||||||
|
for specification in self._data
|
||||||
|
if (not specification.is_deleted() and
|
||||||
|
specification.reach == reach.id)
|
||||||
|
]
|
||||||
|
|
||||||
|
for specification in specifications:
|
||||||
|
begin = specification.start_rk
|
||||||
|
end = specification.end_rk
|
||||||
|
if begin is None or end is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
lower, upper = sorted((begin, end))
|
||||||
|
reverse = begin > end
|
||||||
|
|
||||||
|
for new_reach, part_lower, part_upper in parts:
|
||||||
|
clipped_lower = max(lower, part_lower)
|
||||||
|
clipped_upper = min(upper, part_upper)
|
||||||
|
if clipped_lower >= clipped_upper:
|
||||||
|
continue
|
||||||
|
|
||||||
|
start_rk = clipped_upper if reverse else clipped_lower
|
||||||
|
end_rk = clipped_lower if reverse else clipped_upper
|
||||||
|
self._data.append(specification.cloned_for(
|
||||||
|
new_reach, start_rk, end_rk
|
||||||
|
))
|
||||||
|
|
||||||
|
if len(specifications) != 0:
|
||||||
|
self.modified()
|
||||||
@@ -61,6 +61,10 @@ class D90AdisTSList(PamhyrModelList):
|
|||||||
self._status.modified()
|
self._status.modified()
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
for d90 in self.lst:
|
||||||
|
d90.split_reach(reach, profile, reach1, reach2)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def D90_AdisTS_List(self):
|
def D90_AdisTS_List(self):
|
||||||
return self.lst
|
return self.lst
|
||||||
@@ -261,3 +261,13 @@ class D90AdisTSSpec(SQLSubModel):
|
|||||||
def enabled(self, enabled):
|
def enabled(self, enabled):
|
||||||
self._enabled = enabled
|
self._enabled = enabled
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
|
def cloned_for(self, reach, start_rk, end_rk):
|
||||||
|
new = D90AdisTSSpec(name=self._name_section, status=self._status)
|
||||||
|
new._reach = reach
|
||||||
|
new._start_rk = start_rk
|
||||||
|
new._end_rk = end_rk
|
||||||
|
new._d90 = self._d90
|
||||||
|
new._enabled = self._enabled
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
@@ -329,3 +329,44 @@ class DIFAdisTS(SQLSubModel):
|
|||||||
x.set_as_not_deleted()
|
x.set_as_not_deleted()
|
||||||
|
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
split_rk = profile.rk
|
||||||
|
reach_rks = reach.reach.get_rk()
|
||||||
|
if len(reach_rks) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
parts = [
|
||||||
|
(reach1.id, min(reach_rks), split_rk),
|
||||||
|
(reach2.id, split_rk, max(reach_rks)),
|
||||||
|
]
|
||||||
|
specifications = [
|
||||||
|
specification
|
||||||
|
for specification in self._data
|
||||||
|
if (not specification.is_deleted() and
|
||||||
|
specification.reach == reach.id)
|
||||||
|
]
|
||||||
|
|
||||||
|
for specification in specifications:
|
||||||
|
begin = specification.start_rk
|
||||||
|
end = specification.end_rk
|
||||||
|
if begin is None or end is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
lower, upper = sorted((begin, end))
|
||||||
|
reverse = begin > end
|
||||||
|
|
||||||
|
for new_reach, part_lower, part_upper in parts:
|
||||||
|
clipped_lower = max(lower, part_lower)
|
||||||
|
clipped_upper = min(upper, part_upper)
|
||||||
|
if clipped_lower >= clipped_upper:
|
||||||
|
continue
|
||||||
|
|
||||||
|
start_rk = clipped_upper if reverse else clipped_lower
|
||||||
|
end_rk = clipped_lower if reverse else clipped_upper
|
||||||
|
self._data.append(specification.cloned_for(
|
||||||
|
new_reach, start_rk, end_rk
|
||||||
|
))
|
||||||
|
|
||||||
|
if len(specifications) != 0:
|
||||||
|
self.modified()
|
||||||
@@ -61,6 +61,10 @@ class DIFAdisTSList(PamhyrModelList):
|
|||||||
self._status.modified()
|
self._status.modified()
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
for dif in self.lst:
|
||||||
|
dif.split_reach(reach, profile, reach1, reach2)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def DIF_AdisTS_List(self):
|
def DIF_AdisTS_List(self):
|
||||||
return self.lst
|
return self.lst
|
||||||
@@ -293,3 +293,15 @@ class DIFAdisTSSpec(SQLSubModel):
|
|||||||
def enabled(self, enabled):
|
def enabled(self, enabled):
|
||||||
self._enabled = enabled
|
self._enabled = enabled
|
||||||
self._status.modified()
|
self._status.modified()
|
||||||
|
|
||||||
|
def cloned_for(self, reach, start_rk, end_rk):
|
||||||
|
new = DIFAdisTSSpec(method=self._method, status=self._status)
|
||||||
|
new._reach = reach
|
||||||
|
new._start_rk = start_rk
|
||||||
|
new._end_rk = end_rk
|
||||||
|
new._dif = self._dif
|
||||||
|
new._b = self._b
|
||||||
|
new._c = self._c
|
||||||
|
new._enabled = self._enabled
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
@@ -109,16 +109,22 @@ class FrictionList(PamhyrModelList):
|
|||||||
((999 ** 100), -(999 ** 100))
|
((999 ** 100), -(999 ** 100))
|
||||||
)
|
)
|
||||||
|
|
||||||
frictions = list(
|
for friction in self.lst:
|
||||||
filter(
|
lower, upper = sorted((friction.begin_rk, friction.end_rk))
|
||||||
lambda f: ((rk_min <= f.begin_rk <= rk_max) or
|
clipped_lower = max(lower, rk_min)
|
||||||
(rk_min <= f.end_rk <= rk_max)),
|
clipped_upper = min(upper, rk_max)
|
||||||
self._lst))
|
if clipped_lower >= clipped_upper:
|
||||||
|
continue
|
||||||
|
|
||||||
for ind, friction in enumerate(frictions):
|
|
||||||
n = friction.cloned_for(reach)
|
n = friction.cloned_for(reach)
|
||||||
|
if friction.begin_rk > friction.end_rk:
|
||||||
|
n.begin_rk = clipped_upper
|
||||||
|
n.end_rk = clipped_lower
|
||||||
|
else:
|
||||||
|
n.begin_rk = clipped_lower
|
||||||
|
n.end_rk = clipped_upper
|
||||||
|
|
||||||
new._lst.insert(ind, n)
|
new._lst.append(n)
|
||||||
new._status.modified()
|
new._status.modified()
|
||||||
|
|
||||||
return new
|
return new
|
||||||
@@ -55,8 +55,11 @@ class Point(SQLSubModel):
|
|||||||
|
|
||||||
@name.setter
|
@name.setter
|
||||||
def name(self, name):
|
def name(self, name):
|
||||||
|
changed = self._name != name
|
||||||
self._name = name
|
self._name = name
|
||||||
self.modified()
|
self.modified()
|
||||||
|
if changed and self._profile is not None:
|
||||||
|
self._profile.content_modified()
|
||||||
|
|
||||||
def is_named(self):
|
def is_named(self):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -95,12 +95,11 @@ class PointXYZ(Point):
|
|||||||
"ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
|
"ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
|
||||||
)
|
)
|
||||||
|
|
||||||
if major == "0" and minor == "2":
|
# Try to create index at each update
|
||||||
if int(release) < 5:
|
execute(
|
||||||
execute(
|
"CREATE INDEX IF NOT EXISTS idx_point " +
|
||||||
"CREATE INDEX idx_point " +
|
"ON geometry_pointXYZ(profile, scenario);"
|
||||||
"ON geometry_pointXYZ(profile, scenario);"
|
)
|
||||||
)
|
|
||||||
|
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@@ -329,8 +328,11 @@ class PointXYZ(Point):
|
|||||||
|
|
||||||
@x.setter
|
@x.setter
|
||||||
def x(self, value):
|
def x(self, value):
|
||||||
|
changed = self._x != float(value)
|
||||||
self._x = float(value)
|
self._x = float(value)
|
||||||
self.modified()
|
self.modified()
|
||||||
|
if changed and self._profile is not None:
|
||||||
|
self._profile.content_modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def y(self):
|
def y(self):
|
||||||
@@ -338,8 +340,11 @@ class PointXYZ(Point):
|
|||||||
|
|
||||||
@y.setter
|
@y.setter
|
||||||
def y(self, value):
|
def y(self, value):
|
||||||
|
changed = self._y != float(value)
|
||||||
self._y = float(value)
|
self._y = float(value)
|
||||||
self.modified()
|
self.modified()
|
||||||
|
if changed and self._profile is not None:
|
||||||
|
self._profile.content_modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def z(self):
|
def z(self):
|
||||||
@@ -347,8 +352,11 @@ class PointXYZ(Point):
|
|||||||
|
|
||||||
@z.setter
|
@z.setter
|
||||||
def z(self, value):
|
def z(self, value):
|
||||||
|
changed = self._z != float(value)
|
||||||
self._z = float(value)
|
self._z = float(value)
|
||||||
self.modified()
|
self.modified()
|
||||||
|
if changed and self._profile is not None:
|
||||||
|
self._profile.content_modified()
|
||||||
|
|
||||||
def shift(self, x, y, z):
|
def shift(self, x, y, z):
|
||||||
self.x += x
|
self.x += x
|
||||||
|
|||||||
@@ -47,6 +47,8 @@ class Profile(object):
|
|||||||
self._sl = None
|
self._sl = None
|
||||||
|
|
||||||
self._points: List[Point] = []
|
self._points: List[Point] = []
|
||||||
|
self._modification_count = 0
|
||||||
|
self._old_interpolated = ""
|
||||||
|
|
||||||
self._profile_type = _type
|
self._profile_type = _type
|
||||||
|
|
||||||
@@ -160,8 +162,13 @@ class Profile(object):
|
|||||||
|
|
||||||
@rk.setter
|
@rk.setter
|
||||||
def rk(self, value: float):
|
def rk(self, value: float):
|
||||||
self._rk = float(value)
|
value = float(value)
|
||||||
self.modified()
|
changed = value != self._rk
|
||||||
|
self._rk = value
|
||||||
|
if changed:
|
||||||
|
self.content_modified()
|
||||||
|
else:
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self):
|
def name(self):
|
||||||
@@ -173,8 +180,13 @@ class Profile(object):
|
|||||||
|
|
||||||
@name.setter
|
@name.setter
|
||||||
def name(self, value: str):
|
def name(self, value: str):
|
||||||
self._name = value.strip()
|
value = value.strip()
|
||||||
self.modified()
|
changed = value != self._name
|
||||||
|
self._name = value
|
||||||
|
if changed:
|
||||||
|
self.content_modified()
|
||||||
|
else:
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def sl(self):
|
def sl(self):
|
||||||
@@ -217,6 +229,38 @@ class Profile(object):
|
|||||||
return [point for point in self.points
|
return [point for point in self.points
|
||||||
if point.is_named()]
|
if point.is_named()]
|
||||||
|
|
||||||
|
@property
|
||||||
|
def modification_count(self):
|
||||||
|
"""Content revision for this session; not stored in the database."""
|
||||||
|
return self._modification_count
|
||||||
|
|
||||||
|
def increase_modification_count(self):
|
||||||
|
"""Increase content revision for this session;
|
||||||
|
not stored in the database."""
|
||||||
|
self._modification_count += 1
|
||||||
|
|
||||||
|
def decrease_modification_count(self):
|
||||||
|
"""Decrease content revision for this session;
|
||||||
|
not stored in the database."""
|
||||||
|
self._modification_count -= 1
|
||||||
|
|
||||||
|
@property
|
||||||
|
def old_interpolated(self):
|
||||||
|
"""Old interpolated value for this session;
|
||||||
|
not stored in the database."""
|
||||||
|
return self._old_interpolated
|
||||||
|
|
||||||
|
@old_interpolated.setter
|
||||||
|
def old_interpolated(self, value):
|
||||||
|
self._old_interpolated = value
|
||||||
|
|
||||||
|
def content_modified(self):
|
||||||
|
"""An edited profile is no longer an interpolation result."""
|
||||||
|
# self._modification_count += 1
|
||||||
|
if hasattr(self, "_interpolated"):
|
||||||
|
self._interpolated = False
|
||||||
|
self.modified()
|
||||||
|
|
||||||
def insert_point(self, index: int, point: Point):
|
def insert_point(self, index: int, point: Point):
|
||||||
"""Insert point at index.
|
"""Insert point at index.
|
||||||
|
|
||||||
@@ -232,7 +276,7 @@ class Profile(object):
|
|||||||
else:
|
else:
|
||||||
self._points.insert(index, point)
|
self._points.insert(index, point)
|
||||||
|
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
def delete_i(self, indexes: list):
|
def delete_i(self, indexes: list):
|
||||||
list(
|
list(
|
||||||
@@ -245,7 +289,7 @@ class Profile(object):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
def delete_points(self, points):
|
def delete_points(self, points):
|
||||||
"""Delete some elements in profile list
|
"""Delete some elements in profile list
|
||||||
@@ -262,7 +306,7 @@ class Profile(object):
|
|||||||
points
|
points
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
# Move
|
# Move
|
||||||
|
|
||||||
@@ -272,7 +316,7 @@ class Profile(object):
|
|||||||
|
|
||||||
p = self._points
|
p = self._points
|
||||||
p[index], p[next] = p[next], p[index]
|
p[index], p[next] = p[next], p[index]
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
def move_down_point(self, index: int):
|
def move_down_point(self, index: int):
|
||||||
if index >= 0:
|
if index >= 0:
|
||||||
@@ -280,7 +324,7 @@ class Profile(object):
|
|||||||
|
|
||||||
p = self._points
|
p = self._points
|
||||||
p[index], p[prev] = p[prev], p[index]
|
p[index], p[prev] = p[prev], p[index]
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
# Sort
|
# Sort
|
||||||
|
|
||||||
@@ -297,7 +341,7 @@ class Profile(object):
|
|||||||
key=predicate,
|
key=predicate,
|
||||||
reverse=is_reversed
|
reverse=is_reversed
|
||||||
)
|
)
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
@timer
|
@timer
|
||||||
def sort_with_indexes(self, indexes: list):
|
def sort_with_indexes(self, indexes: list):
|
||||||
@@ -313,12 +357,12 @@ class Profile(object):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
@timer
|
@timer
|
||||||
def reverse(self):
|
def reverse(self):
|
||||||
self._points.reverse()
|
self._points.reverse()
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
# Sediment Layers
|
# Sediment Layers
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,8 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
num=0,
|
num=0,
|
||||||
nb_point: int = 0,
|
nb_point: int = 0,
|
||||||
code1: int = 0, code2: int = 0,
|
code1: int = 0, code2: int = 0,
|
||||||
status=None, owner_scenario=-1):
|
status=None, owner_scenario=-1,
|
||||||
|
enabled=True, interpolated=False):
|
||||||
"""ProfileXYZ constructor
|
"""ProfileXYZ constructor
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
@@ -90,6 +91,8 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
self.time_l = 0.0
|
self.time_l = 0.0
|
||||||
self._station = []
|
self._station = []
|
||||||
self.station_up_to_date = False
|
self.station_up_to_date = False
|
||||||
|
self._enabled = bool(enabled)
|
||||||
|
self._interpolated = bool(interpolated)
|
||||||
|
|
||||||
self._get_water_limits_cache = {}
|
self._get_water_limits_cache = {}
|
||||||
self._get_water_limits_ac_cache = {}
|
self._get_water_limits_ac_cache = {}
|
||||||
@@ -108,6 +111,8 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
code1 INTEGER NOT NULL,
|
code1 INTEGER NOT NULL,
|
||||||
code2 INTEGER NOT NULL,
|
code2 INTEGER NOT NULL,
|
||||||
sl INTEGER,
|
sl INTEGER,
|
||||||
|
enabled BOOLEAN NOT NULL DEFAULT TRUE,
|
||||||
|
interpolated BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
{Scenario.create_db_add_scenario()},
|
{Scenario.create_db_add_scenario()},
|
||||||
{Scenario.create_db_add_scenario_fk()},
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
FOREIGN KEY(reach) REFERENCES river_reach(pamhyr_id),
|
FOREIGN KEY(reach) REFERENCES river_reach(pamhyr_id),
|
||||||
@@ -152,6 +157,27 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
"ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
|
"ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if major == "0" and int(minor) <= 2:
|
||||||
|
if int(release) < 9:
|
||||||
|
execute(
|
||||||
|
"ALTER TABLE geometry_profileXYZ " +
|
||||||
|
"ADD COLUMN enabled BOOLEAN NOT NULL DEFAULT TRUE"
|
||||||
|
)
|
||||||
|
|
||||||
|
if major == "0" and (int(minor) < 2 or
|
||||||
|
(minor == "2" and int(release) < 10)):
|
||||||
|
if minor != "0":
|
||||||
|
execute(
|
||||||
|
"ALTER TABLE geometry_profileXYZ " +
|
||||||
|
"ADD COLUMN interpolated BOOLEAN NOT NULL DEFAULT FALSE"
|
||||||
|
)
|
||||||
|
execute(
|
||||||
|
"UPDATE geometry_profileXYZ " +
|
||||||
|
"SET interpolated = CASE " +
|
||||||
|
"WHEN LOWER(name) LIKE 'interpol%' THEN TRUE " +
|
||||||
|
"ELSE FALSE END"
|
||||||
|
)
|
||||||
|
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@@ -237,7 +263,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
|
|
||||||
table = execute(
|
table = execute(
|
||||||
"SELECT pamhyr_id, ind, deleted, name, rk, num, " +
|
"SELECT pamhyr_id, ind, deleted, name, rk, num, " +
|
||||||
"code1, code2, sl, scenario " +
|
"code1, code2, sl, scenario, enabled, interpolated " +
|
||||||
"FROM geometry_profileXYZ " +
|
"FROM geometry_profileXYZ " +
|
||||||
f"WHERE reach = {reach.id} " +
|
f"WHERE reach = {reach.id} " +
|
||||||
f"AND scenario = {scenario.id} " +
|
f"AND scenario = {scenario.id} " +
|
||||||
@@ -258,6 +284,8 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
code2 = next(it)
|
code2 = next(it)
|
||||||
sl = next(it)
|
sl = next(it)
|
||||||
owner_scenario = next(it)
|
owner_scenario = next(it)
|
||||||
|
enabled = (next(it) == 1)
|
||||||
|
interpolated = (next(it) == 1)
|
||||||
|
|
||||||
profile = cls(
|
profile = cls(
|
||||||
id=pid, ind=ind, num=num,
|
id=pid, ind=ind, num=num,
|
||||||
@@ -265,7 +293,9 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
code1=code1, code2=code2,
|
code1=code1, code2=code2,
|
||||||
reach=reach,
|
reach=reach,
|
||||||
status=status,
|
status=status,
|
||||||
owner_scenario=owner_scenario
|
owner_scenario=owner_scenario,
|
||||||
|
enabled=enabled,
|
||||||
|
interpolated=interpolated
|
||||||
)
|
)
|
||||||
if deleted:
|
if deleted:
|
||||||
profile.set_as_deleted()
|
profile.set_as_deleted()
|
||||||
@@ -318,12 +348,14 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
execute(
|
execute(
|
||||||
"INSERT OR REPLACE INTO " +
|
"INSERT OR REPLACE INTO " +
|
||||||
"geometry_profileXYZ(pamhyr_id, deleted, ind, name, reach, " +
|
"geometry_profileXYZ(pamhyr_id, deleted, ind, name, reach, " +
|
||||||
"rk, num, code1, code2, sl, scenario) " +
|
"rk, num, code1, code2, sl, scenario, enabled, interpolated) " +
|
||||||
"VALUES (" +
|
"VALUES (" +
|
||||||
f"{self.pamhyr_id}, {self._db_format(self.is_deleted())}, " +
|
f"{self.pamhyr_id}, {self._db_format(self.is_deleted())}, " +
|
||||||
f"{ind}, '{self._db_format(self._name)}', " +
|
f"{ind}, '{self._db_format(self._name)}', " +
|
||||||
f"{self.reach.pamhyr_id}, {self.rk}, {self.num}, " +
|
f"{self.reach.pamhyr_id}, {self.rk}, {self.num}, " +
|
||||||
f"{self.code1}, {self.code1}, {sl}, {self._status.scenario_id}" +
|
f"{self.code1}, {self.code1}, {sl}, {self._status.scenario_id}, " +
|
||||||
|
f"{self._db_format(self._enabled)}, " +
|
||||||
|
f"{self._db_format(self._interpolated)}" +
|
||||||
")"
|
")"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -390,7 +422,9 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
name=self.name,
|
name=self.name,
|
||||||
rk=self.rk,
|
rk=self.rk,
|
||||||
reach=self.reach,
|
reach=self.reach,
|
||||||
status=self._status
|
status=self._status,
|
||||||
|
enabled=self.is_enabled,
|
||||||
|
interpolated=self.interpolated
|
||||||
)
|
)
|
||||||
if self.is_deleted():
|
if self.is_deleted():
|
||||||
new_p.set_as_deleted()
|
new_p.set_as_deleted()
|
||||||
@@ -410,7 +444,9 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
name=self.name,
|
name=self.name,
|
||||||
rk=self.rk,
|
rk=self.rk,
|
||||||
reach=new_reach,
|
reach=new_reach,
|
||||||
status=self._status
|
status=self._status,
|
||||||
|
enabled=self.is_enabled,
|
||||||
|
interpolated=self.interpolated
|
||||||
)
|
)
|
||||||
if self.is_deleted():
|
if self.is_deleted():
|
||||||
new_p.set_as_deleted()
|
new_p.set_as_deleted()
|
||||||
@@ -523,7 +559,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
)
|
)
|
||||||
self._points.append(pt)
|
self._points.append(pt)
|
||||||
|
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
def get_point_i(self, index: int) -> PointXYZ:
|
def get_point_i(self, index: int) -> PointXYZ:
|
||||||
"""Get point at index.
|
"""Get point at index.
|
||||||
@@ -588,7 +624,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
)
|
)
|
||||||
self.points.append(point_xyz)
|
self.points.append(point_xyz)
|
||||||
|
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
def insert(self, index: int):
|
def insert(self, index: int):
|
||||||
"""Insert a new point at index.
|
"""Insert a new point at index.
|
||||||
@@ -607,7 +643,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
point = PointXYZ(x=x, y=y, z=z, profile=self, status=self._status)
|
point = PointXYZ(x=x, y=y, z=z, profile=self, status=self._status)
|
||||||
self._points.insert(index, point)
|
self._points.insert(index, point)
|
||||||
|
|
||||||
self.modified()
|
self.content_modified()
|
||||||
|
|
||||||
return point
|
return point
|
||||||
|
|
||||||
@@ -967,7 +1003,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
Projection of the points of the profile on a plane.
|
Projection of the points of the profile on a plane.
|
||||||
"""
|
"""
|
||||||
if self.nb_points < 2:
|
if self.nb_points < 2:
|
||||||
return [0.0]
|
return [0.0] * self.nb_points
|
||||||
else:
|
else:
|
||||||
if self.station_up_to_date:
|
if self.station_up_to_date:
|
||||||
return self._station
|
return self._station
|
||||||
@@ -1131,11 +1167,14 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
p = ProfileXYZ(name=self.name,
|
p = ProfileXYZ(name=self.name,
|
||||||
rk=self.rk,
|
rk=self.rk,
|
||||||
reach=self.reach,
|
reach=self.reach,
|
||||||
status=self._status)
|
status=self._status,
|
||||||
|
enabled=self.is_enabled,
|
||||||
|
interpolated=self.interpolated)
|
||||||
|
|
||||||
for i, k in enumerate(self.points):
|
for i, k in enumerate(self.points):
|
||||||
p.insert_point(i, k.copy())
|
p.insert_point(i, k.cloned_for(p))
|
||||||
|
|
||||||
|
p._interpolated = self.interpolated
|
||||||
return p
|
return p
|
||||||
|
|
||||||
def purge_aligned_points(self):
|
def purge_aligned_points(self):
|
||||||
@@ -1165,3 +1204,25 @@ class ProfileXYZ(Profile, SQLSubModel):
|
|||||||
break
|
break
|
||||||
self._points = points
|
self._points = points
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def is_enabled(self):
|
||||||
|
return self._enabled
|
||||||
|
|
||||||
|
@property
|
||||||
|
def enabled(self):
|
||||||
|
return self._enabled
|
||||||
|
|
||||||
|
@enabled.setter
|
||||||
|
def enabled(self, value):
|
||||||
|
self._enabled = bool(value)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def interpolated(self):
|
||||||
|
return self._interpolated
|
||||||
|
|
||||||
|
@interpolated.setter
|
||||||
|
def interpolated(self, value):
|
||||||
|
self._interpolated = bool(value)
|
||||||
|
self.modified()
|
||||||
@@ -80,11 +80,13 @@ class Reach(SQLSubModel):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def _db_load(cls, execute, data=None):
|
def _db_load(cls, execute, data=None):
|
||||||
new = cls(status=data["status"], parent=data["reach"])
|
new = cls(status=data["status"], parent=data["reach"])
|
||||||
|
profile_data = data.copy()
|
||||||
|
profile_data["reach"] = new
|
||||||
|
|
||||||
new._profiles = sorted(
|
new._profiles = sorted(
|
||||||
ProfileXYZ._db_load(
|
ProfileXYZ._db_load(
|
||||||
execute,
|
execute,
|
||||||
data=data.copy()
|
data=profile_data
|
||||||
),
|
),
|
||||||
key=lambda p: p._db_ind
|
key=lambda p: p._db_ind
|
||||||
)
|
)
|
||||||
@@ -157,6 +159,14 @@ class Reach(SQLSubModel):
|
|||||||
def profiles(self, profiles):
|
def profiles(self, profiles):
|
||||||
self._profiles = profiles
|
self._profiles = profiles
|
||||||
|
|
||||||
|
@property
|
||||||
|
def enabled_profiles(self):
|
||||||
|
return list(filter(lambda p: p.is_enabled, self.profiles))
|
||||||
|
|
||||||
|
@property
|
||||||
|
def number_enabled_profiles(self):
|
||||||
|
return len(self.enabled_profiles)
|
||||||
|
|
||||||
def get_profiles_from_rk(self, rk):
|
def get_profiles_from_rk(self, rk):
|
||||||
return list(
|
return list(
|
||||||
filter(
|
filter(
|
||||||
@@ -367,6 +377,28 @@ class Reach(SQLSubModel):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def get_z_min_enabled_profiles(self):
|
||||||
|
return list(
|
||||||
|
map(
|
||||||
|
lambda profile: profile.z_min(),
|
||||||
|
filter(
|
||||||
|
lambda profile: len(profile) > 0 and profile.is_enabled,
|
||||||
|
self.profiles
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_z_max_enabled_profiles(self):
|
||||||
|
return list(
|
||||||
|
map(
|
||||||
|
lambda profile: profile.z_max(),
|
||||||
|
filter(
|
||||||
|
lambda profile: len(profile) > 0 and profile.is_enabled,
|
||||||
|
self.profiles
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
def get_rk(self):
|
def get_rk(self):
|
||||||
"""List of profiles rk
|
"""List of profiles rk
|
||||||
|
|
||||||
@@ -375,6 +407,17 @@ class Reach(SQLSubModel):
|
|||||||
"""
|
"""
|
||||||
return [profile.rk for profile in self.profiles]
|
return [profile.rk for profile in self.profiles]
|
||||||
|
|
||||||
|
def get_rk_enabled_profiles(self):
|
||||||
|
return list(
|
||||||
|
map(
|
||||||
|
lambda profile: profile.rk,
|
||||||
|
filter(
|
||||||
|
lambda profile: len(profile) > 0 and profile.is_enabled,
|
||||||
|
self.profiles
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
def get_rk_complete_profiles(self):
|
def get_rk_complete_profiles(self):
|
||||||
return list(
|
return list(
|
||||||
map(
|
map(
|
||||||
@@ -486,14 +529,22 @@ class Reach(SQLSubModel):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@timer
|
@timer
|
||||||
def compute_guidelines(self):
|
def compute_guidelines(self, profiles=None, update_cache=True):
|
||||||
"""Compute reach guidelines
|
"""Compute reach guidelines
|
||||||
|
|
||||||
|
Args:
|
||||||
|
profiles: Profiles used to compute the guidelines. If omitted,
|
||||||
|
all non-deleted profiles of the reach are used.
|
||||||
|
update_cache: Whether to update the reach guidelines cache.
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Tuple of complete and incomplete guidelines name.
|
Tuple of complete and incomplete guidelines name.
|
||||||
"""
|
"""
|
||||||
|
if profiles is None:
|
||||||
|
profiles = self.profiles
|
||||||
|
|
||||||
# Get all point contained into a guideline
|
# Get all point contained into a guideline
|
||||||
named_points = [profile.named_points() for profile in self.profiles]
|
named_points = [profile.named_points() for profile in profiles]
|
||||||
points_name = list(
|
points_name = list(
|
||||||
map(
|
map(
|
||||||
lambda lst: list(map(lambda p: p.name, lst)),
|
lambda lst: list(map(lambda p: p.name, lst)),
|
||||||
@@ -524,11 +575,13 @@ class Reach(SQLSubModel):
|
|||||||
|
|
||||||
complete = guide_set - incomplete
|
complete = guide_set - incomplete
|
||||||
|
|
||||||
# Compute guideline and put data in cache
|
if update_cache:
|
||||||
self._compute_guidelines_cache(guide_set, named_points,
|
# Compute guideline and put data in cache
|
||||||
complete, incomplete)
|
self._compute_guidelines_cache(
|
||||||
|
guide_set, named_points, complete, incomplete
|
||||||
|
)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
self.modified()
|
|
||||||
return (complete, incomplete)
|
return (complete, incomplete)
|
||||||
|
|
||||||
def _map_guidelines_points(self, func, full=False):
|
def _map_guidelines_points(self, func, full=False):
|
||||||
@@ -752,8 +805,11 @@ class Reach(SQLSubModel):
|
|||||||
list_profile.append(list_point_profile)
|
list_profile.append(list_point_profile)
|
||||||
list_point_profile = []
|
list_point_profile = []
|
||||||
else:
|
else:
|
||||||
line.append("")
|
# MAGE-8 ST files can append hydraulic data
|
||||||
list_point_profile.append(line[:3])
|
# after the regular x, y, z and point-name
|
||||||
|
# fields. ProfileXYZ still expects exactly
|
||||||
|
# those first four fields.
|
||||||
|
list_point_profile.append(line[:4])
|
||||||
else:
|
else:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -277,3 +277,10 @@ class BasicHS(SQLSubModel):
|
|||||||
|
|
||||||
def convert(self, new_type):
|
def convert(self, new_type):
|
||||||
return new_type(id=self.id, name=self.name, status=self._status)
|
return new_type(id=self.id, name=self.name, status=self._status)
|
||||||
|
|
||||||
|
def cloned(self):
|
||||||
|
new = type(self)(name=self._name, status=self._status)
|
||||||
|
new._enabled = self._enabled
|
||||||
|
new._data = [value.cloned() for value in self._data]
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
@@ -208,3 +208,11 @@ class BHSValue(SQLSubModel):
|
|||||||
def value(self, value):
|
def value(self, value):
|
||||||
self._value = self._type(value)
|
self._value = self._type(value)
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
|
def cloned(self):
|
||||||
|
return BHSValue(
|
||||||
|
name=self._name,
|
||||||
|
type=self._type,
|
||||||
|
value=self._value,
|
||||||
|
status=self._status
|
||||||
|
)
|
||||||
@@ -47,9 +47,7 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
|
|
||||||
self._name = name
|
self._name = name
|
||||||
self._input_section = None
|
self._input_section = None
|
||||||
self._output_section = None
|
|
||||||
self._input_reach = None
|
self._input_reach = None
|
||||||
self._output_reach = None
|
|
||||||
self._enabled = True
|
self._enabled = True
|
||||||
self._data = []
|
self._data = []
|
||||||
|
|
||||||
@@ -62,17 +60,12 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
name TEXT NOT NULL,
|
name TEXT NOT NULL,
|
||||||
enabled BOOLEAN NOT NULL,
|
enabled BOOLEAN NOT NULL,
|
||||||
input_reach INTEGER,
|
input_reach INTEGER,
|
||||||
output_reach INTEGER,
|
|
||||||
input_section INTEGER,
|
input_section INTEGER,
|
||||||
output_section INTEGER,
|
|
||||||
{Scenario.create_db_add_scenario()},
|
{Scenario.create_db_add_scenario()},
|
||||||
{Scenario.create_db_add_scenario_fk()},
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
FOREIGN KEY(input_reach) REFERENCES river_reach(pamhyr_id),
|
FOREIGN KEY(input_reach) REFERENCES river_reach(pamhyr_id),
|
||||||
FOREIGN KEY(output_reach) REFERENCES river_reach(pamhyr_id),
|
|
||||||
FOREIGN KEY(input_section)
|
FOREIGN KEY(input_section)
|
||||||
REFERENCES geometry_profileXYZ(pamhyr_id),
|
REFERENCES geometry_profileXYZ(pamhyr_id),
|
||||||
FOREIGN KEY(output_section)
|
|
||||||
REFERENCES geometry_profileXYZ(pamhyr_id),
|
|
||||||
PRIMARY KEY(pamhyr_id, scenario)
|
PRIMARY KEY(pamhyr_id, scenario)
|
||||||
)
|
)
|
||||||
""")
|
""")
|
||||||
@@ -92,13 +85,12 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
if rl < 11:
|
if rl < 11:
|
||||||
for v in ["input", "output"]:
|
execute(
|
||||||
execute(
|
"""
|
||||||
f"""
|
ALTER TABLE hydraulic_structures
|
||||||
ALTER TABLE hydraulic_structures
|
RENAME COLUMN input_kp TO input_rk
|
||||||
RENAME COLUMN {v}_kp TO {v}_rk
|
"""
|
||||||
"""
|
)
|
||||||
)
|
|
||||||
|
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
cls._db_update_to_0_2_0(execute, data)
|
||||||
|
|
||||||
@@ -112,8 +104,28 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
"ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
|
"ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if major == "0" and (int(minor) < 2 or
|
||||||
|
(minor == "2" and rl < 10)):
|
||||||
|
cls._db_update_to_0_2_10(execute)
|
||||||
|
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_update_to_0_2_10(cls, execute):
|
||||||
|
table = "hydraulic_structures"
|
||||||
|
cls._db_create(execute, ext="_tmp")
|
||||||
|
|
||||||
|
execute(
|
||||||
|
f"INSERT INTO {table}_tmp " +
|
||||||
|
"(pamhyr_id, deleted, name, enabled, input_section, " +
|
||||||
|
"input_reach, scenario) " +
|
||||||
|
"SELECT pamhyr_id, deleted, name, enabled, input_section, " +
|
||||||
|
f"input_reach, scenario FROM {table}"
|
||||||
|
)
|
||||||
|
|
||||||
|
execute(f"DROP TABLE {table}")
|
||||||
|
execute(f"ALTER TABLE {table}_tmp RENAME TO {table}")
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_2_0(cls, execute, data):
|
def _db_update_to_0_2_0(cls, execute, data):
|
||||||
table = "hydraulic_structures"
|
table = "hydraulic_structures"
|
||||||
@@ -131,11 +143,10 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
|
|
||||||
execute(
|
execute(
|
||||||
f"INSERT INTO {table}_tmp " +
|
f"INSERT INTO {table}_tmp " +
|
||||||
"(pamhyr_id, name, enabled, input_section, output_section, " +
|
"(pamhyr_id, name, enabled, input_section, " +
|
||||||
"input_reach, output_reach, scenario) " +
|
"input_reach, scenario) " +
|
||||||
"SELECT pamhyr_id, name, enabled, " +
|
"SELECT pamhyr_id, name, enabled, " +
|
||||||
"input_section, output_section, " +
|
"input_section, input_reach, scenario " +
|
||||||
"input_reach, output_reach, scenario " +
|
|
||||||
f"FROM {table}"
|
f"FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -145,44 +156,38 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_2_0_set_reach_pid(cls, execute, table, reachs):
|
def _db_update_to_0_2_0_set_reach_pid(cls, execute, table, reachs):
|
||||||
els = execute(
|
els = execute(
|
||||||
f"SELECT pamhyr_id, input_reach, output_reach FROM {table}"
|
f"SELECT pamhyr_id, input_reach FROM {table}"
|
||||||
)
|
)
|
||||||
|
|
||||||
for row in els:
|
for row in els:
|
||||||
it = iter(row)
|
it = iter(row)
|
||||||
pid = next(it)
|
pid = next(it)
|
||||||
in_reach_id = next(it)
|
in_reach_id = next(it)
|
||||||
out_reach_id = next(it)
|
|
||||||
|
|
||||||
if in_reach_id == -1:
|
if in_reach_id == -1:
|
||||||
return
|
return
|
||||||
|
|
||||||
if out_reach_id == -1:
|
|
||||||
out_reach_id = in_reach_id
|
|
||||||
|
|
||||||
execute(
|
execute(
|
||||||
f"UPDATE {table} " +
|
f"UPDATE {table} " +
|
||||||
f"SET input_reach = {reachs[in_reach_id]}, " +
|
f"SET input_reach = {reachs[in_reach_id]} " +
|
||||||
f"output_reach = {reachs[out_reach_id]} " +
|
|
||||||
f"WHERE pamhyr_id = {pid}"
|
f"WHERE pamhyr_id = {pid}"
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update_to_0_1_1(cls, execute, data,
|
def _db_update_to_0_1_1(cls, execute, data,
|
||||||
origin_version="0.1.0"):
|
origin_version="0.1.0"):
|
||||||
for v in ["input", "output"]:
|
execute(
|
||||||
execute(
|
"ALTER TABLE hydraulic_structures " +
|
||||||
"ALTER TABLE hydraulic_structures " +
|
"ADD COLUMN input_section INTEGER"
|
||||||
f"ADD COLUMN {v}_section INTEGER"
|
)
|
||||||
)
|
|
||||||
|
|
||||||
cls._db_update_to_0_1_1_assoc_section_from_rk(
|
cls._db_update_to_0_1_1_assoc_section_from_rk(
|
||||||
execute, "hydraulic_structures",
|
execute, "hydraulic_structures",
|
||||||
reach_column=f"{v}_reach",
|
reach_column="input_reach",
|
||||||
rk_column=f"{v}_rk",
|
rk_column="input_rk",
|
||||||
section_column=f"{v}_section",
|
section_column="input_section",
|
||||||
origin_version=origin_version
|
origin_version=origin_version
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_load(cls, execute, data=None):
|
def _db_load(cls, execute, data=None):
|
||||||
@@ -196,8 +201,7 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
|
|
||||||
table = execute(
|
table = execute(
|
||||||
"SELECT pamhyr_id, deleted, name, enabled, " +
|
"SELECT pamhyr_id, deleted, name, enabled, " +
|
||||||
"input_section, output_section, " +
|
"input_section, input_reach, scenario " +
|
||||||
"input_reach, output_reach, scenario " +
|
|
||||||
"FROM hydraulic_structures " +
|
"FROM hydraulic_structures " +
|
||||||
f"WHERE scenario = {scenario.id} " +
|
f"WHERE scenario = {scenario.id} " +
|
||||||
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
|
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
|
||||||
@@ -227,12 +231,7 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
input_section_id = (
|
input_section_id = (
|
||||||
-1 if input_section_id is None else input_section_id
|
-1 if input_section_id is None else input_section_id
|
||||||
)
|
)
|
||||||
output_section_id = next(it)
|
|
||||||
output_section_id = (
|
|
||||||
-1 if output_section_id is None else output_section_id
|
|
||||||
)
|
|
||||||
input_reach_id = next(it)
|
input_reach_id = next(it)
|
||||||
output_reach_id = next(it)
|
|
||||||
owner_scenario = next(it)
|
owner_scenario = next(it)
|
||||||
|
|
||||||
hs = cls(
|
hs = cls(
|
||||||
@@ -243,27 +242,19 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
hs.set_as_deleted()
|
hs.set_as_deleted()
|
||||||
|
|
||||||
hs.enabled = enabled
|
hs.enabled = enabled
|
||||||
hs.input_reach, hs.output_reach = reduce(
|
hs.input_reach = reduce(
|
||||||
lambda acc, n: (
|
lambda acc, n: n if n.pamhyr_id == input_reach_id else acc,
|
||||||
n if n.pamhyr_id == input_reach_id else acc[0],
|
|
||||||
n if n.pamhyr_id == output_reach_id else acc[1]
|
|
||||||
),
|
|
||||||
data["edges"],
|
data["edges"],
|
||||||
[None, None]
|
None
|
||||||
)
|
)
|
||||||
sections = []
|
sections = []
|
||||||
if hs.input_reach is not None:
|
if hs.input_reach is not None:
|
||||||
sections += hs.input_reach.reach.profiles
|
sections += hs.input_reach.reach.profiles
|
||||||
if hs.output_reach is not None:
|
|
||||||
sections += hs.output_reach.reach.profiles
|
|
||||||
|
|
||||||
hs.input_section, hs.output_section = reduce(
|
hs.input_section = reduce(
|
||||||
lambda acc, s: (
|
lambda acc, s: s if s.pamhyr_id == input_section_id else acc,
|
||||||
s if s.pamhyr_id == input_section_id else acc[0],
|
|
||||||
s if s.pamhyr_id == output_section_id else acc[1]
|
|
||||||
),
|
|
||||||
sections,
|
sections,
|
||||||
[None, None]
|
None
|
||||||
)
|
)
|
||||||
|
|
||||||
loaded.add(hs_id)
|
loaded.add(hs_id)
|
||||||
@@ -287,24 +278,15 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
if self._input_reach is not None:
|
if self._input_reach is not None:
|
||||||
input_reach_id = self._input_reach.pamhyr_id
|
input_reach_id = self._input_reach.pamhyr_id
|
||||||
|
|
||||||
output_reach_id = -1
|
|
||||||
if self._output_reach is not None:
|
|
||||||
output_reach_id = self._output_reach.pamhyr_id
|
|
||||||
|
|
||||||
input_section = 'NULL'
|
input_section = 'NULL'
|
||||||
if self.input_section is not None:
|
if self.input_section is not None:
|
||||||
input_section = self.input_section.pamhyr_id
|
input_section = self.input_section.pamhyr_id
|
||||||
|
|
||||||
output_section = 'NULL'
|
|
||||||
if self.output_section is not None:
|
|
||||||
output_section = self.output_section.pamhyr_id
|
|
||||||
|
|
||||||
execute(
|
execute(
|
||||||
"INSERT INTO " +
|
"INSERT INTO " +
|
||||||
"hydraulic_structures(" +
|
"hydraulic_structures(" +
|
||||||
" pamhyr_id, deleted, name, enabled, " +
|
" pamhyr_id, deleted, name, enabled, " +
|
||||||
" input_section, output_section, " +
|
" input_section, input_reach, " +
|
||||||
" input_reach, output_reach, " +
|
|
||||||
" scenario" +
|
" scenario" +
|
||||||
") " +
|
") " +
|
||||||
"VALUES (" +
|
"VALUES (" +
|
||||||
@@ -312,8 +294,7 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
f"{self._db_format(self.is_deleted())}, " +
|
f"{self._db_format(self.is_deleted())}, " +
|
||||||
f"'{self._db_format(self._name)}', " +
|
f"'{self._db_format(self._name)}', " +
|
||||||
f"{self._db_format(self.enabled)}, " +
|
f"{self._db_format(self.enabled)}, " +
|
||||||
f"{input_section}, {output_section}, " +
|
f"{input_section}, {input_reach_id}, " +
|
||||||
f"{input_reach_id}, {output_reach_id}, " +
|
|
||||||
f"{self._status.scenario_id}"
|
f"{self._status.scenario_id}"
|
||||||
")"
|
")"
|
||||||
)
|
)
|
||||||
@@ -371,13 +352,6 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
|
|
||||||
return self._input_section
|
return self._input_section
|
||||||
|
|
||||||
@property
|
|
||||||
def output_rk(self):
|
|
||||||
if self._output_section is None:
|
|
||||||
return None
|
|
||||||
|
|
||||||
return self._output_section
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def input_section(self):
|
def input_section(self):
|
||||||
return self._input_section
|
return self._input_section
|
||||||
@@ -387,15 +361,6 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
self._input_section = input_section
|
self._input_section = input_section
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
@property
|
|
||||||
def output_section(self):
|
|
||||||
return self._output_section
|
|
||||||
|
|
||||||
@output_section.setter
|
|
||||||
def output_section(self, output_section):
|
|
||||||
self._output_section = output_section
|
|
||||||
self.modified()
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def enabled(self):
|
def enabled(self):
|
||||||
return self._enabled
|
return self._enabled
|
||||||
@@ -414,19 +379,19 @@ class HydraulicStructure(SQLSubModel):
|
|||||||
self._input_reach = input_reach
|
self._input_reach = input_reach
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
@property
|
|
||||||
def output_reach(self):
|
|
||||||
return self._output_reach
|
|
||||||
|
|
||||||
@output_reach.setter
|
|
||||||
def output_reach(self, output_reach):
|
|
||||||
self._output_reach = output_reach
|
|
||||||
self.modified()
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def basic_structures(self):
|
def basic_structures(self):
|
||||||
return self.lst.copy()
|
return self.lst.copy()
|
||||||
|
|
||||||
|
def cloned_for(self, input_reach, input_section):
|
||||||
|
new = HydraulicStructure(name=self._name, status=self._status)
|
||||||
|
new._enabled = self._enabled
|
||||||
|
new._input_reach = input_reach
|
||||||
|
new._input_section = input_section
|
||||||
|
new._data = [structure.cloned() for structure in self.lst]
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
|
|
||||||
def basic_structure(self, index: int):
|
def basic_structure(self, index: int):
|
||||||
if len(self._data) == 0:
|
if len(self._data) == 0:
|
||||||
return None
|
return None
|
||||||
|
|||||||
@@ -61,6 +61,64 @@ class HydraulicStructureList(PamhyrModelList):
|
|||||||
self.modified()
|
self.modified()
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
profiles = reach.reach.profiles
|
||||||
|
split_index = profiles.index(profile)
|
||||||
|
sections1 = dict(zip(
|
||||||
|
profiles[:split_index + 1],
|
||||||
|
reach1.reach.profiles
|
||||||
|
))
|
||||||
|
sections2 = dict(zip(
|
||||||
|
profiles[split_index:],
|
||||||
|
reach2.reach.profiles
|
||||||
|
))
|
||||||
|
|
||||||
|
def split_endpoint(endpoint_reach, section):
|
||||||
|
if endpoint_reach is not reach:
|
||||||
|
return endpoint_reach, section
|
||||||
|
if section not in profiles:
|
||||||
|
return endpoint_reach, section
|
||||||
|
|
||||||
|
index = profiles.index(section)
|
||||||
|
if index < split_index:
|
||||||
|
return reach1, sections1[section]
|
||||||
|
return reach2, sections2[section]
|
||||||
|
|
||||||
|
structures = [
|
||||||
|
structure
|
||||||
|
for structure in self.lst
|
||||||
|
if structure.input_reach is reach
|
||||||
|
]
|
||||||
|
|
||||||
|
for structure in structures:
|
||||||
|
input_reach, input_section = split_endpoint(
|
||||||
|
structure.input_reach,
|
||||||
|
structure.input_section
|
||||||
|
)
|
||||||
|
self._lst.append(structure.cloned_for(
|
||||||
|
input_reach,
|
||||||
|
input_section
|
||||||
|
))
|
||||||
|
|
||||||
|
if len(structures) != 0:
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def enabled_reaches_list(self):
|
||||||
|
return [
|
||||||
|
structure
|
||||||
|
for structure in self.lst
|
||||||
|
if (structure.input_reach is None or
|
||||||
|
(not structure.input_reach.is_deleted() and
|
||||||
|
structure.input_reach.is_enable()))
|
||||||
|
]
|
||||||
|
|
||||||
|
def get_for_enabled_reaches(self, index):
|
||||||
|
structures = self.enabled_reaches_list
|
||||||
|
if not 0 <= index < len(structures):
|
||||||
|
return None
|
||||||
|
return structures[index]
|
||||||
|
|
||||||
def __copy__(self):
|
def __copy__(self):
|
||||||
new = HydraulicStructureList()
|
new = HydraulicStructureList()
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
from copy import copy, deepcopy
|
from copy import copy, deepcopy
|
||||||
|
from math import isclose
|
||||||
from tools import trace, timer
|
from tools import trace, timer
|
||||||
from functools import reduce
|
from functools import reduce
|
||||||
from numpy import interp
|
from numpy import interp
|
||||||
@@ -256,6 +257,17 @@ class Data(SQLSubModel):
|
|||||||
)
|
)
|
||||||
return new
|
return new
|
||||||
|
|
||||||
|
def cloned_for(self, reach, section):
|
||||||
|
return Data(
|
||||||
|
name=self._name,
|
||||||
|
comment=self._comment,
|
||||||
|
section=section,
|
||||||
|
discharge=self._discharge,
|
||||||
|
height=self._height,
|
||||||
|
reach=reach,
|
||||||
|
status=self._status,
|
||||||
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self):
|
def name(self):
|
||||||
return self._name
|
return self._name
|
||||||
@@ -428,15 +440,28 @@ class InitialConditions(SQLSubModel):
|
|||||||
|
|
||||||
def new_from_data(self, rk, discharge, elevation):
|
def new_from_data(self, rk, discharge, elevation):
|
||||||
n = Data(reach=self._reach, status=self._status)
|
n = Data(reach=self._reach, status=self._status)
|
||||||
|
# Values read from Mage INI files are strings, whereas profile RK
|
||||||
|
# values are stored as floats. Normalize the imported value before
|
||||||
|
# looking up its associated profile.
|
||||||
|
rk = float(rk)
|
||||||
|
|
||||||
section = reduce(
|
section = reduce(
|
||||||
lambda acc, s: (
|
lambda acc, s: (
|
||||||
s if s.rk == rk else acc
|
# Mage INI files store RK values with two decimal places.
|
||||||
|
# Allow for the rounding introduced by that format.
|
||||||
|
s if isclose(s.rk, rk, rel_tol=0.0, abs_tol=0.0051)
|
||||||
|
else acc
|
||||||
),
|
),
|
||||||
self._reach.reach.profiles,
|
self._reach.reach.profiles,
|
||||||
None
|
None
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if section is None:
|
||||||
|
raise ValueError(
|
||||||
|
f"No profile with RK {rk} exists in reach "
|
||||||
|
f"{self._reach.name}"
|
||||||
|
)
|
||||||
|
|
||||||
n['section'] = section
|
n['section'] = section
|
||||||
n['discharge'] = discharge
|
n['discharge'] = discharge
|
||||||
n['elevation'] = elevation
|
n['elevation'] = elevation
|
||||||
@@ -505,6 +530,20 @@ class InitialConditions(SQLSubModel):
|
|||||||
for data in self._data:
|
for data in self._data:
|
||||||
data.set_as_deleted()
|
data.set_as_deleted()
|
||||||
|
|
||||||
|
def _splited_for(self, reach, sections):
|
||||||
|
new = InitialConditions(reach=reach, status=self._status)
|
||||||
|
|
||||||
|
new._data = [
|
||||||
|
data.cloned_for(reach, sections[data["section"]])
|
||||||
|
for data in self.data
|
||||||
|
if data["section"] in sections
|
||||||
|
]
|
||||||
|
|
||||||
|
if len(new._data) != 0:
|
||||||
|
new.modified()
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
def generate_growing_constant_depth(self, height: float,
|
def generate_growing_constant_depth(self, height: float,
|
||||||
compute_discharge: bool):
|
compute_discharge: bool):
|
||||||
profiles = self._reach.reach.profiles.copy()
|
profiles = self._reach.reach.profiles.copy()
|
||||||
|
|||||||
@@ -88,3 +88,28 @@ class InitialConditionsDict(PamhyrModelDict):
|
|||||||
new = InitialConditions(reach=reach, status=self._status)
|
new = InitialConditions(reach=reach, status=self._status)
|
||||||
self.set(reach, new)
|
self.set(reach, new)
|
||||||
return new
|
return new
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
if reach not in self._dict:
|
||||||
|
return
|
||||||
|
|
||||||
|
profiles = reach.reach.profiles
|
||||||
|
split_index = profiles.index(profile)
|
||||||
|
|
||||||
|
sections1 = dict(zip(
|
||||||
|
profiles[:split_index + 1],
|
||||||
|
reach1.reach.profiles
|
||||||
|
))
|
||||||
|
sections2 = dict(zip(
|
||||||
|
profiles[split_index:],
|
||||||
|
reach2.reach.profiles
|
||||||
|
))
|
||||||
|
|
||||||
|
self.set(
|
||||||
|
reach1,
|
||||||
|
self._dict[reach]._splited_for(reach1, sections1)
|
||||||
|
)
|
||||||
|
self.set(
|
||||||
|
reach2,
|
||||||
|
self._dict[reach]._splited_for(reach2, sections2)
|
||||||
|
)
|
||||||
@@ -359,3 +359,60 @@ class InitialConditionsAdisTS(SQLSubModel):
|
|||||||
x.set_as_not_deleted()
|
x.set_as_not_deleted()
|
||||||
|
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
split_rk = profile.rk
|
||||||
|
reach_rks = reach.reach.get_rk()
|
||||||
|
if len(reach_rks) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
lower_reach_rk = min(reach_rks)
|
||||||
|
upper_reach_rk = max(reach_rks)
|
||||||
|
parts = [
|
||||||
|
(reach1.id, lower_reach_rk, split_rk),
|
||||||
|
(reach2.id, split_rk, upper_reach_rk),
|
||||||
|
]
|
||||||
|
specifications = [
|
||||||
|
specification
|
||||||
|
for specification in self._data
|
||||||
|
if (not specification.is_deleted() and
|
||||||
|
specification.reach == reach.id)
|
||||||
|
]
|
||||||
|
|
||||||
|
for specification in specifications:
|
||||||
|
begin = specification.start_rk
|
||||||
|
end = specification.end_rk
|
||||||
|
if begin is None or end is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
lower, upper = sorted((begin, end))
|
||||||
|
reverse = begin > end
|
||||||
|
|
||||||
|
for new_reach, part_lower, part_upper in parts:
|
||||||
|
clipped_lower = max(lower, part_lower)
|
||||||
|
clipped_upper = min(upper, part_upper)
|
||||||
|
if clipped_lower >= clipped_upper:
|
||||||
|
continue
|
||||||
|
|
||||||
|
start_rk = clipped_upper if reverse else clipped_lower
|
||||||
|
end_rk = clipped_lower if reverse else clipped_upper
|
||||||
|
self._data.append(specification.cloned_for(
|
||||||
|
new_reach, start_rk, end_rk
|
||||||
|
))
|
||||||
|
|
||||||
|
if len(specifications) != 0:
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def get_specs_for_enabled_reaches(self, reaches):
|
||||||
|
enabled_reaches = {
|
||||||
|
reach.id
|
||||||
|
for reach in reaches
|
||||||
|
if not reach.is_deleted() and reach.is_enable()
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
specification
|
||||||
|
for specification in self._data
|
||||||
|
if (not specification.is_deleted() and
|
||||||
|
(specification.reach in (None, -1) or
|
||||||
|
specification.reach in enabled_reaches))
|
||||||
|
]
|
||||||
@@ -62,6 +62,12 @@ class InitialConditionsAdisTSList(PamhyrModelList):
|
|||||||
self._status.modified()
|
self._status.modified()
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
for initial_condition in self.lst:
|
||||||
|
initial_condition.split_reach(
|
||||||
|
reach, profile, reach1, reach2
|
||||||
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def Initial_Conditions_List(self):
|
def Initial_Conditions_List(self):
|
||||||
return self.lst
|
return self.lst
|
||||||
@@ -31,10 +31,12 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
_sub_classes = []
|
_sub_classes = []
|
||||||
|
|
||||||
def __init__(self, id: int = -1, name: str = "",
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
status=None, owner_scenario=None):
|
status=None, owner_scenario=-1):
|
||||||
super(ICAdisTSSpec, self).__init__()
|
super(ICAdisTSSpec, self).__init__(
|
||||||
|
id=id,
|
||||||
self._status = status
|
status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
self._name_section = name
|
self._name_section = name
|
||||||
self._reach = None
|
self._reach = None
|
||||||
@@ -190,7 +192,7 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
new_spec.rate = rate
|
new_spec.rate = rate
|
||||||
new_spec.enabled = enabled
|
new_spec.enabled = enabled
|
||||||
|
|
||||||
# loaded.add(pid)
|
loaded.add(id)
|
||||||
new.append(new_spec)
|
new.append(new_spec)
|
||||||
|
|
||||||
data["scenario"] = scenario.parent
|
data["scenario"] = scenario.parent
|
||||||
@@ -234,7 +236,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@name.setter
|
@name.setter
|
||||||
def name(self, name):
|
def name(self, name):
|
||||||
self._name_section = name
|
self._name_section = name
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def reach(self):
|
def reach(self):
|
||||||
@@ -243,7 +246,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@reach.setter
|
@reach.setter
|
||||||
def reach(self, reach):
|
def reach(self, reach):
|
||||||
self._reach = reach
|
self._reach = reach
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def start_rk(self):
|
def start_rk(self):
|
||||||
@@ -252,7 +256,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@start_rk.setter
|
@start_rk.setter
|
||||||
def start_rk(self, start_rk):
|
def start_rk(self, start_rk):
|
||||||
self._start_rk = start_rk
|
self._start_rk = start_rk
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def end_rk(self):
|
def end_rk(self):
|
||||||
@@ -261,7 +266,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@end_rk.setter
|
@end_rk.setter
|
||||||
def end_rk(self, end_rk):
|
def end_rk(self, end_rk):
|
||||||
self._end_rk = end_rk
|
self._end_rk = end_rk
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def concentration(self):
|
def concentration(self):
|
||||||
@@ -270,7 +276,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@concentration.setter
|
@concentration.setter
|
||||||
def concentration(self, concentration):
|
def concentration(self, concentration):
|
||||||
self._concentration = concentration
|
self._concentration = concentration
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def eg(self):
|
def eg(self):
|
||||||
@@ -279,7 +286,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@eg.setter
|
@eg.setter
|
||||||
def eg(self, eg):
|
def eg(self, eg):
|
||||||
self._eg = eg
|
self._eg = eg
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def em(self):
|
def em(self):
|
||||||
@@ -288,7 +296,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@em.setter
|
@em.setter
|
||||||
def em(self, em):
|
def em(self, em):
|
||||||
self._em = em
|
self._em = em
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def ed(self):
|
def ed(self):
|
||||||
@@ -297,7 +306,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@ed.setter
|
@ed.setter
|
||||||
def ed(self, ed):
|
def ed(self, ed):
|
||||||
self._ed = ed
|
self._ed = ed
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def rate(self):
|
def rate(self):
|
||||||
@@ -306,7 +316,8 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@rate.setter
|
@rate.setter
|
||||||
def rate(self, rate):
|
def rate(self, rate):
|
||||||
self._rate = rate
|
self._rate = rate
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def enabled(self):
|
def enabled(self):
|
||||||
@@ -315,4 +326,18 @@ class ICAdisTSSpec(SQLSubModel):
|
|||||||
@enabled.setter
|
@enabled.setter
|
||||||
def enabled(self, enabled):
|
def enabled(self, enabled):
|
||||||
self._enabled = enabled
|
self._enabled = enabled
|
||||||
self._status.modified()
|
self.modified()
|
||||||
|
|
||||||
|
def cloned_for(self, reach, start_rk, end_rk):
|
||||||
|
new = ICAdisTSSpec(name=self._name_section, status=self._status)
|
||||||
|
new._reach = reach
|
||||||
|
new._start_rk = start_rk
|
||||||
|
new._end_rk = end_rk
|
||||||
|
new._concentration = self._concentration
|
||||||
|
new._eg = self._eg
|
||||||
|
new._em = self._em
|
||||||
|
new._ed = self._ed
|
||||||
|
new._rate = self._rate
|
||||||
|
new._enabled = self._enabled
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
@@ -0,0 +1,272 @@
|
|||||||
|
# InitialConditionsTemperature.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from functools import reduce
|
||||||
|
|
||||||
|
from tools import trace, timer, old_pamhyr_date_to_timestamp
|
||||||
|
|
||||||
|
from Model.Tools.PamhyrDB import SQLSubModel
|
||||||
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
from Model.Scenario import Scenario
|
||||||
|
|
||||||
|
from Model.InitialConditionsTemperature.InitialConditionsTemperatureSpec \
|
||||||
|
import ICTemperatureSpec
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class InitialConditionsTemperature(SQLSubModel):
|
||||||
|
_sub_classes = [
|
||||||
|
ICTemperatureSpec,
|
||||||
|
]
|
||||||
|
|
||||||
|
def __init__(self, id: int = -1, name: str = "default",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(InitialConditionsTemperature, self).__init__(
|
||||||
|
id=id, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
self._status = status
|
||||||
|
|
||||||
|
self._name = name
|
||||||
|
self._temperature = None
|
||||||
|
self._data = []
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_create(cls, execute, ext=""):
|
||||||
|
execute(f"""
|
||||||
|
CREATE TABLE initial_conditions_temperature{ext}(
|
||||||
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
temperature REAL NOT NULL,
|
||||||
|
{Scenario.create_db_add_scenario()},
|
||||||
|
{Scenario.create_db_add_scenario_fk()}
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
|
return cls._create_submodel(execute)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_update(cls, execute, version, data=None):
|
||||||
|
major, minor, release = version.strip().split(".")
|
||||||
|
|
||||||
|
if major == "0":
|
||||||
|
if int(minor) < 2 or (int(minor) == 2 and int(release) <= 7):
|
||||||
|
table_name = "initial_conditions_temperature"
|
||||||
|
if not cls.is_table_exists(execute, table_name):
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = []
|
||||||
|
status = data['status']
|
||||||
|
scenario = data["scenario"]
|
||||||
|
loaded = data['loaded_pid']
|
||||||
|
|
||||||
|
if scenario is None:
|
||||||
|
return new
|
||||||
|
|
||||||
|
table = execute(
|
||||||
|
"SELECT pamhyr_id, deleted, " +
|
||||||
|
"name, temperature, scenario " +
|
||||||
|
"FROM initial_conditions_temperature " +
|
||||||
|
f"WHERE scenario = {scenario.id} " +
|
||||||
|
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
|
||||||
|
)
|
||||||
|
|
||||||
|
if table is not None:
|
||||||
|
for row in table:
|
||||||
|
it = iter(row)
|
||||||
|
|
||||||
|
pid = next(it)
|
||||||
|
deleted = (next(it) == 1)
|
||||||
|
name = next(it)
|
||||||
|
temperature = next(it)
|
||||||
|
owner_scenario = next(it)
|
||||||
|
|
||||||
|
ic = cls(
|
||||||
|
id=pid,
|
||||||
|
name=name,
|
||||||
|
status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
if deleted:
|
||||||
|
ic.set_as_deleted()
|
||||||
|
|
||||||
|
ic.temperature = temperature
|
||||||
|
|
||||||
|
data['ic_default_id'] = pid
|
||||||
|
ic._data = ICTemperatureSpec._db_load(execute, data)
|
||||||
|
|
||||||
|
loaded.add(pid)
|
||||||
|
new.append(ic)
|
||||||
|
|
||||||
|
data["scenario"] = scenario.parent
|
||||||
|
new += cls._db_load(execute, data)
|
||||||
|
data["scenario"] = scenario
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
if not self.must_be_saved():
|
||||||
|
return True
|
||||||
|
|
||||||
|
execute(
|
||||||
|
"DELETE FROM initial_conditions_temperature " +
|
||||||
|
f"WHERE pamhyr_id = {self.id} " +
|
||||||
|
f"AND scenario = {self._status.scenario_id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
temperature = self._temperature if \
|
||||||
|
self._temperature is not None else 0.0
|
||||||
|
|
||||||
|
sql = (
|
||||||
|
"INSERT INTO " +
|
||||||
|
"initial_conditions_temperature(" +
|
||||||
|
"pamhyr_id, deleted, name, temperature, " +
|
||||||
|
"scenario" +
|
||||||
|
") " +
|
||||||
|
"VALUES (" +
|
||||||
|
f"{self.id}, {self.is_deleted()}, " +
|
||||||
|
f"'{self._db_format(self._name)}', " +
|
||||||
|
f"{temperature}, {self._status.scenario_id}" +
|
||||||
|
")"
|
||||||
|
)
|
||||||
|
|
||||||
|
execute(sql)
|
||||||
|
|
||||||
|
data['ic_default_id'] = self.id
|
||||||
|
execute(
|
||||||
|
"DELETE FROM initial_conditions_temperature_spec " +
|
||||||
|
f"WHERE ic_default = {self.id} " +
|
||||||
|
f"AND scenario = {self._status.scenario_id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
for ic_spec in self._data:
|
||||||
|
ic_spec._db_save(execute, data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def __len__(self):
|
||||||
|
return len(self.data)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def data(self):
|
||||||
|
return list(filter(lambda item: not item.is_deleted(), self._data))
|
||||||
|
|
||||||
|
@property
|
||||||
|
def name(self):
|
||||||
|
return self._name
|
||||||
|
|
||||||
|
@name.setter
|
||||||
|
def name(self, name):
|
||||||
|
self._name = name
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def temperature(self):
|
||||||
|
return self._temperature
|
||||||
|
|
||||||
|
@temperature.setter
|
||||||
|
def temperature(self, temperature):
|
||||||
|
self._temperature = temperature
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def new(self, index):
|
||||||
|
n = ICTemperatureSpec(status=self._status)
|
||||||
|
self._data.insert(index, n)
|
||||||
|
self.modified()
|
||||||
|
return n
|
||||||
|
|
||||||
|
def delete(self, data):
|
||||||
|
list(
|
||||||
|
map(
|
||||||
|
lambda x: x.set_as_deleted(),
|
||||||
|
data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def delete_i(self, indexes):
|
||||||
|
list(
|
||||||
|
map(
|
||||||
|
lambda e: e[1].set_as_deleted(),
|
||||||
|
filter(
|
||||||
|
lambda e: e[0] in indexes,
|
||||||
|
enumerate(self._data)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def insert(self, index, data):
|
||||||
|
if data in self._data:
|
||||||
|
self.undelete([data])
|
||||||
|
else:
|
||||||
|
self._data.insert(index, data)
|
||||||
|
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def undelete(self, lst):
|
||||||
|
for x in lst:
|
||||||
|
x.set_as_not_deleted()
|
||||||
|
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
parts = []
|
||||||
|
for new_reach in (reach1, reach2):
|
||||||
|
rks = new_reach.reach.get_rk()
|
||||||
|
if rks:
|
||||||
|
parts.append((new_reach.id, min(rks), max(rks)))
|
||||||
|
|
||||||
|
specifications = [
|
||||||
|
specification
|
||||||
|
for specification in self._data
|
||||||
|
if (not specification.is_deleted() and
|
||||||
|
specification.reach == reach.id)
|
||||||
|
]
|
||||||
|
clones = []
|
||||||
|
|
||||||
|
for specification in specifications:
|
||||||
|
begin = specification.start_rk
|
||||||
|
end = specification.end_rk
|
||||||
|
if begin is None or end is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
lower, upper = sorted((begin, end))
|
||||||
|
reverse = begin > end
|
||||||
|
for new_reach, part_lower, part_upper in parts:
|
||||||
|
clipped_lower = max(lower, part_lower)
|
||||||
|
clipped_upper = min(upper, part_upper)
|
||||||
|
if clipped_lower >= clipped_upper:
|
||||||
|
continue
|
||||||
|
|
||||||
|
start_rk = clipped_upper if reverse else clipped_lower
|
||||||
|
end_rk = clipped_lower if reverse else clipped_upper
|
||||||
|
clones.append(specification.cloned_for(
|
||||||
|
new_reach, start_rk, end_rk
|
||||||
|
))
|
||||||
|
|
||||||
|
if clones:
|
||||||
|
self._data.extend(clones)
|
||||||
|
self.modified()
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
# InitialConditionsTemperatureList.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from copy import copy
|
||||||
|
from tools import trace, timer
|
||||||
|
|
||||||
|
from Model.Tools.PamhyrListExt import PamhyrModelList
|
||||||
|
from Model.InitialConditionsTemperature.InitialConditionsTemperature \
|
||||||
|
import InitialConditionsTemperature
|
||||||
|
|
||||||
|
|
||||||
|
class InitialConditionsTemperatureList(PamhyrModelList):
|
||||||
|
_sub_classes = [
|
||||||
|
InitialConditionsTemperature,
|
||||||
|
]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = cls(status=data['status'])
|
||||||
|
|
||||||
|
if data is None:
|
||||||
|
data = {}
|
||||||
|
|
||||||
|
new._lst = InitialConditionsTemperature._db_load(
|
||||||
|
execute, data
|
||||||
|
)
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
execute(
|
||||||
|
"DELETE FROM initial_conditions_temperature " +
|
||||||
|
f"WHERE scenario = {self._status.scenario_id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
if data is None:
|
||||||
|
data = {}
|
||||||
|
|
||||||
|
for ic in self._lst:
|
||||||
|
ic._db_save(execute, data=data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def new(self, index):
|
||||||
|
n = InitialConditionsTemperature(status=self._status)
|
||||||
|
self._lst.insert(index, n)
|
||||||
|
self._status.modified()
|
||||||
|
return n
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
for initial_condition in self.lst:
|
||||||
|
initial_condition.split_reach(
|
||||||
|
reach, profile, reach1, reach2
|
||||||
|
)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def Initial_Conditions_List(self):
|
||||||
|
return self.lst
|
||||||
@@ -0,0 +1,215 @@
|
|||||||
|
# InitialConditionsAdisTSSpec.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from tools import trace, timer
|
||||||
|
|
||||||
|
from Model.Tools.PamhyrDB import SQLSubModel
|
||||||
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
from Model.Scenario import Scenario
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class ICTemperatureSpec(SQLSubModel):
|
||||||
|
_sub_classes = []
|
||||||
|
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(ICTemperatureSpec, self).__init__(
|
||||||
|
id=id, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._name_section = name
|
||||||
|
self._reach = None
|
||||||
|
self._start_rk = None
|
||||||
|
self._end_rk = None
|
||||||
|
self._temperature = None
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_create(cls, execute, ext=""):
|
||||||
|
execute(f"""
|
||||||
|
CREATE TABLE initial_conditions_temperature_spec{ext}(
|
||||||
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
ic_default INTEGER NOT NULL,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
reach INTEGER NOT NULL,
|
||||||
|
start_rk REAL NOT NULL,
|
||||||
|
end_rk REAL NOT NULL,
|
||||||
|
temperature REAL NOT NULL,
|
||||||
|
{Scenario.create_db_add_scenario()},
|
||||||
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
|
FOREIGN KEY(ic_default)
|
||||||
|
REFERENCES initial_conditions_temperature(pamhyr_id),
|
||||||
|
FOREIGN KEY(reach) REFERENCES river_reach(pamhyr_id)
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
|
return cls._create_submodel(execute)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_update(cls, execute, version, data=None):
|
||||||
|
major, minor, release = version.strip().split(".")
|
||||||
|
|
||||||
|
if major == "0":
|
||||||
|
if int(minor) < 2 or (int(minor) == 2 and int(release) <= 7):
|
||||||
|
table_name = "initial_conditions_temperature_spec"
|
||||||
|
if not cls.is_table_exists(execute, table_name):
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = []
|
||||||
|
status = data['status']
|
||||||
|
reachs = data["edges"]
|
||||||
|
scenario = data["scenario"]
|
||||||
|
loaded = data['loaded_pid']
|
||||||
|
|
||||||
|
if scenario is None:
|
||||||
|
return new
|
||||||
|
|
||||||
|
table = execute(
|
||||||
|
"SELECT pamhyr_id, deleted, name, reach, start_rk, end_rk, " +
|
||||||
|
"temperature, scenario " +
|
||||||
|
"FROM initial_conditions_temperature_spec " +
|
||||||
|
f"WHERE ic_default = {data['ic_default_id']} " +
|
||||||
|
f"AND scenario = {scenario.id} " +
|
||||||
|
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
|
||||||
|
)
|
||||||
|
|
||||||
|
if table is not None:
|
||||||
|
for row in table:
|
||||||
|
it = iter(row)
|
||||||
|
|
||||||
|
id = next(it)
|
||||||
|
deleted = (next(it) == 1)
|
||||||
|
name = next(it)
|
||||||
|
reach = next(it)
|
||||||
|
start_rk = next(it)
|
||||||
|
end_rk = next(it)
|
||||||
|
temperature = next(it)
|
||||||
|
owner_scenario = next(it)
|
||||||
|
|
||||||
|
new_spec = cls(
|
||||||
|
id=id, name=name,
|
||||||
|
status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
if deleted:
|
||||||
|
new_spec.set_as_deleted()
|
||||||
|
|
||||||
|
new_spec.reach = reach
|
||||||
|
new_spec.start_rk = start_rk
|
||||||
|
new_spec.end_rk = end_rk
|
||||||
|
new_spec.temperature = temperature
|
||||||
|
|
||||||
|
loaded.add(id)
|
||||||
|
new.append(new_spec)
|
||||||
|
|
||||||
|
data["scenario"] = scenario.parent
|
||||||
|
new += cls._db_load(execute, data)
|
||||||
|
data["scenario"] = scenario
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
if not self.must_be_saved():
|
||||||
|
return True
|
||||||
|
|
||||||
|
ic_default = data['ic_default_id']
|
||||||
|
|
||||||
|
sql = (
|
||||||
|
"INSERT INTO " +
|
||||||
|
"initial_conditions_temperature_spec(pamhyr_id, deleted, " +
|
||||||
|
"ic_default, name, reach, " +
|
||||||
|
"start_rk, end_rk, temperature, scenario) " +
|
||||||
|
"VALUES (" +
|
||||||
|
f"{self.id}, {self._db_format(self.is_deleted())}, " +
|
||||||
|
f"{ic_default}, " +
|
||||||
|
f"'{self._db_format(self._name_section)}', " +
|
||||||
|
f"{self._reach}, " +
|
||||||
|
f"{self._start_rk}, {self._end_rk}, " +
|
||||||
|
f"{self._temperature}, " +
|
||||||
|
f"{self._status.scenario_id}" +
|
||||||
|
")"
|
||||||
|
)
|
||||||
|
execute(sql)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
@property
|
||||||
|
def name(self):
|
||||||
|
return self._name_section
|
||||||
|
|
||||||
|
@name.setter
|
||||||
|
def name(self, name):
|
||||||
|
self._name_section = name
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def reach(self):
|
||||||
|
return self._reach
|
||||||
|
|
||||||
|
@reach.setter
|
||||||
|
def reach(self, reach):
|
||||||
|
self._reach = reach
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def start_rk(self):
|
||||||
|
return self._start_rk
|
||||||
|
|
||||||
|
@start_rk.setter
|
||||||
|
def start_rk(self, start_rk):
|
||||||
|
self._start_rk = start_rk
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def end_rk(self):
|
||||||
|
return self._end_rk
|
||||||
|
|
||||||
|
@end_rk.setter
|
||||||
|
def end_rk(self, end_rk):
|
||||||
|
self._end_rk = end_rk
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def temperature(self):
|
||||||
|
return self._temperature
|
||||||
|
|
||||||
|
@temperature.setter
|
||||||
|
def temperature(self, temperature):
|
||||||
|
self._temperature = temperature
|
||||||
|
self._status.modified()
|
||||||
|
|
||||||
|
def cloned_for(self, reach, start_rk, end_rk):
|
||||||
|
new = ICTemperatureSpec(
|
||||||
|
name=self._name_section,
|
||||||
|
status=self._status
|
||||||
|
)
|
||||||
|
new._reach = reach
|
||||||
|
new._start_rk = start_rk
|
||||||
|
new._end_rk = end_rk
|
||||||
|
new._temperature = self._temperature
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
@@ -196,6 +196,13 @@ class Data(SQLSubModel):
|
|||||||
def __setitem__(self, key, value):
|
def __setitem__(self, key, value):
|
||||||
self._data[key] = self._types[key](value)
|
self._data[key] = self._types[key](value)
|
||||||
|
|
||||||
|
def cloned(self):
|
||||||
|
return Data(
|
||||||
|
self[0], self[1],
|
||||||
|
types=self._types,
|
||||||
|
status=self._status
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class LateralContribution(SQLSubModel):
|
class LateralContribution(SQLSubModel):
|
||||||
_sub_classes = [Data]
|
_sub_classes = [Data]
|
||||||
@@ -511,6 +518,15 @@ class LateralContribution(SQLSubModel):
|
|||||||
def has_reach(self):
|
def has_reach(self):
|
||||||
return self._reach is not None
|
return self._reach is not None
|
||||||
|
|
||||||
|
def cloned_for(self, reach, begin_section, end_section):
|
||||||
|
new = type(self)(name=self._name, status=self._status)
|
||||||
|
new._reach = reach
|
||||||
|
new._begin_section = begin_section
|
||||||
|
new._end_section = end_section
|
||||||
|
new._data = [data.cloned() for data in self.data]
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def begin_rk(self):
|
def begin_rk(self):
|
||||||
if self._begin_section is None:
|
if self._begin_section is None:
|
||||||
|
|||||||
@@ -71,6 +71,89 @@ class LateralContributionList(PamhyrModelListWithTab):
|
|||||||
self._status.modified()
|
self._status.modified()
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
profiles = reach.reach.profiles
|
||||||
|
split_index = profiles.index(profile)
|
||||||
|
|
||||||
|
parts = [
|
||||||
|
(
|
||||||
|
reach1,
|
||||||
|
0,
|
||||||
|
split_index,
|
||||||
|
dict(zip(
|
||||||
|
profiles[:split_index + 1],
|
||||||
|
reach1.reach.profiles
|
||||||
|
))
|
||||||
|
),
|
||||||
|
(
|
||||||
|
reach2,
|
||||||
|
split_index,
|
||||||
|
len(profiles) - 1,
|
||||||
|
dict(zip(
|
||||||
|
profiles[split_index:],
|
||||||
|
reach2.reach.profiles
|
||||||
|
))
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
for tab in self._tabs:
|
||||||
|
contributions = [
|
||||||
|
contribution
|
||||||
|
for contribution in self.get_tab(tab)
|
||||||
|
if contribution.reach is reach
|
||||||
|
]
|
||||||
|
|
||||||
|
for contribution in contributions:
|
||||||
|
if (contribution.begin_section not in profiles or
|
||||||
|
contribution.end_section not in profiles):
|
||||||
|
continue
|
||||||
|
|
||||||
|
begin = profiles.index(contribution.begin_section)
|
||||||
|
end = profiles.index(contribution.end_section)
|
||||||
|
lower, upper = sorted((begin, end))
|
||||||
|
reverse = begin > end
|
||||||
|
clones = []
|
||||||
|
|
||||||
|
for new_reach, part_lower, part_upper, sections in parts:
|
||||||
|
clipped_lower = max(lower, part_lower)
|
||||||
|
clipped_upper = min(upper, part_upper)
|
||||||
|
if clipped_lower >= clipped_upper:
|
||||||
|
continue
|
||||||
|
|
||||||
|
begin_index = (
|
||||||
|
clipped_upper if reverse else clipped_lower
|
||||||
|
)
|
||||||
|
end_index = (
|
||||||
|
clipped_lower if reverse else clipped_upper
|
||||||
|
)
|
||||||
|
clones.append(contribution.cloned_for(
|
||||||
|
new_reach,
|
||||||
|
sections[profiles[begin_index]],
|
||||||
|
sections[profiles[end_index]]
|
||||||
|
))
|
||||||
|
|
||||||
|
if len(clones) == 0:
|
||||||
|
continue
|
||||||
|
|
||||||
|
self._tabs[tab].extend(clones)
|
||||||
|
|
||||||
|
self._status.modified()
|
||||||
|
|
||||||
|
def get_tab_for_enabled_reaches(self, tab):
|
||||||
|
return [
|
||||||
|
contribution
|
||||||
|
for contribution in self.get_tab(tab)
|
||||||
|
if (contribution.reach is None or
|
||||||
|
(not contribution.reach.is_deleted() and
|
||||||
|
contribution.reach.is_enable()))
|
||||||
|
]
|
||||||
|
|
||||||
|
def get_for_enabled_reaches(self, tab, index):
|
||||||
|
contributions = self.get_tab_for_enabled_reaches(tab)
|
||||||
|
if not 0 <= index < len(contributions):
|
||||||
|
return None
|
||||||
|
return contributions[index]
|
||||||
|
|
||||||
def __copy__(self):
|
def __copy__(self):
|
||||||
new = LateralContributionList()
|
new = LateralContributionList()
|
||||||
|
|
||||||
|
|||||||
@@ -192,6 +192,13 @@ class Data(SQLSubModel):
|
|||||||
def __setitem__(self, key, value):
|
def __setitem__(self, key, value):
|
||||||
self._data[key] = self._types[key](value)
|
self._data[key] = self._types[key](value)
|
||||||
|
|
||||||
|
def cloned(self):
|
||||||
|
return Data(
|
||||||
|
self[0], self[1],
|
||||||
|
types=self._types,
|
||||||
|
status=self._status
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class LateralContributionAdisTS(SQLSubModel):
|
class LateralContributionAdisTS(SQLSubModel):
|
||||||
_sub_classes = [Data]
|
_sub_classes = [Data]
|
||||||
@@ -477,6 +484,18 @@ class LateralContributionAdisTS(SQLSubModel):
|
|||||||
self._end_rk = end_rk
|
self._end_rk = end_rk
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|
||||||
|
def cloned_for(self, reach, begin_rk, end_rk):
|
||||||
|
new = LateralContributionAdisTS(
|
||||||
|
pollutant=self._pollutant,
|
||||||
|
status=self._status
|
||||||
|
)
|
||||||
|
new._reach = reach
|
||||||
|
new._begin_rk = begin_rk
|
||||||
|
new._end_rk = end_rk
|
||||||
|
new._data = [data.cloned() for data in self.data]
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def _default_0(self):
|
def _default_0(self):
|
||||||
return self._types[0](0)
|
return self._types[0](0)
|
||||||
|
|||||||
@@ -68,6 +68,46 @@ class LateralContributionsAdisTSList(PamhyrModelList):
|
|||||||
self._status.modified()
|
self._status.modified()
|
||||||
return n
|
return n
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
parts = []
|
||||||
|
for new_reach in (reach1, reach2):
|
||||||
|
rks = new_reach.reach.get_rk()
|
||||||
|
if len(rks) == 0:
|
||||||
|
continue
|
||||||
|
parts.append((new_reach.id, min(rks), max(rks)))
|
||||||
|
|
||||||
|
contributions = [
|
||||||
|
contribution
|
||||||
|
for contribution in self.lst
|
||||||
|
if contribution.reach == reach.id
|
||||||
|
]
|
||||||
|
clones = []
|
||||||
|
|
||||||
|
for contribution in contributions:
|
||||||
|
begin = contribution.begin_rk
|
||||||
|
end = contribution.end_rk
|
||||||
|
if begin is None or end is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
lower, upper = sorted((begin, end))
|
||||||
|
reverse = begin > end
|
||||||
|
|
||||||
|
for new_reach, part_lower, part_upper in parts:
|
||||||
|
clipped_lower = max(lower, part_lower)
|
||||||
|
clipped_upper = min(upper, part_upper)
|
||||||
|
if clipped_lower >= clipped_upper:
|
||||||
|
continue
|
||||||
|
|
||||||
|
begin_rk = clipped_upper if reverse else clipped_lower
|
||||||
|
end_rk = clipped_lower if reverse else clipped_upper
|
||||||
|
clones.append(contribution.cloned_for(
|
||||||
|
new_reach, begin_rk, end_rk
|
||||||
|
))
|
||||||
|
|
||||||
|
if len(clones) != 0:
|
||||||
|
self._lst.extend(clones)
|
||||||
|
self._status.modified()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def Lat_Cont_List(self):
|
def Lat_Cont_List(self):
|
||||||
return self.lst
|
return self.lst
|
||||||
@@ -1,208 +0,0 @@
|
|||||||
# OutputRKAdists.py -- Pamhyr
|
|
||||||
# Copyright (C) 2023-2026 INRAE
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from tools import (
|
|
||||||
trace, timer,
|
|
||||||
old_pamhyr_date_to_timestamp,
|
|
||||||
date_iso_to_timestamp,
|
|
||||||
date_dmy_to_timestamp,
|
|
||||||
)
|
|
||||||
|
|
||||||
from Model.Tools.PamhyrDB import SQLSubModel
|
|
||||||
from Model.Except import NotImplementedMethodeError
|
|
||||||
from Model.Scenario import Scenario
|
|
||||||
|
|
||||||
logger = logging.getLogger()
|
|
||||||
|
|
||||||
|
|
||||||
class OutputRKAdists(SQLSubModel):
|
|
||||||
_sub_classes = []
|
|
||||||
|
|
||||||
def __init__(self, id: int = -1, reach=None,
|
|
||||||
rk=None, title: str = "", status=None,
|
|
||||||
owner_scenario=-1):
|
|
||||||
super(OutputRKAdists, self).__init__(
|
|
||||||
id=id, status=status,
|
|
||||||
owner_scenario=owner_scenario
|
|
||||||
)
|
|
||||||
|
|
||||||
self._reach = reach
|
|
||||||
self._rk = rk
|
|
||||||
self._title = str(title)
|
|
||||||
self._enabled = True
|
|
||||||
|
|
||||||
@property
|
|
||||||
def reach(self):
|
|
||||||
return self._reach
|
|
||||||
|
|
||||||
@reach.setter
|
|
||||||
def reach(self, reach_id):
|
|
||||||
self._reach = reach_id
|
|
||||||
self._status.modified()
|
|
||||||
|
|
||||||
@property
|
|
||||||
def rk(self):
|
|
||||||
return self._rk
|
|
||||||
|
|
||||||
@rk.setter
|
|
||||||
def rk(self, profile_id):
|
|
||||||
self._rk = profile_id
|
|
||||||
self._status.modified()
|
|
||||||
|
|
||||||
@property
|
|
||||||
def title(self):
|
|
||||||
return self._title
|
|
||||||
|
|
||||||
@title.setter
|
|
||||||
def title(self, title):
|
|
||||||
self._title = title
|
|
||||||
self._status.modified()
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _db_create(cls, execute, ext=""):
|
|
||||||
execute(f"""
|
|
||||||
CREATE TABLE output_rk_adists{ext}(
|
|
||||||
{cls.create_db_add_pamhyr_id()},
|
|
||||||
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
|
||||||
reach INTEGER NOT NULL,
|
|
||||||
rk REAL NOT NULL,
|
|
||||||
title TEXT NOT NULL,
|
|
||||||
{Scenario.create_db_add_scenario()},
|
|
||||||
{Scenario.create_db_add_scenario_fk()},
|
|
||||||
FOREIGN KEY(reach) REFERENCES river_reach(id)
|
|
||||||
)
|
|
||||||
""")
|
|
||||||
|
|
||||||
return cls._create_submodel(execute)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _db_update(cls, execute, version, data=None):
|
|
||||||
major, minor, release = version.strip().split(".")
|
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
|
||||||
if cls.is_table_exists(execute, "OutputRKAdists"):
|
|
||||||
cls._db_update_to_0_2_0(execute, data)
|
|
||||||
else:
|
|
||||||
cls._db_create(execute)
|
|
||||||
|
|
||||||
return True
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _db_update_to_0_2_0(cls, execute, data):
|
|
||||||
table = "OutputRKAdists"
|
|
||||||
table_new = "output_rk_adists"
|
|
||||||
reachs = data['id2pid']['river_reach']
|
|
||||||
|
|
||||||
cls.update_db_add_pamhyr_id(execute, table, data)
|
|
||||||
Scenario.update_db_add_scenario(execute, table)
|
|
||||||
|
|
||||||
cls._db_create(execute, ext="_tmp")
|
|
||||||
|
|
||||||
execute(
|
|
||||||
f"INSERT INTO {table_new}_tmp " +
|
|
||||||
"(pamhyr_id, reach, rk, title, scenario) " +
|
|
||||||
"SELECT pamhyr_id, reach, rk, title, scenario " +
|
|
||||||
f"FROM {table}"
|
|
||||||
)
|
|
||||||
|
|
||||||
execute(f"DROP TABLE {table}")
|
|
||||||
execute(f"ALTER TABLE {table_new}_tmp RENAME TO {table_new}")
|
|
||||||
|
|
||||||
cls._db_update_to_0_2_0_set_reach_pid(execute, table_new, reachs)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _db_load(cls, execute, data=None):
|
|
||||||
new = []
|
|
||||||
status = data['status']
|
|
||||||
scenario = data["scenario"]
|
|
||||||
loaded = data['loaded_pid']
|
|
||||||
|
|
||||||
# reach = data["reach"]
|
|
||||||
# profile = data["profile"]
|
|
||||||
|
|
||||||
if scenario is None:
|
|
||||||
return new
|
|
||||||
|
|
||||||
table = execute(
|
|
||||||
"SELECT pamhyr_id, deleted, reach, rk, title, scenario " +
|
|
||||||
f"FROM output_rk_adists"
|
|
||||||
)
|
|
||||||
|
|
||||||
if table is not None:
|
|
||||||
for row in table:
|
|
||||||
it = iter(row)
|
|
||||||
|
|
||||||
pid = next(it)
|
|
||||||
deleted = (next(it) == 1)
|
|
||||||
id_reach = next(it)
|
|
||||||
id_rk = next(it)
|
|
||||||
title = next(it)
|
|
||||||
owner_scenario = next(it)
|
|
||||||
|
|
||||||
new_output = cls(
|
|
||||||
id=pid, reach=id_reach,
|
|
||||||
rk=id_rk, title=title,
|
|
||||||
status=status,
|
|
||||||
owner_scenario=owner_scenario,
|
|
||||||
)
|
|
||||||
if deleted:
|
|
||||||
new_output.set_as_deleted()
|
|
||||||
|
|
||||||
loaded.add(pid)
|
|
||||||
new.append(new_output)
|
|
||||||
|
|
||||||
data["scenario"] = scenario.parent
|
|
||||||
new += cls._db_load(execute, data)
|
|
||||||
data["scenario"] = scenario
|
|
||||||
|
|
||||||
return new
|
|
||||||
|
|
||||||
def _db_save(self, execute, data=None):
|
|
||||||
if not self.must_be_saved():
|
|
||||||
return True
|
|
||||||
|
|
||||||
execute(
|
|
||||||
"DELETE FROM output_rk_adists " +
|
|
||||||
f"WHERE pamhyr_id = {self.id} " +
|
|
||||||
f"AND scenario = {self._status.scenario_id} "
|
|
||||||
)
|
|
||||||
|
|
||||||
execute(
|
|
||||||
"INSERT INTO " +
|
|
||||||
"output_rk_adists(pamhyr_id, deleted, " +
|
|
||||||
"reach, rk, title, scenario) " +
|
|
||||||
"VALUES (" +
|
|
||||||
f"{self.id}, {self._db_format(self.is_deleted())}, " +
|
|
||||||
f"{self._reach}, {self._rk}, " +
|
|
||||||
f"'{self._db_format(self._title)}', " +
|
|
||||||
f"{self._status.scenario_id}" +
|
|
||||||
")"
|
|
||||||
)
|
|
||||||
|
|
||||||
return True
|
|
||||||
|
|
||||||
@property
|
|
||||||
def enabled(self):
|
|
||||||
return self._enabled
|
|
||||||
|
|
||||||
@enabled.setter
|
|
||||||
def enabled(self, enabled):
|
|
||||||
self._enabled = enabled
|
|
||||||
self._status.modified()
|
|
||||||
@@ -202,13 +202,8 @@ class TableData(SQLSubModel):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def _db_update(cls, execute, version, data=None):
|
def _db_update(cls, execute, version, data=None):
|
||||||
major, minor, release = version.strip().split(".")
|
if not cls.is_table_exists(execute, "results_table_data"):
|
||||||
create = False
|
cls._db_create(execute)
|
||||||
|
|
||||||
if major == "0" and int(minor) == 2:
|
|
||||||
if int(release) < 7 and not create:
|
|
||||||
cls._db_create(execute)
|
|
||||||
create = True
|
|
||||||
|
|
||||||
return cls._update_submodel(execute, version, data)
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
@@ -527,7 +522,7 @@ class Results(SQLSubModel):
|
|||||||
i = 0
|
i = 0
|
||||||
for reach in new_results._river.reachs:
|
for reach in new_results._river.reachs:
|
||||||
nb = len(reach.profiles)
|
nb = len(reach.profiles)
|
||||||
reach.set_global_index(range(i, i + nb + 1))
|
reach.set_global_index(range(i, i + nb))
|
||||||
i += nb
|
i += nb
|
||||||
|
|
||||||
if "Z" in table_data:
|
if "Z" in table_data:
|
||||||
|
|||||||
@@ -154,6 +154,7 @@ class Profile(SQLSubModel):
|
|||||||
"len_data, data, scenario " +
|
"len_data, data, scenario " +
|
||||||
"FROM results_data " +
|
"FROM results_data " +
|
||||||
f"WHERE scenario = {scenario.id} " +
|
f"WHERE scenario = {scenario.id} " +
|
||||||
|
f"AND result = {data['result_pid']} " +
|
||||||
f"AND reach = {reach.pamhyr_id} " +
|
f"AND reach = {reach.pamhyr_id} " +
|
||||||
f"AND section = {profile.pamhyr_id}"
|
f"AND section = {profile.pamhyr_id}"
|
||||||
)
|
)
|
||||||
@@ -276,7 +277,7 @@ class Profile(SQLSubModel):
|
|||||||
class Reach(SQLSubModel):
|
class Reach(SQLSubModel):
|
||||||
_sub_classes = [Profile]
|
_sub_classes = [Profile]
|
||||||
|
|
||||||
def __init__(self, reach, study, parent, with_init=True):
|
def __init__(self, reach, study, parent, with_init=True, profiles=None):
|
||||||
super(Reach, self).__init__(
|
super(Reach, self).__init__(
|
||||||
id=-1, status=study.status,
|
id=-1, status=study.status,
|
||||||
owner_scenario=study.status.scenario.id
|
owner_scenario=study.status.scenario.id
|
||||||
@@ -287,10 +288,12 @@ class Reach(SQLSubModel):
|
|||||||
self._reach = reach # Source reach in the study
|
self._reach = reach # Source reach in the study
|
||||||
self._profiles = []
|
self._profiles = []
|
||||||
if with_init:
|
if with_init:
|
||||||
|
if profiles is None:
|
||||||
|
profiles = reach.profiles
|
||||||
self._profiles = list(
|
self._profiles = list(
|
||||||
map(
|
map(
|
||||||
lambda p: Profile(p, self._study, self._parent),
|
lambda p: Profile(p, self._study, self._parent),
|
||||||
reach.profiles
|
profiles
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -379,7 +382,14 @@ class Reach(SQLSubModel):
|
|||||||
|
|
||||||
for i, profile in enumerate(reach.profiles):
|
for i, profile in enumerate(reach.profiles):
|
||||||
data["profile"] = profile
|
data["profile"] = profile
|
||||||
new_reach._profiles += [Profile._db_load(execute, data)]
|
result_profile = Profile._db_load(execute, data)
|
||||||
|
if len(result_profile) > 0:
|
||||||
|
new_reach._profiles.append(result_profile)
|
||||||
|
|
||||||
|
new_reach._profile_mask = [
|
||||||
|
profile.name[0:8] != 'interpol'
|
||||||
|
for profile in new_reach._profiles
|
||||||
|
]
|
||||||
|
|
||||||
return new_reach
|
return new_reach
|
||||||
|
|
||||||
@@ -418,10 +428,13 @@ class River(SQLSubModel):
|
|||||||
def has_reach(self, id):
|
def has_reach(self, id):
|
||||||
return 0 <= id < len(self._reachs)
|
return 0 <= id < len(self._reachs)
|
||||||
|
|
||||||
def add(self, reach_id):
|
def add(self, reach_id, profiles=None):
|
||||||
reachs = self._study.river.enable_edges()
|
reachs = self._study.river.enable_edges()
|
||||||
|
|
||||||
new = Reach(reachs[reach_id].reach, self._study, self._parent)
|
new = Reach(
|
||||||
|
reachs[reach_id].reach, self._study, self._parent,
|
||||||
|
profiles=profiles
|
||||||
|
)
|
||||||
|
|
||||||
self._reachs.append(new)
|
self._reachs.append(new)
|
||||||
return new
|
return new
|
||||||
@@ -460,9 +473,9 @@ class River(SQLSubModel):
|
|||||||
|
|
||||||
for reach in study.river.reachs():
|
for reach in study.river.reachs():
|
||||||
data["reach"] = reach.reach
|
data["reach"] = reach.reach
|
||||||
new_river._reachs.append(
|
result_reach = Reach._db_load(execute, data)
|
||||||
Reach._db_load(execute, data)
|
if len(result_reach) > 0:
|
||||||
)
|
new_river._reachs.append(result_reach)
|
||||||
|
|
||||||
return new_river
|
return new_river
|
||||||
|
|
||||||
|
|||||||
@@ -64,13 +64,15 @@ class Profile(object):
|
|||||||
|
|
||||||
|
|
||||||
class Reach(object):
|
class Reach(object):
|
||||||
def __init__(self, reach, study):
|
def __init__(self, reach, study, profiles=None):
|
||||||
self._study = study
|
self._study = study
|
||||||
self._reach = reach # Source reach in the study
|
self._reach = reach # Source reach in the study
|
||||||
|
if profiles is None:
|
||||||
|
profiles = reach.profiles
|
||||||
self._profiles = list(
|
self._profiles = list(
|
||||||
map(
|
map(
|
||||||
lambda p: Profile(p, self._study),
|
lambda p: Profile(p, self._study),
|
||||||
reach.profiles
|
profiles
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -89,6 +91,10 @@ class Reach(object):
|
|||||||
def profiles(self):
|
def profiles(self):
|
||||||
return self._profiles.copy()
|
return self._profiles.copy()
|
||||||
|
|
||||||
|
def get_rk(self):
|
||||||
|
"""Return the PK values for profiles present in the results."""
|
||||||
|
return [profile.rk for profile in self._profiles]
|
||||||
|
|
||||||
def profile(self, id):
|
def profile(self, id):
|
||||||
return self._profiles[id]
|
return self._profiles[id]
|
||||||
|
|
||||||
@@ -119,10 +125,10 @@ class River(object):
|
|||||||
def has_reach(self, id):
|
def has_reach(self, id):
|
||||||
return 0 <= id < len(self._reachs)
|
return 0 <= id < len(self._reachs)
|
||||||
|
|
||||||
def add(self, reach_id):
|
def add(self, reach_id, profiles=None):
|
||||||
reachs = self._study.river.enable_edges()
|
reachs = self._study.river.enable_edges()
|
||||||
|
|
||||||
new = Reach(reachs[reach_id].reach, self._study)
|
new = Reach(reachs[reach_id].reach, self._study, profiles=profiles)
|
||||||
|
|
||||||
self._reachs.append(new)
|
self._reachs.append(new)
|
||||||
return new
|
return new
|
||||||
|
|||||||
+130
-13
@@ -49,7 +49,6 @@ from Model.REPLine.REPLineList import REPLineList
|
|||||||
|
|
||||||
from Solver.Solvers import solver_type_list
|
from Solver.Solvers import solver_type_list
|
||||||
|
|
||||||
from Model.OutputRKAdists.OutputRKListAdists import OutputRKAdistsList
|
|
||||||
from Model.Pollutants.PollutantsList import PollutantsList
|
from Model.Pollutants.PollutantsList import PollutantsList
|
||||||
from Model.InitialConditionsAdisTS.InitialConditionsAdisTSList \
|
from Model.InitialConditionsAdisTS.InitialConditionsAdisTSList \
|
||||||
import InitialConditionsAdisTSList
|
import InitialConditionsAdisTSList
|
||||||
@@ -59,6 +58,16 @@ from Model.LateralContributionsAdisTS.LateralContributionsAdisTSList \
|
|||||||
import LateralContributionsAdisTSList
|
import LateralContributionsAdisTSList
|
||||||
from Model.D90AdisTS.D90AdisTSList import D90AdisTSList
|
from Model.D90AdisTS.D90AdisTSList import D90AdisTSList
|
||||||
from Model.DIFAdisTS.DIFAdisTSList import DIFAdisTSList
|
from Model.DIFAdisTS.DIFAdisTSList import DIFAdisTSList
|
||||||
|
|
||||||
|
from Model.InitialConditionsTemperature.InitialConditionsTemperatureList \
|
||||||
|
import InitialConditionsTemperatureList
|
||||||
|
|
||||||
|
from Model.BoundaryConditionsTemperature.BoundaryConditionsTemperatureList \
|
||||||
|
import BoundaryConditionsTemperatureList
|
||||||
|
|
||||||
|
from Model.WeatherParameters.WeatherParametersList \
|
||||||
|
import WeatherParametersList
|
||||||
|
|
||||||
from Model.GeoTIFF.GeoTIFFList import GeoTIFFList
|
from Model.GeoTIFF.GeoTIFFList import GeoTIFFList
|
||||||
from Model.Results.Results import Results
|
from Model.Results.Results import Results
|
||||||
|
|
||||||
@@ -468,13 +477,15 @@ class River(Graph):
|
|||||||
HydraulicStructureList,
|
HydraulicStructureList,
|
||||||
AddFileList,
|
AddFileList,
|
||||||
REPLineList,
|
REPLineList,
|
||||||
OutputRKAdistsList,
|
|
||||||
PollutantsList,
|
PollutantsList,
|
||||||
InitialConditionsAdisTSList,
|
InitialConditionsAdisTSList,
|
||||||
BoundaryConditionsAdisTSList,
|
BoundaryConditionsAdisTSList,
|
||||||
LateralContributionsAdisTSList,
|
LateralContributionsAdisTSList,
|
||||||
D90AdisTSList,
|
D90AdisTSList,
|
||||||
DIFAdisTSList,
|
DIFAdisTSList,
|
||||||
|
InitialConditionsTemperatureList,
|
||||||
|
BoundaryConditionsTemperatureList,
|
||||||
|
WeatherParametersList,
|
||||||
GeoTIFFList,
|
GeoTIFFList,
|
||||||
Results
|
Results
|
||||||
]
|
]
|
||||||
@@ -502,7 +513,6 @@ class River(Graph):
|
|||||||
)
|
)
|
||||||
self._additional_files = AddFileList(status=self._status)
|
self._additional_files = AddFileList(status=self._status)
|
||||||
self._rep_lines = REPLineList(status=self._status)
|
self._rep_lines = REPLineList(status=self._status)
|
||||||
self._Output_rk_adists = OutputRKAdistsList(status=self._status)
|
|
||||||
self._Pollutants = PollutantsList(status=self._status)
|
self._Pollutants = PollutantsList(status=self._status)
|
||||||
self._InitialConditionsAdisTS = InitialConditionsAdisTSList(
|
self._InitialConditionsAdisTS = InitialConditionsAdisTSList(
|
||||||
status=self._status)
|
status=self._status)
|
||||||
@@ -512,6 +522,13 @@ class River(Graph):
|
|||||||
status=self._status)
|
status=self._status)
|
||||||
self._D90AdisTS = D90AdisTSList(status=self._status)
|
self._D90AdisTS = D90AdisTSList(status=self._status)
|
||||||
self._DIFAdisTS = DIFAdisTSList(status=self._status)
|
self._DIFAdisTS = DIFAdisTSList(status=self._status)
|
||||||
|
self._InitialConditionsTemperature = (
|
||||||
|
InitialConditionsTemperatureList(status=self._status)
|
||||||
|
)
|
||||||
|
self._BoundaryConditionsTemperature = (
|
||||||
|
BoundaryConditionsTemperatureList(status=self._status)
|
||||||
|
)
|
||||||
|
self._WeatherParameters = (WeatherParametersList(status=self._status))
|
||||||
|
|
||||||
self._geotiff = GeoTIFFList(status=self._status)
|
self._geotiff = GeoTIFFList(status=self._status)
|
||||||
|
|
||||||
@@ -610,10 +627,6 @@ class River(Graph):
|
|||||||
|
|
||||||
new._Pollutants = PollutantsList._db_load(execute, data)
|
new._Pollutants = PollutantsList._db_load(execute, data)
|
||||||
|
|
||||||
new._Output_rk_adists = OutputRKAdistsList._db_load(
|
|
||||||
execute, data
|
|
||||||
)
|
|
||||||
|
|
||||||
new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load(
|
new._InitialConditionsAdisTS = InitialConditionsAdisTSList._db_load(
|
||||||
execute, data)
|
execute, data)
|
||||||
|
|
||||||
@@ -627,6 +640,14 @@ class River(Graph):
|
|||||||
|
|
||||||
new._DIFAdisTS = DIFAdisTSList._db_load(execute, data)
|
new._DIFAdisTS = DIFAdisTSList._db_load(execute, data)
|
||||||
|
|
||||||
|
new._InitialConditionsTemperature = \
|
||||||
|
InitialConditionsTemperatureList._db_load(execute, data)
|
||||||
|
|
||||||
|
new._BoundaryConditionsTemperature = \
|
||||||
|
BoundaryConditionsTemperatureList._db_load(execute, data)
|
||||||
|
|
||||||
|
new._WeatherParameters = WeatherParametersList._db_load(execute, data)
|
||||||
|
|
||||||
new._geotiff = GeoTIFFList._db_load(execute, data)
|
new._geotiff = GeoTIFFList._db_load(execute, data)
|
||||||
|
|
||||||
return new
|
return new
|
||||||
@@ -654,7 +675,6 @@ class River(Graph):
|
|||||||
for solver in self._parameters:
|
for solver in self._parameters:
|
||||||
objs.append(self._parameters[solver])
|
objs.append(self._parameters[solver])
|
||||||
|
|
||||||
objs.append(self._Output_rk_adists)
|
|
||||||
objs.append(self._Pollutants)
|
objs.append(self._Pollutants)
|
||||||
objs.append(self._InitialConditionsAdisTS)
|
objs.append(self._InitialConditionsAdisTS)
|
||||||
objs.append(self._BoundaryConditionsAdisTS)
|
objs.append(self._BoundaryConditionsAdisTS)
|
||||||
@@ -662,6 +682,10 @@ class River(Graph):
|
|||||||
objs.append(self._D90AdisTS)
|
objs.append(self._D90AdisTS)
|
||||||
objs.append(self._DIFAdisTS)
|
objs.append(self._DIFAdisTS)
|
||||||
|
|
||||||
|
objs.append(self._InitialConditionsTemperature)
|
||||||
|
objs.append(self._BoundaryConditionsTemperature)
|
||||||
|
objs.append(self._WeatherParameters)
|
||||||
|
|
||||||
objs.append(self._geotiff)
|
objs.append(self._geotiff)
|
||||||
|
|
||||||
for solv_type in self.results:
|
for solv_type in self.results:
|
||||||
@@ -734,12 +758,14 @@ class River(Graph):
|
|||||||
self._hydraulic_structures,
|
self._hydraulic_structures,
|
||||||
self._additional_files,
|
self._additional_files,
|
||||||
self._rep_lines,
|
self._rep_lines,
|
||||||
self._Output_rk_adists,
|
|
||||||
self._Pollutants,
|
self._Pollutants,
|
||||||
self._InitialConditionsAdisTS,
|
self._InitialConditionsAdisTS,
|
||||||
self._BoundaryConditionsAdisTS,
|
self._BoundaryConditionsAdisTS,
|
||||||
self._LateralContributionsAdisTS,
|
self._LateralContributionsAdisTS,
|
||||||
self._D90AdisTS, self._DIFAdisTS,
|
self._D90AdisTS, self._DIFAdisTS,
|
||||||
|
self._InitialConditionsTemperature,
|
||||||
|
self._BoundaryConditionsTemperature,
|
||||||
|
self._WeatherParameters,
|
||||||
self._geotiff,
|
self._geotiff,
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -845,10 +871,6 @@ Last export at: @date."""
|
|||||||
def parameters(self):
|
def parameters(self):
|
||||||
return self._parameters
|
return self._parameters
|
||||||
|
|
||||||
@property
|
|
||||||
def Output_rk_adists(self):
|
|
||||||
return self._Output_rk_adists
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def Pollutants(self):
|
def Pollutants(self):
|
||||||
return self._Pollutants
|
return self._Pollutants
|
||||||
@@ -873,6 +895,67 @@ Last export at: @date."""
|
|||||||
def dif_adists(self):
|
def dif_adists(self):
|
||||||
return self._DIFAdisTS
|
return self._DIFAdisTS
|
||||||
|
|
||||||
|
@property
|
||||||
|
def ic_temperature(self):
|
||||||
|
return self._InitialConditionsTemperature
|
||||||
|
|
||||||
|
@property
|
||||||
|
def boundary_conditions_temperature(self):
|
||||||
|
return self._BoundaryConditionsTemperature
|
||||||
|
|
||||||
|
@property
|
||||||
|
def weather_parameters(self):
|
||||||
|
return self._WeatherParameters
|
||||||
|
|
||||||
|
def profile_dependencies(self, profile):
|
||||||
|
"""Return model data which directly reference *profile*.
|
||||||
|
|
||||||
|
PK-based intervals are deliberately not included: only explicit
|
||||||
|
references to the profile object prevent it from being disabled.
|
||||||
|
"""
|
||||||
|
dependencies = []
|
||||||
|
|
||||||
|
def add(kind, item, association):
|
||||||
|
dependencies.append({
|
||||||
|
"kind": kind,
|
||||||
|
"item": item,
|
||||||
|
"association": association,
|
||||||
|
})
|
||||||
|
|
||||||
|
for structure in self._hydraulic_structures.lst:
|
||||||
|
if structure.input_section is profile:
|
||||||
|
add("hydraulic_structure", structure, "")
|
||||||
|
|
||||||
|
for tab in self._lateral_contribution._tabs_list:
|
||||||
|
for contribution in self._lateral_contribution.get_tab(tab):
|
||||||
|
if contribution.begin_section is profile:
|
||||||
|
add("lateral_contribution", contribution, "begin_section")
|
||||||
|
if contribution.end_section is profile:
|
||||||
|
add("lateral_contribution", contribution, "end_section")
|
||||||
|
|
||||||
|
for parameter in self._WeatherParameters.lst:
|
||||||
|
if parameter.begin_section is profile:
|
||||||
|
add("weather_parameter", parameter, "begin_section")
|
||||||
|
if parameter.end_section is profile:
|
||||||
|
add("weather_parameter", parameter, "end_section")
|
||||||
|
|
||||||
|
reach_id = profile.reach.pamhyr_id
|
||||||
|
for initial_condition in self._InitialConditionsTemperature.lst:
|
||||||
|
for specification in initial_condition.data:
|
||||||
|
same_reach = specification.reach == reach_id
|
||||||
|
same_rk = (
|
||||||
|
specification.start_rk == profile.rk or
|
||||||
|
specification.end_rk == profile.rk
|
||||||
|
)
|
||||||
|
if same_reach and same_rk:
|
||||||
|
add(
|
||||||
|
"initial_condition_temperature",
|
||||||
|
specification,
|
||||||
|
"cross_section_pk",
|
||||||
|
)
|
||||||
|
|
||||||
|
return dependencies
|
||||||
|
|
||||||
def get_params(self, solver):
|
def get_params(self, solver):
|
||||||
if solver in self._parameters:
|
if solver in self._parameters:
|
||||||
return self._parameters[solver]
|
return self._parameters[solver]
|
||||||
@@ -929,6 +1012,12 @@ Last export at: @date."""
|
|||||||
self._results[solv_type] = results
|
self._results[solv_type] = results
|
||||||
|
|
||||||
def _split_reach(self, reach, profile):
|
def _split_reach(self, reach, profile):
|
||||||
|
profiles = reach.reach.profiles
|
||||||
|
if not profiles or profile not in profiles[1:-1]:
|
||||||
|
raise ValueError(
|
||||||
|
"A reach cannot be split at its first or last profile"
|
||||||
|
)
|
||||||
|
|
||||||
node1 = reach.node1
|
node1 = reach.node1
|
||||||
node2 = reach.node2
|
node2 = reach.node2
|
||||||
|
|
||||||
@@ -945,4 +1034,32 @@ Last export at: @date."""
|
|||||||
self._add_edge(r1)
|
self._add_edge(r1)
|
||||||
self._add_edge(r2)
|
self._add_edge(r2)
|
||||||
|
|
||||||
|
self._initial_conditions.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
self._lateral_contribution.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
self._hydraulic_structures.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
self._InitialConditionsAdisTS.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
self._LateralContributionsAdisTS.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
self._InitialConditionsTemperature.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
self._WeatherParameters.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
self._D90AdisTS.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
self._DIFAdisTS.split_reach(
|
||||||
|
reach, profile, r1, r2
|
||||||
|
)
|
||||||
|
|
||||||
return r1, r2
|
return r1, r2
|
||||||
+10
-8
@@ -32,7 +32,6 @@ class Scenario(SQLSubModel):
|
|||||||
|
|
||||||
tables_with_deleted_column = [
|
tables_with_deleted_column = [
|
||||||
# Adists
|
# Adists
|
||||||
"output_rk_adists",
|
|
||||||
"boundary_condition_adists", "boundary_condition_data_adists",
|
"boundary_condition_adists", "boundary_condition_data_adists",
|
||||||
"lateral_contribution_adists", "lateral_contribution_data_adists",
|
"lateral_contribution_adists", "lateral_contribution_data_adists",
|
||||||
"initial_conditions_adists", "initial_conditions_adists_spec",
|
"initial_conditions_adists", "initial_conditions_adists_spec",
|
||||||
@@ -53,6 +52,12 @@ class Scenario(SQLSubModel):
|
|||||||
"geometry_pointXYZ", "geometry_profileXYZ",
|
"geometry_pointXYZ", "geometry_profileXYZ",
|
||||||
"river_reach", "river_node",
|
"river_reach", "river_node",
|
||||||
"geotiff", "reservoir", "reservoir_data",
|
"geotiff", "reservoir", "reservoir_data",
|
||||||
|
# Temperature
|
||||||
|
"boundary_condition_temperature",
|
||||||
|
"boundary_condition_data_temperature",
|
||||||
|
"initial_conditions_temperature",
|
||||||
|
"initial_conditions_temperature_spec",
|
||||||
|
"weather_parameters", "weather_parameters_data",
|
||||||
]
|
]
|
||||||
|
|
||||||
related_tables = tables_with_deleted_column + [
|
related_tables = tables_with_deleted_column + [
|
||||||
@@ -346,11 +351,8 @@ class Scenario(SQLSubModel):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
def workdir(self):
|
def workdir(self):
|
||||||
srep = ""
|
current = "scenario_" + str(self.id)
|
||||||
if self.id != 0:
|
if self.parent is None or self.parent.id == 0:
|
||||||
srep = os.path.join(
|
return current
|
||||||
self.parent.workdir(),
|
|
||||||
"scenario_" + str(self.id)
|
|
||||||
)
|
|
||||||
|
|
||||||
return srep
|
return os.path.join(self.parent.workdir(), current)
|
||||||
@@ -216,6 +216,9 @@ class Parameter(SQLSubModel):
|
|||||||
return new
|
return new
|
||||||
|
|
||||||
def _db_save(self, execute, data=None):
|
def _db_save(self, execute, data=None):
|
||||||
|
if not self.must_be_saved():
|
||||||
|
return True
|
||||||
|
|
||||||
ind = data["ind"]
|
ind = data["ind"]
|
||||||
solver = data["solver"]
|
solver = data["solver"]
|
||||||
|
|
||||||
|
|||||||
@@ -60,9 +60,12 @@ class StricklersList(PamhyrModelList):
|
|||||||
return self.lst
|
return self.lst
|
||||||
|
|
||||||
def new(self, index):
|
def new(self, index):
|
||||||
|
owner_scenario = (
|
||||||
|
self._status.scenario_id if self._status is not None else -1
|
||||||
|
)
|
||||||
s = Stricklers(
|
s = Stricklers(
|
||||||
status=self._status,
|
status=self._status,
|
||||||
owner_scenario=self._status.scenario_id
|
owner_scenario=owner_scenario
|
||||||
)
|
)
|
||||||
self.insert(index, s)
|
self.insert(index, s)
|
||||||
self.modified()
|
self.modified()
|
||||||
|
|||||||
+38
-6
@@ -21,7 +21,7 @@ import shutil
|
|||||||
import logging
|
import logging
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from tools import timer, timestamp
|
from tools import timer, timestamp, parse_datetime
|
||||||
from functools import reduce
|
from functools import reduce
|
||||||
|
|
||||||
from Model.Tools.PamhyrListExt import PamhyrModelList
|
from Model.Tools.PamhyrListExt import PamhyrModelList
|
||||||
@@ -32,6 +32,7 @@ from Model.Scenario import Scenario
|
|||||||
from Model.Status import StudyStatus
|
from Model.Status import StudyStatus
|
||||||
from Model.Except import NotImplementedMethodeError
|
from Model.Except import NotImplementedMethodeError
|
||||||
from Model.River import River
|
from Model.River import River
|
||||||
|
from Model.TimeShift import shift_river_times, shift_database_times
|
||||||
from Model.Geometry.Reach import Reach
|
from Model.Geometry.Reach import Reach
|
||||||
from Model.HydraulicStructures.HydraulicStructures import (
|
from Model.HydraulicStructures.HydraulicStructures import (
|
||||||
HydraulicStructure
|
HydraulicStructure
|
||||||
@@ -46,7 +47,7 @@ logger = logging.getLogger()
|
|||||||
|
|
||||||
|
|
||||||
class Study(SQLModel):
|
class Study(SQLModel):
|
||||||
_version = "0.2.7"
|
_version = "0.2.10"
|
||||||
|
|
||||||
_sub_classes = [
|
_sub_classes = [
|
||||||
Scenario,
|
Scenario,
|
||||||
@@ -72,6 +73,7 @@ class Study(SQLModel):
|
|||||||
self.description = ""
|
self.description = ""
|
||||||
# Time system
|
# Time system
|
||||||
self._time_system = "time"
|
self._time_system = "time"
|
||||||
|
self._pending_time_offset = 0.0
|
||||||
self._date = datetime.fromtimestamp(0)
|
self._date = datetime.fromtimestamp(0)
|
||||||
|
|
||||||
if init_new:
|
if init_new:
|
||||||
@@ -198,6 +200,16 @@ class Study(SQLModel):
|
|||||||
self._date = date
|
self._date = date
|
||||||
self.status.modified()
|
self.status.modified()
|
||||||
|
|
||||||
|
def change_start_date(self, date, preserve_dates=False):
|
||||||
|
"""Change the origin, optionally preserving series calendar dates."""
|
||||||
|
new_date = parse_datetime(date)
|
||||||
|
offset = (parse_datetime(self.date) - new_date).total_seconds()
|
||||||
|
if preserve_dates and offset:
|
||||||
|
shift_river_times(self.river, offset)
|
||||||
|
self._pending_time_offset += offset
|
||||||
|
self._river_scenario_cache.clear()
|
||||||
|
self.use_date(new_date)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def date(self):
|
def date(self):
|
||||||
return self._date
|
return self._date
|
||||||
@@ -217,8 +229,7 @@ class Study(SQLModel):
|
|||||||
me.name = name
|
me.name = name
|
||||||
me.description = description
|
me.description = description
|
||||||
if date is not None:
|
if date is not None:
|
||||||
me.use_date()
|
me.use_date(date)
|
||||||
me.date = date
|
|
||||||
return me
|
return me
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@@ -290,7 +301,14 @@ class Study(SQLModel):
|
|||||||
if major == "0" and int(minor) < 2:
|
if major == "0" and int(minor) < 2:
|
||||||
self._add_into_info_if_not_exists('current_scenario', '0')
|
self._add_into_info_if_not_exists('current_scenario', '0')
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
needs_foreign_keys_disabled = (
|
||||||
|
major == "0" and (
|
||||||
|
int(minor) < 2 or
|
||||||
|
(minor == "2" and int(release) < 10)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
if needs_foreign_keys_disabled:
|
||||||
# Need to temporary disable the sqlite foreign keys
|
# Need to temporary disable the sqlite foreign keys
|
||||||
# checking to update db dans change the table id fk to
|
# checking to update db dans change the table id fk to
|
||||||
# table pamhyr_id fk
|
# table pamhyr_id fk
|
||||||
@@ -300,7 +318,7 @@ class Study(SQLModel):
|
|||||||
|
|
||||||
ok = self._update_submodel(version[0], data={})
|
ok = self._update_submodel(version[0], data={})
|
||||||
|
|
||||||
if major == "0" and int(minor) < 2:
|
if needs_foreign_keys_disabled:
|
||||||
# Reactivate foreign keys checking
|
# Reactivate foreign keys checking
|
||||||
self.execute(
|
self.execute(
|
||||||
"PRAGMA foreign_keys = ON;"
|
"PRAGMA foreign_keys = ON;"
|
||||||
@@ -454,6 +472,17 @@ class Study(SQLModel):
|
|||||||
)
|
)
|
||||||
progress()
|
progress()
|
||||||
|
|
||||||
|
if self._pending_time_offset:
|
||||||
|
self._db.execute('SAVEPOINT shift_time_origin')
|
||||||
|
try:
|
||||||
|
shift_database_times(self._db, self._pending_time_offset)
|
||||||
|
self._db.execute('RELEASE SAVEPOINT shift_time_origin')
|
||||||
|
except Exception:
|
||||||
|
self._db.execute('ROLLBACK TO SAVEPOINT shift_time_origin')
|
||||||
|
self._db.execute('RELEASE SAVEPOINT shift_time_origin')
|
||||||
|
raise
|
||||||
|
self._pending_time_offset = 0.0
|
||||||
|
|
||||||
self._save_submodel(
|
self._save_submodel(
|
||||||
[self.scenarios, self._river],
|
[self.scenarios, self._river],
|
||||||
data=progress
|
data=progress
|
||||||
@@ -588,6 +617,9 @@ class Study(SQLModel):
|
|||||||
self.status.stop_loading()
|
self.status.stop_loading()
|
||||||
self.status.scenario = old_scenario
|
self.status.scenario = old_scenario
|
||||||
|
|
||||||
|
if self._pending_time_offset:
|
||||||
|
shift_river_times(river, self._pending_time_offset)
|
||||||
|
|
||||||
# FIXME: Disable scenario cache to save memory usage
|
# FIXME: Disable scenario cache to save memory usage
|
||||||
# self._river_scenario_cache[scenario] = river
|
# self._river_scenario_cache[scenario] = river
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
"""Shift temporal series when preserving calendar dates across a new origin."""
|
||||||
|
from Model.BoundaryCondition.BoundaryCondition import BoundaryCondition
|
||||||
|
from Model.LateralContribution.LateralContribution import LateralContribution
|
||||||
|
from Model.WeatherParameters.WeatherParameters import WeatherParameters
|
||||||
|
from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import (
|
||||||
|
BoundaryConditionAdisTS
|
||||||
|
)
|
||||||
|
from Model.LateralContributionsAdisTS.LateralContributionAdisTS import (
|
||||||
|
LateralContributionAdisTS
|
||||||
|
)
|
||||||
|
from Model.BoundaryConditionsTemperature.BoundaryConditionTemperature import (
|
||||||
|
BoundaryConditionTemperature
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def shift_river_times(river, offset):
|
||||||
|
changes = []
|
||||||
|
seen = set()
|
||||||
|
|
||||||
|
def collect(obj, data):
|
||||||
|
temporal = isinstance(obj, (
|
||||||
|
BoundaryConditionAdisTS,
|
||||||
|
LateralContributionAdisTS,
|
||||||
|
BoundaryConditionTemperature
|
||||||
|
))
|
||||||
|
if isinstance(obj, (
|
||||||
|
BoundaryCondition, LateralContribution, WeatherParameters
|
||||||
|
)):
|
||||||
|
temporal = bool(obj.header) and obj.header[0] == 'time'
|
||||||
|
if temporal:
|
||||||
|
for point in obj._data:
|
||||||
|
if id(point) not in seen:
|
||||||
|
changes.append((point, float(point[0]) + offset))
|
||||||
|
seen.add(id(point))
|
||||||
|
|
||||||
|
river._data_traversal(modifier=collect)
|
||||||
|
for point, value in changes:
|
||||||
|
# This is a global change of origin, not a scenario-specific edit.
|
||||||
|
point[0] = value
|
||||||
|
|
||||||
|
|
||||||
|
def shift_database_times(connection, offset):
|
||||||
|
tables = [
|
||||||
|
(
|
||||||
|
'boundary_condition_data', 'boundary_condition',
|
||||||
|
'bc', BoundaryCondition
|
||||||
|
),
|
||||||
|
(
|
||||||
|
'lateral_contribution_data', 'lateral_contribution',
|
||||||
|
'lc', LateralContribution
|
||||||
|
),
|
||||||
|
(
|
||||||
|
'weather_parameters_data', 'weather_parameters',
|
||||||
|
'wp', WeatherParameters
|
||||||
|
),
|
||||||
|
('boundary_condition_data_adists', None, None, None),
|
||||||
|
('lateral_contribution_data_adists', None, None, None),
|
||||||
|
('boundary_condition_data_temperature', None, None, None),
|
||||||
|
]
|
||||||
|
for table, parent, fk, model in tables:
|
||||||
|
if model is None:
|
||||||
|
rows = connection.execute(
|
||||||
|
f'SELECT rowid, data0 FROM {table}'
|
||||||
|
).fetchall()
|
||||||
|
else:
|
||||||
|
rows = []
|
||||||
|
for kind, in connection.execute(
|
||||||
|
f'SELECT DISTINCT type FROM {parent}'
|
||||||
|
):
|
||||||
|
headers = model._get_ctor_from_type(kind)().header
|
||||||
|
if not headers or headers[0] != 'time':
|
||||||
|
continue
|
||||||
|
rows.extend(connection.execute(
|
||||||
|
f'SELECT d.rowid, d.data0 FROM {table} d JOIN {parent} p '
|
||||||
|
f'ON p.pamhyr_id=d.{fk} AND p.scenario=d.scenario '
|
||||||
|
f'WHERE p.type=?',
|
||||||
|
(kind,)
|
||||||
|
).fetchall())
|
||||||
|
connection.executemany(
|
||||||
|
f'UPDATE {table} SET data0=? WHERE rowid=?',
|
||||||
|
[(float(value) + offset, rowid) for rowid, value in rows]
|
||||||
|
)
|
||||||
@@ -0,0 +1,775 @@
|
|||||||
|
# WeatherParameters.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from tools import (
|
||||||
|
trace, timer,
|
||||||
|
old_pamhyr_date_to_timestamp,
|
||||||
|
date_iso_to_timestamp,
|
||||||
|
date_dmy_to_timestamp,
|
||||||
|
)
|
||||||
|
|
||||||
|
from Model.Tools.PamhyrDB import SQLSubModel
|
||||||
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
from Model.Scenario import Scenario
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class Data(SQLSubModel):
|
||||||
|
_sub_classes = []
|
||||||
|
|
||||||
|
def __init__(self,
|
||||||
|
data0, data1,
|
||||||
|
id: int = -1,
|
||||||
|
types=[float, float],
|
||||||
|
status=None,
|
||||||
|
owner_scenario=-1):
|
||||||
|
super(Data, self).__init__(
|
||||||
|
id=id, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._types = types
|
||||||
|
self._data = [data0, data1]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_create(cls, execute, ext=""):
|
||||||
|
execute(f"""
|
||||||
|
CREATE TABLE weather_parameters_data{ext} (
|
||||||
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
ind INTEGER NOT NULL,
|
||||||
|
data0 TEXT NOT NULL,
|
||||||
|
data1 TEXT NOT NULL,
|
||||||
|
wp INTEGER,
|
||||||
|
{Scenario.create_db_add_scenario()},
|
||||||
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
|
FOREIGN KEY(wp) REFERENCES weather_parameters(pamhyr_id),
|
||||||
|
PRIMARY KEY(pamhyr_id, scenario)
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
|
return cls._create_submodel(execute)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_update(cls, execute, version, data=None):
|
||||||
|
major, minor, release = version.strip().split(".")
|
||||||
|
|
||||||
|
if major == "0" and (int(minor) < 2 or
|
||||||
|
(int(minor) == 2 and int(release) <= 7)):
|
||||||
|
if not cls.is_table_exists(execute, "air_temperature_data"):
|
||||||
|
cls._db_create(execute)
|
||||||
|
|
||||||
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = []
|
||||||
|
wp = data["wp"]
|
||||||
|
status = data['status']
|
||||||
|
scenario = data["scenario"]
|
||||||
|
loaded = data['loaded_pid']
|
||||||
|
|
||||||
|
if scenario is None:
|
||||||
|
return new
|
||||||
|
|
||||||
|
values = execute(
|
||||||
|
"SELECT pamhyr_id, deleted, " +
|
||||||
|
"data0, data1, scenario " +
|
||||||
|
"FROM weather_parameters_data " +
|
||||||
|
f"WHERE wp = {wp._pamhyr_id} " +
|
||||||
|
f"AND scenario = {scenario.id} " +
|
||||||
|
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " +
|
||||||
|
"ORDER BY ind ASC"
|
||||||
|
)
|
||||||
|
|
||||||
|
for v in values:
|
||||||
|
it = iter(v)
|
||||||
|
|
||||||
|
pid = next(it)
|
||||||
|
deleted = next(it)
|
||||||
|
data0 = wp._types[0](next(it))
|
||||||
|
data1 = wp._types[1](next(it))
|
||||||
|
owner_scenario = next(it)
|
||||||
|
|
||||||
|
nd = cls(
|
||||||
|
data0, data1,
|
||||||
|
id=pid,
|
||||||
|
types=wp._types,
|
||||||
|
status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
if deleted:
|
||||||
|
nd.set_as_deleted()
|
||||||
|
|
||||||
|
loaded.add(pid)
|
||||||
|
new.append(nd)
|
||||||
|
|
||||||
|
data["scenario"] = scenario.parent
|
||||||
|
new += cls._db_load(execute, data)
|
||||||
|
data["scenario"] = scenario
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
pid = self._pamhyr_id
|
||||||
|
ind = data["ind"]
|
||||||
|
data0 = self._db_format(str(self[0]))
|
||||||
|
data1 = self._db_format(str(self[1]))
|
||||||
|
wp = data["wp"]
|
||||||
|
|
||||||
|
execute(
|
||||||
|
"INSERT INTO " +
|
||||||
|
"weather_parameters_data (pamhyr_id, deleted, ind, " +
|
||||||
|
"data0, data1, wp, scenario) " +
|
||||||
|
f"VALUES ({pid}, {self._db_format(self.is_deleted())}, " +
|
||||||
|
f"{ind}, '{self._db_format(data0)}', {self._db_format(data1)}, " +
|
||||||
|
f"{wp._pamhyr_id}, {self._status.scenario_id}" +
|
||||||
|
")"
|
||||||
|
)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def __getitem__(self, key):
|
||||||
|
return self._types[key](self._data[key])
|
||||||
|
|
||||||
|
def __setitem__(self, key, value):
|
||||||
|
self._data[key] = self._types[key](value)
|
||||||
|
|
||||||
|
def cloned(self):
|
||||||
|
return Data(
|
||||||
|
self[0], self[1],
|
||||||
|
types=self._types,
|
||||||
|
status=self._status
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class WeatherParametersDefault(SQLSubModel):
|
||||||
|
def __init__(self, type: str, value: float = 0.0,
|
||||||
|
id: int = -1, status=None, owner_scenario=-1):
|
||||||
|
super(WeatherParametersDefault, self).__init__(
|
||||||
|
id=id, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = type
|
||||||
|
self._value = float(value)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = []
|
||||||
|
status = data['status']
|
||||||
|
scenario = data["scenario"]
|
||||||
|
loaded = data['loaded_pid']
|
||||||
|
|
||||||
|
if scenario is None:
|
||||||
|
return new
|
||||||
|
|
||||||
|
table = execute(
|
||||||
|
"SELECT pamhyr_id, type, value, scenario " +
|
||||||
|
"FROM weather_parameters_default " +
|
||||||
|
f"WHERE scenario = {scenario.id} " +
|
||||||
|
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
|
||||||
|
)
|
||||||
|
|
||||||
|
for row in table:
|
||||||
|
it = iter(row)
|
||||||
|
|
||||||
|
pid = next(it)
|
||||||
|
type = next(it)
|
||||||
|
value = next(it)
|
||||||
|
owner_scenario = next(it)
|
||||||
|
|
||||||
|
wp_default = cls(
|
||||||
|
type=type,
|
||||||
|
value=value,
|
||||||
|
id=pid,
|
||||||
|
status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
loaded.add(pid)
|
||||||
|
new.append(wp_default)
|
||||||
|
|
||||||
|
data["scenario"] = scenario.parent
|
||||||
|
new += cls._db_load(execute, data)
|
||||||
|
data["scenario"] = scenario
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
if not self.must_be_saved():
|
||||||
|
return True
|
||||||
|
|
||||||
|
execute(
|
||||||
|
"INSERT INTO " +
|
||||||
|
"weather_parameters_default(" +
|
||||||
|
"pamhyr_id, type, value, scenario) " +
|
||||||
|
"VALUES (" +
|
||||||
|
f"{self.id}, '{self._db_format(self._type)}', {self._value}, " +
|
||||||
|
f"{self._status.scenario_id}" +
|
||||||
|
")"
|
||||||
|
)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
@property
|
||||||
|
def type(self):
|
||||||
|
return self._type
|
||||||
|
|
||||||
|
@property
|
||||||
|
def value(self):
|
||||||
|
return self._value
|
||||||
|
|
||||||
|
@value.setter
|
||||||
|
def value(self, value):
|
||||||
|
self._value = float(value)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
|
||||||
|
class WeatherParameters(SQLSubModel):
|
||||||
|
_sub_classes = [Data]
|
||||||
|
|
||||||
|
def __init__(self, id: int = -1,
|
||||||
|
name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(WeatherParameters, self).__init__(
|
||||||
|
id=id, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._name = name
|
||||||
|
self._type = ""
|
||||||
|
self._reach = None
|
||||||
|
self._begin_section = None
|
||||||
|
self._end_section = None
|
||||||
|
self._data = []
|
||||||
|
self._header = []
|
||||||
|
self._types = [float, float]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_create(cls, execute, ext=""):
|
||||||
|
execute(f"""
|
||||||
|
CREATE TABLE weather_parameters{ext}(
|
||||||
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
deleted BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
type TEXT NOT NULL,
|
||||||
|
reach INTEGER,
|
||||||
|
begin_section INTEGER,
|
||||||
|
end_section INTEGER,
|
||||||
|
{Scenario.create_db_add_scenario()},
|
||||||
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
|
FOREIGN KEY(reach) REFERENCES river_reach(pamhyr_id),
|
||||||
|
FOREIGN KEY(begin_section)
|
||||||
|
REFERENCES geometry_profileXYZ(pamhyr_id),
|
||||||
|
FOREIGN KEY(end_section)
|
||||||
|
REFERENCES geometry_profileXYZ(pamhyr_id),
|
||||||
|
PRIMARY KEY(pamhyr_id, scenario)
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
|
execute(f"""
|
||||||
|
CREATE TABLE weather_parameters_default{ext}(
|
||||||
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
type TEXT NOT NULL,
|
||||||
|
value FLOAT NOT NULL,
|
||||||
|
{Scenario.create_db_add_scenario()},
|
||||||
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
|
primary KEY(pamhyr_id, scenario)
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
|
if ext == "_tmp":
|
||||||
|
return True
|
||||||
|
|
||||||
|
return cls._create_submodel(execute)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _get_ctor_from_type(cls, t):
|
||||||
|
from Model.WeatherParameters.WeatherParametersTypes import (
|
||||||
|
NotDefined, WeatherParam, AirTemperature, SpecificHumidity,
|
||||||
|
GlobalRadiation, ReferenceWindSpeed, GroundwaterTemperature,
|
||||||
|
GroundwaterFlowRate, Albedo, ShadingCoefficient, CloudCoverFraction
|
||||||
|
)
|
||||||
|
|
||||||
|
res = NotDefined
|
||||||
|
if t == "WP":
|
||||||
|
res = WeatherParam
|
||||||
|
elif t == "AT":
|
||||||
|
res = AirTemperature
|
||||||
|
elif t == "SH":
|
||||||
|
res = SpecificHumidity
|
||||||
|
elif t == "GR":
|
||||||
|
res = GlobalRadiation
|
||||||
|
elif t == "RWS":
|
||||||
|
res = ReferenceWindSpeed
|
||||||
|
elif t == "GT":
|
||||||
|
res = GroundwaterTemperature
|
||||||
|
elif t == "GFR":
|
||||||
|
res = GroundwaterFlowRate
|
||||||
|
elif t == "ALB":
|
||||||
|
res = Albedo
|
||||||
|
elif t == "SC":
|
||||||
|
res = ShadingCoefficient
|
||||||
|
elif t == "CCF":
|
||||||
|
res = CloudCoverFraction
|
||||||
|
else:
|
||||||
|
res = NotDefined
|
||||||
|
return res
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_update(cls, execute, version, data=None):
|
||||||
|
major, minor, release = version.strip().split(".")
|
||||||
|
created = False
|
||||||
|
|
||||||
|
if major == "0" and (int(minor) < 2 or
|
||||||
|
(int(minor) == 2 and int(release) <= 7)):
|
||||||
|
if not cls.is_table_exists(execute, "air_temperature"):
|
||||||
|
cls._db_create(execute)
|
||||||
|
created = True
|
||||||
|
|
||||||
|
if not cls.is_table_exists(execute, "weather_parameters_default"):
|
||||||
|
execute(f"""
|
||||||
|
CREATE TABLE weather_parameters_default(
|
||||||
|
{cls.create_db_add_pamhyr_id()},
|
||||||
|
type TEXT NOT NULL,
|
||||||
|
value FLOAT NOT NULL,
|
||||||
|
{Scenario.create_db_add_scenario()},
|
||||||
|
{Scenario.create_db_add_scenario_fk()},
|
||||||
|
primary KEY(pamhyr_id, scenario)
|
||||||
|
)
|
||||||
|
""")
|
||||||
|
|
||||||
|
if not created:
|
||||||
|
return cls._update_submodel(execute, version, data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = []
|
||||||
|
status = data['status']
|
||||||
|
edges = data["edges"]
|
||||||
|
scenario = data["scenario"]
|
||||||
|
loaded = data['loaded_pid']
|
||||||
|
|
||||||
|
if scenario is None:
|
||||||
|
return new
|
||||||
|
|
||||||
|
table = execute(
|
||||||
|
"SELECT pamhyr_id, deleted, name, type, " +
|
||||||
|
"reach, begin_section, end_section, scenario " +
|
||||||
|
"FROM weather_parameters " +
|
||||||
|
f"WHERE scenario = {scenario.id} " +
|
||||||
|
f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
|
||||||
|
)
|
||||||
|
|
||||||
|
for row in table:
|
||||||
|
it = iter(row)
|
||||||
|
|
||||||
|
pid = next(it)
|
||||||
|
deleted = next(it)
|
||||||
|
name = next(it)
|
||||||
|
t = next(it)
|
||||||
|
reach = next(it)
|
||||||
|
b_section = next(it)
|
||||||
|
e_section = next(it)
|
||||||
|
owner_scenario = next(it)
|
||||||
|
|
||||||
|
ctor = cls._get_ctor_from_type(t)
|
||||||
|
wp = ctor(
|
||||||
|
id=pid, name=name,
|
||||||
|
status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
wp.reach = None
|
||||||
|
wp._begin_section = None
|
||||||
|
wp._end_section = None
|
||||||
|
|
||||||
|
if reach not in (-1, None):
|
||||||
|
wp.reach = next(
|
||||||
|
(edge for edge in edges if edge.id == reach), None
|
||||||
|
)
|
||||||
|
profiles = (
|
||||||
|
wp.reach.reach.profiles
|
||||||
|
if wp.reach is not None else []
|
||||||
|
)
|
||||||
|
wp._begin_section = next(
|
||||||
|
(profile for profile in profiles
|
||||||
|
if profile.id == b_section), None
|
||||||
|
)
|
||||||
|
wp._end_section = next(
|
||||||
|
(profile for profile in profiles
|
||||||
|
if profile.id == e_section), None
|
||||||
|
)
|
||||||
|
|
||||||
|
data["wp"] = wp
|
||||||
|
wp._data = Data._db_load(execute, data=data)
|
||||||
|
|
||||||
|
loaded.add(pid)
|
||||||
|
new.append(wp)
|
||||||
|
|
||||||
|
data["scenario"] = scenario.parent
|
||||||
|
new += cls._db_load(execute, data)
|
||||||
|
data["scenario"] = scenario
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
if not self.must_be_saved():
|
||||||
|
return True
|
||||||
|
|
||||||
|
data["wp"] = self
|
||||||
|
|
||||||
|
execute(
|
||||||
|
"DELETE FROM weather_parameters_data " +
|
||||||
|
f"WHERE wp = {self._pamhyr_id} " +
|
||||||
|
f"AND scenario = {self._status.scenario_id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
reach = None
|
||||||
|
begin_section = None
|
||||||
|
end_section = None
|
||||||
|
|
||||||
|
if self._reach is not None:
|
||||||
|
reach = self._reach._pamhyr_id
|
||||||
|
begin_section = self._begin_section._pamhyr_id
|
||||||
|
end_section = self._end_section._pamhyr_id
|
||||||
|
|
||||||
|
execute(
|
||||||
|
"INSERT INTO " +
|
||||||
|
"weather_parameters(" +
|
||||||
|
"pamhyr_id, deleted, name, type, " +
|
||||||
|
"reach, begin_section, end_section, scenario) " +
|
||||||
|
"VALUES (" +
|
||||||
|
f"{self.id}, {self._db_format(self.is_deleted())}, " +
|
||||||
|
f"'{self._db_format(self._name)}', " +
|
||||||
|
f"'{self._db_format(self._type)}', {reach}, " +
|
||||||
|
f"{begin_section}, {end_section}, " +
|
||||||
|
f"{self._status.scenario_id}" +
|
||||||
|
")"
|
||||||
|
)
|
||||||
|
|
||||||
|
ind = 0
|
||||||
|
for d in self._data:
|
||||||
|
data["ind"] = ind
|
||||||
|
|
||||||
|
d._db_save(execute, data)
|
||||||
|
|
||||||
|
ind += 1
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _data_traversal(self,
|
||||||
|
predicate=lambda obj, data: True,
|
||||||
|
modifier=lambda obj, data: None,
|
||||||
|
data={}):
|
||||||
|
if predicate(self, data):
|
||||||
|
modifier(self, data)
|
||||||
|
|
||||||
|
for d in self._data:
|
||||||
|
d._data_traversal(predicate, modifier, data)
|
||||||
|
|
||||||
|
def __len__(self):
|
||||||
|
return len(
|
||||||
|
list(
|
||||||
|
filter(
|
||||||
|
lambda el: not el.is_deleted(),
|
||||||
|
self._data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def compatibility(cls):
|
||||||
|
return ["liquid", "solid", "suspenssion"]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def time_convert(cls, data):
|
||||||
|
if type(data) is str:
|
||||||
|
if data.count("-") == 2:
|
||||||
|
return date_iso_to_timestamp(data)
|
||||||
|
if data.count("/") == 2:
|
||||||
|
return date_dmy_to_timestamp(data)
|
||||||
|
if data.count(":") == 3:
|
||||||
|
return old_pamhyr_date_to_timestamp(data)
|
||||||
|
if data.count(":") == 2:
|
||||||
|
return old_pamhyr_date_to_timestamp("00:" + data)
|
||||||
|
if data.count(".") == 1:
|
||||||
|
return round(float(data))
|
||||||
|
|
||||||
|
return int(data)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def name(self):
|
||||||
|
if self._name == "":
|
||||||
|
return f"LC #{self.id}"
|
||||||
|
|
||||||
|
return self._name
|
||||||
|
|
||||||
|
@name.setter
|
||||||
|
def name(self, name):
|
||||||
|
self._name = name
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def type(self):
|
||||||
|
return self._type
|
||||||
|
|
||||||
|
@property
|
||||||
|
def reach(self):
|
||||||
|
return self._reach
|
||||||
|
|
||||||
|
@reach.setter
|
||||||
|
def reach(self, reach):
|
||||||
|
self._reach = reach
|
||||||
|
self._begin_section = None
|
||||||
|
self._end_section = None
|
||||||
|
|
||||||
|
if reach is not None:
|
||||||
|
profiles = reach.reach.profiles
|
||||||
|
if profiles:
|
||||||
|
self._begin_section = profiles[0]
|
||||||
|
self._end_section = profiles[-1]
|
||||||
|
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def has_reach(self):
|
||||||
|
return self._reach is not None
|
||||||
|
|
||||||
|
@property
|
||||||
|
def begin_rk(self):
|
||||||
|
if self._begin_section is None:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
return self._begin_section.rk
|
||||||
|
|
||||||
|
@property
|
||||||
|
def begin_section(self):
|
||||||
|
return self._begin_section
|
||||||
|
|
||||||
|
@begin_section.setter
|
||||||
|
def begin_section(self, section):
|
||||||
|
self._begin_section = section
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def end_rk(self):
|
||||||
|
if self._end_section is None:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
return self._end_section.rk
|
||||||
|
|
||||||
|
@property
|
||||||
|
def end_section(self):
|
||||||
|
return self._end_section
|
||||||
|
|
||||||
|
@end_section.setter
|
||||||
|
def end_section(self, section):
|
||||||
|
self._end_section = section
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def cloned_for(self, reach, begin_section, end_section):
|
||||||
|
new = type(self)(name=self._name, status=self._status)
|
||||||
|
new._reach = reach
|
||||||
|
new._begin_section = begin_section
|
||||||
|
new._end_section = end_section
|
||||||
|
new._data = [data.cloned() for data in self.data]
|
||||||
|
new.modified()
|
||||||
|
return new
|
||||||
|
|
||||||
|
@property
|
||||||
|
def header(self):
|
||||||
|
return self._header.copy()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def data(self):
|
||||||
|
return list(
|
||||||
|
filter(
|
||||||
|
lambda el: not el.is_deleted(),
|
||||||
|
self._data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_type_column(self, column):
|
||||||
|
if 0 <= column < 2:
|
||||||
|
return self._types[column]
|
||||||
|
return None
|
||||||
|
|
||||||
|
@property
|
||||||
|
def _default_0(self):
|
||||||
|
return self._types[0](0)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def _default_1(self):
|
||||||
|
return self._types[1](0.0)
|
||||||
|
|
||||||
|
def is_define(self):
|
||||||
|
return self._data is not None
|
||||||
|
|
||||||
|
def new_from_data(self, header, data):
|
||||||
|
new_0 = self._default_0
|
||||||
|
new_1 = self._default_1
|
||||||
|
|
||||||
|
def convert(column, value, default):
|
||||||
|
if value.strip() == "":
|
||||||
|
return default
|
||||||
|
return self._types[column](value.replace(",", "."))
|
||||||
|
|
||||||
|
if len(header) != 0:
|
||||||
|
for i in [0, 1]:
|
||||||
|
for j in range(len(header)):
|
||||||
|
if self._header[i] == header[j] and j < len(data):
|
||||||
|
if i == 0:
|
||||||
|
new_0 = convert(i, data[j], new_0)
|
||||||
|
else:
|
||||||
|
new_1 = convert(i, data[j], new_1)
|
||||||
|
else:
|
||||||
|
if len(data) > 0:
|
||||||
|
new_0 = convert(0, data[0], new_0)
|
||||||
|
if len(data) > 1:
|
||||||
|
new_1 = convert(1, data[1], new_1)
|
||||||
|
|
||||||
|
return Data(new_0, new_1, status=self._status)
|
||||||
|
|
||||||
|
def add(self, index: int):
|
||||||
|
value = Data(self._default_0, self._default_1, status=self._status)
|
||||||
|
self.insert(index, value)
|
||||||
|
return value
|
||||||
|
|
||||||
|
def insert(self, index: int, value):
|
||||||
|
visible_data = self.data
|
||||||
|
if index < len(visible_data):
|
||||||
|
index = self._data.index(visible_data[index])
|
||||||
|
else:
|
||||||
|
index = len(self._data)
|
||||||
|
self._data.insert(index, value)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def set_data_value(self, value, column, data):
|
||||||
|
value[column] = self._types[column](data)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def set_deleted(self, values, deleted):
|
||||||
|
for value in values:
|
||||||
|
if deleted:
|
||||||
|
value.set_as_deleted()
|
||||||
|
else:
|
||||||
|
value.set_as_not_deleted()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def reorder(self, values):
|
||||||
|
values = iter(values)
|
||||||
|
self._data = [
|
||||||
|
value if value.is_deleted() else next(values)
|
||||||
|
for value in self._data
|
||||||
|
]
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def delete_i(self, indexes):
|
||||||
|
self._data = list(
|
||||||
|
map(
|
||||||
|
lambda e: e[1],
|
||||||
|
filter(
|
||||||
|
lambda e: e[0] not in indexes,
|
||||||
|
enumerate(self.data)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def set_as_deleted_i(self, indexes):
|
||||||
|
for i in indexes:
|
||||||
|
self._data[i].set_as_deleted()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def set_as_not_deleted_i(self, indexes):
|
||||||
|
for i in indexes:
|
||||||
|
self._data[i].set_as_not_deleted()
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def delete(self, els):
|
||||||
|
self._data = list(
|
||||||
|
filter(
|
||||||
|
lambda e: e not in els,
|
||||||
|
self.data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def sort(self, _reverse=False, key=None):
|
||||||
|
if key is None:
|
||||||
|
self._data.sort(reverse=_reverse)
|
||||||
|
else:
|
||||||
|
self._data.sort(reverse=_reverse, key=key)
|
||||||
|
self.modified()
|
||||||
|
|
||||||
|
def get_i(self, index):
|
||||||
|
return self.data[index]
|
||||||
|
|
||||||
|
def get_range(self, _range):
|
||||||
|
lst = []
|
||||||
|
for r in _range:
|
||||||
|
lst.append(r)
|
||||||
|
return lst
|
||||||
|
|
||||||
|
def _set_i_c_v(self, index, column, value):
|
||||||
|
self.set_data_value(self.get_i(index), column, value)
|
||||||
|
|
||||||
|
def set_i_0(self, index: int, value):
|
||||||
|
self._set_i_c_v(index, 0, value)
|
||||||
|
|
||||||
|
def set_i_1(self, index: int, value):
|
||||||
|
self._set_i_c_v(index, 1, value)
|
||||||
|
|
||||||
|
@timer
|
||||||
|
def convert(self, cls):
|
||||||
|
new = cls(name=self.name, status=self._status)
|
||||||
|
new.reach = self.reach
|
||||||
|
new.begin_section = self.begin_section
|
||||||
|
new.end_section = self.end_section
|
||||||
|
|
||||||
|
for i, _ in enumerate(self.data):
|
||||||
|
new.add(i)
|
||||||
|
|
||||||
|
for i in [0, 1]:
|
||||||
|
for j in [0, 1]:
|
||||||
|
if self._header[i] == new.header[j]:
|
||||||
|
for ind, v in self.data:
|
||||||
|
try:
|
||||||
|
new._set_i_c_v(ind, j, v[i])
|
||||||
|
except Exception as e:
|
||||||
|
logger.info(e)
|
||||||
|
|
||||||
|
self.modified()
|
||||||
|
return new
|
||||||
|
|
||||||
|
def move_up(self, index):
|
||||||
|
if 0 < index < len(self):
|
||||||
|
data = self.data
|
||||||
|
data[index - 1], data[index] = data[index], data[index - 1]
|
||||||
|
self.reorder(data)
|
||||||
|
|
||||||
|
def move_down(self, index):
|
||||||
|
if 0 <= index < len(self) - 1:
|
||||||
|
data = self.data
|
||||||
|
data[index], data[index + 1] = data[index + 1], data[index]
|
||||||
|
self.reorder(data)
|
||||||
@@ -0,0 +1,234 @@
|
|||||||
|
# WeatherParametersList.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from copy import copy
|
||||||
|
from tools import trace, timer
|
||||||
|
|
||||||
|
from Model.Tools.PamhyrListExt import PamhyrModelList
|
||||||
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
|
||||||
|
from Model.WeatherParameters.WeatherParameters import (
|
||||||
|
WeatherParameters,
|
||||||
|
WeatherParametersDefault,
|
||||||
|
)
|
||||||
|
from Model.WeatherParameters.WeatherParametersTypes import (
|
||||||
|
NotDefined, WeatherParam, AirTemperature, SpecificHumidity,
|
||||||
|
GlobalRadiation, ReferenceWindSpeed, GroundwaterTemperature,
|
||||||
|
GroundwaterFlowRate, Albedo, ShadingCoefficient, CloudCoverFraction
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class WeatherParametersList(PamhyrModelList):
|
||||||
|
_sub_classes = [
|
||||||
|
WeatherParameters,
|
||||||
|
]
|
||||||
|
_default_types = [
|
||||||
|
"AT", "SH", "GR", "RWS", "GT", "GFR", "ALB", "SC", "CCF"
|
||||||
|
]
|
||||||
|
_default_values = {
|
||||||
|
"AT": 20.0,
|
||||||
|
"SH": 0.001,
|
||||||
|
"GR": 10.0,
|
||||||
|
"RWS": 1.0,
|
||||||
|
"GT": 0.0,
|
||||||
|
"GFR": 0.0,
|
||||||
|
"ALB": 0.06,
|
||||||
|
"SC": 0.15,
|
||||||
|
"CCF": 0.5,
|
||||||
|
}
|
||||||
|
|
||||||
|
def __init__(self, status=None):
|
||||||
|
super(WeatherParametersList, self).__init__(status=status)
|
||||||
|
self._default = []
|
||||||
|
self._init_missing_default_values()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _db_load(cls, execute, data=None):
|
||||||
|
new = cls(status=data['status'])
|
||||||
|
|
||||||
|
if data is None:
|
||||||
|
data = {}
|
||||||
|
|
||||||
|
new._lst = WeatherParameters._db_load(
|
||||||
|
execute, data
|
||||||
|
)
|
||||||
|
|
||||||
|
data['loaded_pid'] = set()
|
||||||
|
new._default = WeatherParametersDefault._db_load(
|
||||||
|
execute, data
|
||||||
|
)
|
||||||
|
new._init_missing_default_values()
|
||||||
|
new._sort_default_values()
|
||||||
|
|
||||||
|
return new
|
||||||
|
|
||||||
|
def _db_save(self, execute, data=None):
|
||||||
|
execute(
|
||||||
|
"DELETE FROM weather_parameters " +
|
||||||
|
f"WHERE scenario = {self._status.scenario_id}"
|
||||||
|
)
|
||||||
|
execute(
|
||||||
|
"DELETE FROM weather_parameters_data " +
|
||||||
|
f"WHERE scenario = {self._status.scenario_id}"
|
||||||
|
)
|
||||||
|
execute(
|
||||||
|
"DELETE FROM weather_parameters_default " +
|
||||||
|
f"WHERE scenario = {self._status.scenario_id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
if data is None:
|
||||||
|
data = {}
|
||||||
|
|
||||||
|
for wp in self._lst:
|
||||||
|
wp._db_save(execute, data=data)
|
||||||
|
|
||||||
|
for wp_default in self._default:
|
||||||
|
wp_default._db_save(execute, data=data)
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _data_traversal(self,
|
||||||
|
predicate=lambda obj, data: True,
|
||||||
|
modifier=lambda obj, data: None,
|
||||||
|
data={}):
|
||||||
|
if predicate(self, data):
|
||||||
|
modifier(self, data)
|
||||||
|
|
||||||
|
for el in self._lst:
|
||||||
|
el._data_traversal(predicate, modifier, data)
|
||||||
|
|
||||||
|
for el in self._default:
|
||||||
|
el._data_traversal(predicate, modifier, data)
|
||||||
|
|
||||||
|
def _init_missing_default_values(self):
|
||||||
|
existing = [wp_default.type for wp_default in self.default]
|
||||||
|
for type in self._default_types:
|
||||||
|
if type not in existing:
|
||||||
|
self._default.append(
|
||||||
|
WeatherParametersDefault(
|
||||||
|
type=type,
|
||||||
|
value=self._default_values[type],
|
||||||
|
status=self._status,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self._sort_default_values()
|
||||||
|
|
||||||
|
def _sort_default_values(self):
|
||||||
|
self._default.sort(
|
||||||
|
key=lambda wp_default: self._default_types.index(wp_default.type)
|
||||||
|
if wp_default.type in self._default_types
|
||||||
|
else len(self._default_types)
|
||||||
|
)
|
||||||
|
|
||||||
|
def new(self, index, type="ND"):
|
||||||
|
if type == "AT":
|
||||||
|
n = AirTemperature(status=self._status)
|
||||||
|
elif type == "SH":
|
||||||
|
n = SpecificHumidity(status=self._status)
|
||||||
|
elif type == "GR":
|
||||||
|
n = GlobalRadiation(status=self._status)
|
||||||
|
elif type == "RWS":
|
||||||
|
n = ReferenceWindSpeed(status=self._status)
|
||||||
|
elif type == "GT":
|
||||||
|
n = GroundwaterTemperature(status=self._status)
|
||||||
|
elif type == "GFR":
|
||||||
|
n = GroundwaterFlowRate(status=self._status)
|
||||||
|
elif type == "ALB":
|
||||||
|
n = Albedo(status=self._status)
|
||||||
|
elif type == "SC":
|
||||||
|
n = ShadingCoefficient(status=self._status)
|
||||||
|
elif type == "CCF":
|
||||||
|
n = CloudCoverFraction(status=self._status)
|
||||||
|
else:
|
||||||
|
n = NotDefined(status=self._status)
|
||||||
|
self._lst.insert(index, n)
|
||||||
|
self._status.modified()
|
||||||
|
return n
|
||||||
|
|
||||||
|
def split_reach(self, reach, profile, reach1, reach2):
|
||||||
|
profiles = reach.reach.profiles
|
||||||
|
split_index = profiles.index(profile)
|
||||||
|
parts = [
|
||||||
|
(
|
||||||
|
reach1,
|
||||||
|
0,
|
||||||
|
split_index,
|
||||||
|
dict(zip(
|
||||||
|
profiles[:split_index + 1],
|
||||||
|
reach1.reach.profiles
|
||||||
|
))
|
||||||
|
),
|
||||||
|
(
|
||||||
|
reach2,
|
||||||
|
split_index,
|
||||||
|
len(profiles) - 1,
|
||||||
|
dict(zip(
|
||||||
|
profiles[split_index:],
|
||||||
|
reach2.reach.profiles
|
||||||
|
))
|
||||||
|
),
|
||||||
|
]
|
||||||
|
weather_parameters = [
|
||||||
|
weather_parameter
|
||||||
|
for weather_parameter in self.lst
|
||||||
|
if weather_parameter.reach is reach
|
||||||
|
]
|
||||||
|
clones = []
|
||||||
|
|
||||||
|
for weather_parameter in weather_parameters:
|
||||||
|
if (weather_parameter.begin_section not in profiles or
|
||||||
|
weather_parameter.end_section not in profiles):
|
||||||
|
continue
|
||||||
|
|
||||||
|
begin = profiles.index(weather_parameter.begin_section)
|
||||||
|
end = profiles.index(weather_parameter.end_section)
|
||||||
|
lower, upper = sorted((begin, end))
|
||||||
|
reverse = begin > end
|
||||||
|
|
||||||
|
for new_reach, part_lower, part_upper, sections in parts:
|
||||||
|
clipped_lower = max(lower, part_lower)
|
||||||
|
clipped_upper = min(upper, part_upper)
|
||||||
|
if clipped_lower >= clipped_upper:
|
||||||
|
continue
|
||||||
|
|
||||||
|
begin_index = clipped_upper if reverse else clipped_lower
|
||||||
|
end_index = clipped_lower if reverse else clipped_upper
|
||||||
|
clones.append(weather_parameter.cloned_for(
|
||||||
|
new_reach,
|
||||||
|
sections[profiles[begin_index]],
|
||||||
|
sections[profiles[end_index]]
|
||||||
|
))
|
||||||
|
|
||||||
|
if clones:
|
||||||
|
self._lst.extend(clones)
|
||||||
|
self._status.modified()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def Weather_Parameters_List(self):
|
||||||
|
return self.lst
|
||||||
|
|
||||||
|
@property
|
||||||
|
def default(self):
|
||||||
|
return self._default.copy()
|
||||||
|
|
||||||
|
def default_for_type(self, type):
|
||||||
|
for wp_default in self.default:
|
||||||
|
if wp_default.type == type:
|
||||||
|
return wp_default
|
||||||
|
return None
|
||||||
@@ -0,0 +1,171 @@
|
|||||||
|
# LateralContributionTypes.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
|
||||||
|
from Model.WeatherParameters.WeatherParameters import WeatherParameters
|
||||||
|
|
||||||
|
|
||||||
|
class NotDefined(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(NotDefined, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "ND"
|
||||||
|
self._header = ["x", "y"]
|
||||||
|
|
||||||
|
@property
|
||||||
|
def _default_0(self):
|
||||||
|
return 0.0
|
||||||
|
|
||||||
|
|
||||||
|
class WeatherParam(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(WeatherParam, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "WP"
|
||||||
|
self._header = ["time", "value"]
|
||||||
|
self._types = [WeatherParam.time_convert, float]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def compatibility(cls):
|
||||||
|
return ["liquid"]
|
||||||
|
|
||||||
|
|
||||||
|
class AirTemperature(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(AirTemperature, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "AT"
|
||||||
|
self._header = ["time", "temperature"]
|
||||||
|
self._types = [AirTemperature.time_convert, float]
|
||||||
|
|
||||||
|
|
||||||
|
class SpecificHumidity(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(SpecificHumidity, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "SH"
|
||||||
|
self._header = ["time", "humidity"]
|
||||||
|
self._types = [SpecificHumidity.time_convert, float]
|
||||||
|
|
||||||
|
|
||||||
|
class GlobalRadiation(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(GlobalRadiation, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "GR"
|
||||||
|
self._header = ["time", "radiation"]
|
||||||
|
self._types = [GlobalRadiation.time_convert, float]
|
||||||
|
|
||||||
|
|
||||||
|
class ReferenceWindSpeed(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(ReferenceWindSpeed, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "RWS"
|
||||||
|
self._header = ["time", "wind speed"]
|
||||||
|
self._types = [ReferenceWindSpeed.time_convert, float]
|
||||||
|
|
||||||
|
|
||||||
|
class GroundwaterTemperature(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(GroundwaterTemperature, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "GT"
|
||||||
|
self._header = ["time", "temperature"]
|
||||||
|
self._types = [GroundwaterTemperature.time_convert, float]
|
||||||
|
|
||||||
|
|
||||||
|
class GroundwaterFlowRate(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(GroundwaterFlowRate, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "GFR"
|
||||||
|
self._header = ["time", "discharge"]
|
||||||
|
self._types = [GroundwaterFlowRate.time_convert, float]
|
||||||
|
|
||||||
|
|
||||||
|
class Albedo(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(Albedo, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "ALB"
|
||||||
|
self._header = ["time", "albedo"]
|
||||||
|
self._types = [Albedo.time_convert, float]
|
||||||
|
|
||||||
|
|
||||||
|
class ShadingCoefficient(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(ShadingCoefficient, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "SC"
|
||||||
|
self._header = ["time", "shading coefficient"]
|
||||||
|
self._types = [ShadingCoefficient.time_convert, float]
|
||||||
|
|
||||||
|
|
||||||
|
class CloudCoverFraction(WeatherParameters):
|
||||||
|
def __init__(self, id: int = -1, name: str = "",
|
||||||
|
status=None, owner_scenario=-1):
|
||||||
|
super(CloudCoverFraction, self).__init__(
|
||||||
|
id=id, name=name, status=status,
|
||||||
|
owner_scenario=owner_scenario
|
||||||
|
)
|
||||||
|
|
||||||
|
self._type = "CCF"
|
||||||
|
self._header = ["time", "cloud cover fraction"]
|
||||||
|
self._types = [CloudCoverFraction.time_convert, float]
|
||||||
@@ -23,6 +23,8 @@ import tempfile
|
|||||||
from Model.Status import StudyStatus
|
from Model.Status import StudyStatus
|
||||||
from Model.Study import Study
|
from Model.Study import Study
|
||||||
from Model.River import River
|
from Model.River import River
|
||||||
|
from Model.LateralContribution.LateralContributionTypes import LateralContrib
|
||||||
|
from Model.HydraulicStructures.Basic.Types import DischargeWeir
|
||||||
|
|
||||||
|
|
||||||
class StudyTestCase(unittest.TestCase):
|
class StudyTestCase(unittest.TestCase):
|
||||||
@@ -62,6 +64,31 @@ class StudyTestCase(unittest.TestCase):
|
|||||||
study = Study.new("foo", "bar")
|
study = Study.new("foo", "bar")
|
||||||
self.assertNotEqual(study.river, None)
|
self.assertNotEqual(study.river, None)
|
||||||
|
|
||||||
|
def test_save_open_study_weather_parameters_default(self):
|
||||||
|
study = Study.new("foo", "bar")
|
||||||
|
defaults = study.river.weather_parameters.default
|
||||||
|
|
||||||
|
self.assertEqual(len(defaults), 9)
|
||||||
|
self.assertEqual(
|
||||||
|
[default.value for default in defaults],
|
||||||
|
[20.0, 0.001, 10.0, 1.0, 0.0, 0.0, 0.06, 0.15, 0.5]
|
||||||
|
)
|
||||||
|
defaults[0].value = 12.5
|
||||||
|
|
||||||
|
dir = tempfile.mkdtemp()
|
||||||
|
f = os.path.join(dir, "foo.pamhyr")
|
||||||
|
|
||||||
|
study.filename = f
|
||||||
|
study.save()
|
||||||
|
study.close()
|
||||||
|
|
||||||
|
study = Study.open(f)
|
||||||
|
defaults = study.river.weather_parameters.default
|
||||||
|
|
||||||
|
self.assertEqual(len(defaults), 9)
|
||||||
|
self.assertEqual(defaults[0].type, "AT")
|
||||||
|
self.assertEqual(defaults[0].value, 12.5)
|
||||||
|
|
||||||
|
|
||||||
class StudyScenarioTestCase(unittest.TestCase):
|
class StudyScenarioTestCase(unittest.TestCase):
|
||||||
def test_create_study(self):
|
def test_create_study(self):
|
||||||
@@ -262,3 +289,89 @@ class RiverTestCase(unittest.TestCase):
|
|||||||
edges = river.edges()
|
edges = river.edges()
|
||||||
self.assertEqual(edges[0], e0)
|
self.assertEqual(edges[0], e0)
|
||||||
self.assertEqual(edges[1], e1)
|
self.assertEqual(edges[1], e1)
|
||||||
|
|
||||||
|
def test_split_reach_splits_initial_conditions(self):
|
||||||
|
status = StudyStatus()
|
||||||
|
river = River(status=status)
|
||||||
|
node1 = river.add_node()
|
||||||
|
node2 = river.add_node(x=40.0)
|
||||||
|
reach = river.add_edge(node1, node2)
|
||||||
|
|
||||||
|
profiles = []
|
||||||
|
for index in range(5):
|
||||||
|
profile = reach.reach.insert(index)
|
||||||
|
profile.rk = index * 10.0
|
||||||
|
profile.insert(0)
|
||||||
|
profiles.append(profile)
|
||||||
|
|
||||||
|
initial_conditions = river.initial_conditions.get(reach)
|
||||||
|
for index, profile in enumerate(profiles):
|
||||||
|
data = initial_conditions.new_from_data(
|
||||||
|
profile.rk,
|
||||||
|
discharge=100.0 + index,
|
||||||
|
elevation=10.0 + index,
|
||||||
|
)
|
||||||
|
initial_conditions.insert(index, data)
|
||||||
|
|
||||||
|
reach1, reach2 = river._split_reach(reach, profiles[2])
|
||||||
|
conditions1 = river.initial_conditions.get(reach1).data
|
||||||
|
conditions2 = river.initial_conditions.get(reach2).data
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
[data["discharge"] for data in conditions1],
|
||||||
|
[100.0, 101.0, 102.0]
|
||||||
|
)
|
||||||
|
self.assertEqual(
|
||||||
|
[data["discharge"] for data in conditions2],
|
||||||
|
[102.0, 103.0, 104.0]
|
||||||
|
)
|
||||||
|
self.assertEqual(
|
||||||
|
[data["section"] for data in conditions1],
|
||||||
|
reach1.reach.profiles
|
||||||
|
)
|
||||||
|
self.assertEqual(
|
||||||
|
[data["section"] for data in conditions2],
|
||||||
|
reach2.reach.profiles
|
||||||
|
)
|
||||||
|
self.assertTrue(all(
|
||||||
|
data._reach is reach1 for data in conditions1
|
||||||
|
))
|
||||||
|
self.assertTrue(all(
|
||||||
|
data._reach is reach2 for data in conditions2
|
||||||
|
))
|
||||||
|
|
||||||
|
def test_split_reach_keeps_partial_initial_conditions_in_scope(self):
|
||||||
|
status = StudyStatus()
|
||||||
|
river = River(status=status)
|
||||||
|
node1 = river.add_node()
|
||||||
|
node2 = river.add_node(x=40.0)
|
||||||
|
reach = river.add_edge(node1, node2)
|
||||||
|
|
||||||
|
profiles = []
|
||||||
|
for index in range(5):
|
||||||
|
profile = reach.reach.insert(index)
|
||||||
|
profile.rk = index * 10.0
|
||||||
|
profile.insert(0)
|
||||||
|
profiles.append(profile)
|
||||||
|
|
||||||
|
initial_conditions = river.initial_conditions.get(reach)
|
||||||
|
for index in (1, 3):
|
||||||
|
data = initial_conditions.new_from_data(
|
||||||
|
profiles[index].rk,
|
||||||
|
discharge=100.0 + index,
|
||||||
|
elevation=10.0 + index,
|
||||||
|
)
|
||||||
|
initial_conditions.insert(len(initial_conditions.data), data)
|
||||||
|
|
||||||
|
reach1, reach2 = river._split_reach(reach, profiles[2])
|
||||||
|
|
||||||
|
self.assertEqual(
|
||||||
|
[data["discharge"]
|
||||||
|
for data in river.initial_conditions.get(reach1).data],
|
||||||
|
[101.0]
|
||||||
|
)
|
||||||
|
self.assertEqual(
|
||||||
|
[data["discharge"]
|
||||||
|
for data in river.initial_conditions.get(reach2).data],
|
||||||
|
[103.0]
|
||||||
|
)
|
||||||
@@ -55,7 +55,6 @@ class Modules(IterableFlag):
|
|||||||
RESERVOIR = auto()
|
RESERVOIR = auto()
|
||||||
SEDIMENT_LAYER = auto()
|
SEDIMENT_LAYER = auto()
|
||||||
ADDITIONAL_FILES = auto()
|
ADDITIONAL_FILES = auto()
|
||||||
OUTPUT_RK = auto()
|
|
||||||
GEOTIFF = auto()
|
GEOTIFF = auto()
|
||||||
|
|
||||||
# Results
|
# Results
|
||||||
@@ -81,7 +80,6 @@ class Modules(IterableFlag):
|
|||||||
cls.ADDITIONAL_FILES,
|
cls.ADDITIONAL_FILES,
|
||||||
cls.RESULTS,
|
cls.RESULTS,
|
||||||
cls.WINDOW_LIST,
|
cls.WINDOW_LIST,
|
||||||
cls.OUTPUT_RK,
|
|
||||||
cls.GEOTIFF
|
cls.GEOTIFF
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -75,7 +75,8 @@ class ScriptRun(AScript):
|
|||||||
os.path.dirname(study.filename),
|
os.path.dirname(study.filename),
|
||||||
"_PAMHYR_",
|
"_PAMHYR_",
|
||||||
study.name.replace(" ", "_"),
|
study.name.replace(" ", "_"),
|
||||||
solver.name.replace(" ", "_")
|
solver.name.replace(" ", "_"),
|
||||||
|
study.status.scenario.workdir(),
|
||||||
)
|
)
|
||||||
os.makedirs(workdir, exist_ok=True)
|
os.makedirs(workdir, exist_ok=True)
|
||||||
logger.info(f"Set working dir to {workdir}")
|
logger.info(f"Set working dir to {workdir}")
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ class AbstractSolver(object):
|
|||||||
def default_parameters(cls):
|
def default_parameters(cls):
|
||||||
lst = [
|
lst = [
|
||||||
("all_init_time", "000:00:00:00"),
|
("all_init_time", "000:00:00:00"),
|
||||||
("all_final_time", "999:99:00:00"),
|
("all_final_time", "10:00:00:00"),
|
||||||
("all_timestep", "300.0"),
|
("all_timestep", "300.0"),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
+83
-60
@@ -35,10 +35,6 @@ from Solver.CommandLine import CommandLineSolver
|
|||||||
from Model.Results.ResultsAdisTS import Results
|
from Model.Results.ResultsAdisTS import Results
|
||||||
from Model.Results.River.River import River, Reach, Profile
|
from Model.Results.River.River import River, Reach, Profile
|
||||||
|
|
||||||
from Checker.Adists import (
|
|
||||||
AdistsOutputRKChecker,
|
|
||||||
)
|
|
||||||
|
|
||||||
from itertools import chain
|
from itertools import chain
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
@@ -90,11 +86,7 @@ class AdisTS(CommandLineSolver):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def checkers(cls):
|
def checkers(cls):
|
||||||
lst = [
|
return []
|
||||||
AdistsOutputRKChecker(),
|
|
||||||
]
|
|
||||||
|
|
||||||
return lst
|
|
||||||
|
|
||||||
##########
|
##########
|
||||||
# Export #
|
# Export #
|
||||||
@@ -117,9 +109,6 @@ class AdisTS(CommandLineSolver):
|
|||||||
_nodes_names = {}
|
_nodes_names = {}
|
||||||
_nodes_views = set()
|
_nodes_views = set()
|
||||||
|
|
||||||
def get_reach_name(self, reach):
|
|
||||||
return f"Reach_{reach.pamhyr_id:>3}".replace(" ", "0")
|
|
||||||
|
|
||||||
def get_node_name(self, node):
|
def get_node_name(self, node):
|
||||||
"""Generate a 3 char name for node
|
"""Generate a 3 char name for node
|
||||||
|
|
||||||
@@ -182,7 +171,7 @@ class AdisTS(CommandLineSolver):
|
|||||||
# Write header
|
# Write header
|
||||||
edges = study.river.enable_edges()
|
edges = study.river.enable_edges()
|
||||||
for edge in edges:
|
for edge in edges:
|
||||||
name = f"Reach_{edge.id + 1:>3}".replace(" ", "0")
|
name = self.get_reach_name(edge)
|
||||||
|
|
||||||
with adists_file_open(
|
with adists_file_open(
|
||||||
os.path.join(repertory, "net", f"{name}.ST"),
|
os.path.join(repertory, "net", f"{name}.ST"),
|
||||||
@@ -191,7 +180,7 @@ class AdisTS(CommandLineSolver):
|
|||||||
files.append(str(os.path.join("net", f"{name}.ST")))
|
files.append(str(os.path.join("net", f"{name}.ST")))
|
||||||
|
|
||||||
cnt_num = 1
|
cnt_num = 1
|
||||||
for profile in edge.reach.profiles:
|
for profile in edge.reach.enabled_profiles:
|
||||||
self._export_ST_profile_header(
|
self._export_ST_profile_header(
|
||||||
f, files, profile, cnt_num
|
f, files, profile, cnt_num
|
||||||
)
|
)
|
||||||
@@ -277,7 +266,7 @@ class AdisTS(CommandLineSolver):
|
|||||||
edges = study.river.enable_edges()
|
edges = study.river.enable_edges()
|
||||||
|
|
||||||
for e in edges:
|
for e in edges:
|
||||||
name = f"Reach_{e.id + 1:>3}".replace(" ", "0")
|
name = self.get_reach_name(e)
|
||||||
id = name
|
id = name
|
||||||
|
|
||||||
n1 = f"{self.get_node_name(e.node1):3}".replace(" ", "x")
|
n1 = f"{self.get_node_name(e.node1):3}".replace(" ", "x")
|
||||||
@@ -346,7 +335,7 @@ class AdisTS(CommandLineSolver):
|
|||||||
|
|
||||||
return coeff.minor, coeff.medium
|
return coeff.minor, coeff.medium
|
||||||
|
|
||||||
for j, profile in enumerate(edge.reach.profiles):
|
for j, profile in enumerate(edge.reach.enabled_profiles):
|
||||||
coef_min, coef_moy = get_stricklers_from_rk(profile.rk,
|
coef_min, coef_moy = get_stricklers_from_rk(profile.rk,
|
||||||
lst)
|
lst)
|
||||||
f.write(
|
f.write(
|
||||||
@@ -366,13 +355,19 @@ class AdisTS(CommandLineSolver):
|
|||||||
if qlog is not None:
|
if qlog is not None:
|
||||||
qlog.put("Export REP file")
|
qlog.put("Export REP file")
|
||||||
|
|
||||||
|
mage_path = (mage_rep if os.path.isabs(mage_rep) else os.path.join(
|
||||||
|
os.path.abspath(os.path.join(repertory, os.pardir)),
|
||||||
|
mage_rep,
|
||||||
|
))
|
||||||
|
relative_mage_path = os.path.relpath(mage_path, repertory)
|
||||||
|
|
||||||
# Write header
|
# Write header
|
||||||
with adists_file_open(
|
with adists_file_open(
|
||||||
os.path.join(
|
os.path.join(
|
||||||
repertory, f"{name}.REP"
|
repertory, f"{name}.REP"
|
||||||
), "w+"
|
), "w+"
|
||||||
) as f:
|
) as f:
|
||||||
path = os.path.join("..", mage_rep, name)
|
path = os.path.join(relative_mage_path, name)
|
||||||
f.write(f"NET {name}.NET\n")
|
f.write(f"NET {name}.NET\n")
|
||||||
f.write(f"REP {path}.REP\n")
|
f.write(f"REP {path}.REP\n")
|
||||||
|
|
||||||
@@ -387,9 +382,7 @@ class AdisTS(CommandLineSolver):
|
|||||||
|
|
||||||
# fake mage_fin.ini:
|
# fake mage_fin.ini:
|
||||||
|
|
||||||
path_mage = os.path.join(os.path.abspath(
|
self._export_fake_INI(study, mage_path,
|
||||||
os.path.join(repertory, os.pardir)), mage_rep)
|
|
||||||
self._export_fake_INI(study, path_mage,
|
|
||||||
qlog, name=name)
|
qlog, name=name)
|
||||||
|
|
||||||
# path_mage_net = os.path.join(os.path.abspath(
|
# path_mage_net = os.path.join(os.path.abspath(
|
||||||
@@ -415,6 +408,41 @@ class AdisTS(CommandLineSolver):
|
|||||||
# RESULTS #
|
# RESULTS #
|
||||||
###########
|
###########
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _remove_temperature_results(repertory):
|
||||||
|
"""Remove temperature outputs generated but unused by AdisTS."""
|
||||||
|
results_directory = os.path.join(repertory, "resultats")
|
||||||
|
if not os.path.isdir(results_directory):
|
||||||
|
results_directory = repertory
|
||||||
|
|
||||||
|
if not os.path.isdir(results_directory):
|
||||||
|
return
|
||||||
|
|
||||||
|
for filename in os.listdir(results_directory):
|
||||||
|
if not (filename.startswith("TEM.") or
|
||||||
|
filename.startswith("TEM_")):
|
||||||
|
continue
|
||||||
|
|
||||||
|
filepath = os.path.join(results_directory, filename)
|
||||||
|
if os.path.isfile(filepath):
|
||||||
|
try:
|
||||||
|
os.remove(filepath)
|
||||||
|
logger.debug(
|
||||||
|
f"Removed unused AdisTS result '{filepath}'"
|
||||||
|
)
|
||||||
|
except OSError as error:
|
||||||
|
logger.warning(
|
||||||
|
f"Unable to remove AdisTS result '{filepath}': "
|
||||||
|
f"{error}"
|
||||||
|
)
|
||||||
|
|
||||||
|
def run_output_data_fomater(self, study):
|
||||||
|
# AdisTS generates temperature results that are not used by the solver,
|
||||||
|
# but they are still present in the output directory.
|
||||||
|
# Remove them to avoid confusion.
|
||||||
|
self._remove_temperature_results(self._process.workingDirectory())
|
||||||
|
return super(AdisTS, self).run_output_data_fomater(study)
|
||||||
|
|
||||||
def read_bin(self, study, repertory, results, qlog=None, name="0"):
|
def read_bin(self, study, repertory, results, qlog=None, name="0"):
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -453,7 +481,8 @@ class AdisTS(CommandLineSolver):
|
|||||||
_nodes_views = set()
|
_nodes_views = set()
|
||||||
|
|
||||||
def get_reach_name(self, reach):
|
def get_reach_name(self, reach):
|
||||||
return f"Reach_{reach.pamhyr_id:>3}".replace(" ", "0")
|
index = self._study.river.get_edge_id(reach) + 1
|
||||||
|
return f"Reach_{index:03d}"
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
# Adis-TS in weak coupling mode #
|
# Adis-TS in weak coupling mode #
|
||||||
@@ -507,12 +536,13 @@ class AdisTSwc(AdisTS):
|
|||||||
study, pollutant._data, f, qlog
|
study, pollutant._data, f, qlog
|
||||||
)
|
)
|
||||||
|
|
||||||
POL_ICs = next(filter(
|
POL_ICs = next((
|
||||||
lambda ic: ic.pollutant == pollutant.id,
|
ic for ic in
|
||||||
study.river.ic_adists.Initial_Conditions_List
|
study.river.ic_adists.Initial_Conditions_List
|
||||||
))
|
if ic.pollutant == pollutant.id
|
||||||
|
), None)
|
||||||
|
|
||||||
if POL_ICs.concentration is not None:
|
if POL_ICs is not None and POL_ICs.concentration is not None:
|
||||||
f.write(f"file_ini = {name}.INI\n")
|
f.write(f"file_ini = {name}.INI\n")
|
||||||
self._export_ICs_AdisTS(
|
self._export_ICs_AdisTS(
|
||||||
study, repertory, POL_ICs, qlog, name
|
study, repertory, POL_ICs, qlog, name
|
||||||
@@ -552,15 +582,18 @@ class AdisTSwc(AdisTS):
|
|||||||
os.path.join(repertory, f"{POL_name}.ALD"), "w+"
|
os.path.join(repertory, f"{POL_name}.ALD"), "w+"
|
||||||
) as f:
|
) as f:
|
||||||
for LC in POL_LC:
|
for LC in POL_LC:
|
||||||
reach = next(filter(
|
reach = next((
|
||||||
lambda edge: edge.id == LC.edge, study.river.enable_edges()
|
edge for edge in study.river.enable_edges()
|
||||||
)) # .name
|
if edge.id == LC.reach
|
||||||
|
), None)
|
||||||
|
if reach is None:
|
||||||
|
continue
|
||||||
reach_name = self.get_reach_name(reach)
|
reach_name = self.get_reach_name(reach)
|
||||||
f.write(f"${reach_name} {LC.begin_rk} {LC.end_rk}\n")
|
f.write(f"${reach_name} {LC.begin_rk} {LC.end_rk}\n")
|
||||||
f.write(f"*temps |débit massique (kg/s)\n")
|
f.write(f"*temps |débit massique (kg/s)\n")
|
||||||
f.write(f"*---------++++++++++\n")
|
f.write(f"*---------++++++++++\n")
|
||||||
|
|
||||||
for LC_data in LC._data:
|
for LC_data in LC.data:
|
||||||
tmp = timestamp_to_old_pamhyr_date_adists(int(LC_data[0]))
|
tmp = timestamp_to_old_pamhyr_date_adists(int(LC_data[0]))
|
||||||
f.write(" ".join((f"{tmp}",
|
f.write(" ".join((f"{tmp}",
|
||||||
f"{LC_data[1]}\n")))
|
f"{LC_data[1]}\n")))
|
||||||
@@ -577,9 +610,10 @@ class AdisTSwc(AdisTS):
|
|||||||
repertory, f"{POL_name}.CDT"), "w+"
|
repertory, f"{POL_name}.CDT"), "w+"
|
||||||
) as f:
|
) as f:
|
||||||
for BC in POL_BC:
|
for BC in POL_BC:
|
||||||
node = next(filter(
|
node = next((node for node in study.river.nodes()
|
||||||
lambda x: x.id == BC.node, study.river._nodes
|
if node.id == BC.node), None)
|
||||||
))
|
if node is None:
|
||||||
|
continue
|
||||||
f.write(f"${self.get_node_name(node)}\n")
|
f.write(f"${self.get_node_name(node)}\n")
|
||||||
|
|
||||||
if BC.type == "Concentration":
|
if BC.type == "Concentration":
|
||||||
@@ -591,7 +625,7 @@ class AdisTSwc(AdisTS):
|
|||||||
f.write(f"*JJ:HH:MM | (kg/s)\n")
|
f.write(f"*JJ:HH:MM | (kg/s)\n")
|
||||||
f.write(f"*---------++++++++++\n")
|
f.write(f"*---------++++++++++\n")
|
||||||
|
|
||||||
for BC_data in BC._data:
|
for BC_data in BC.data:
|
||||||
tmp = timestamp_to_old_pamhyr_date_adists(int(BC_data[0]))
|
tmp = timestamp_to_old_pamhyr_date_adists(int(BC_data[0]))
|
||||||
f.write(" ".join((f"{tmp}",
|
f.write(" ".join((f"{tmp}",
|
||||||
f"{BC_data[1]}\n")))
|
f"{BC_data[1]}\n")))
|
||||||
@@ -625,6 +659,9 @@ class AdisTSwc(AdisTS):
|
|||||||
|
|
||||||
edges = study.river.enable_edges()
|
edges = study.river.enable_edges()
|
||||||
for ic_spec in pol_ics_spec_data:
|
for ic_spec in pol_ics_spec_data:
|
||||||
|
if ic_spec.is_deleted():
|
||||||
|
continue
|
||||||
|
|
||||||
id_reach = ic_spec.reach
|
id_reach = ic_spec.reach
|
||||||
reach = next((x for x in edges if x.id == id_reach), None)
|
reach = next((x for x in edges if x.id == id_reach), None)
|
||||||
if reach is None:
|
if reach is None:
|
||||||
@@ -648,7 +685,9 @@ class AdisTSwc(AdisTS):
|
|||||||
list_characteristics = ["type", "diametre", "rho", "porosity",
|
list_characteristics = ["type", "diametre", "rho", "porosity",
|
||||||
"cdc_riv", "cdc_cas", "apd", "ac", "bc"]
|
"cdc_riv", "cdc_cas", "apd", "ac", "bc"]
|
||||||
|
|
||||||
if len(list_characteristics) <= (len(pol_data[0])):
|
pol_data = [data for data in pol_data if not data.is_deleted()]
|
||||||
|
|
||||||
|
if pol_data and len(list_characteristics) <= len(pol_data[0]):
|
||||||
for i in range(len(list_characteristics)):
|
for i in range(len(list_characteristics)):
|
||||||
f.write(f"{list_characteristics[i]} = {pol_data[0][i]}\n")
|
f.write(f"{list_characteristics[i]} = {pol_data[0][i]}\n")
|
||||||
|
|
||||||
@@ -677,6 +716,9 @@ class AdisTSwc(AdisTS):
|
|||||||
def _export_d90_spec(self, study, d90_spec_data, f, qlog, name="0"):
|
def _export_d90_spec(self, study, d90_spec_data, f, qlog, name="0"):
|
||||||
|
|
||||||
for d90_spec in d90_spec_data:
|
for d90_spec in d90_spec_data:
|
||||||
|
if d90_spec.is_deleted():
|
||||||
|
continue
|
||||||
|
|
||||||
if (d90_spec.name is None
|
if (d90_spec.name is None
|
||||||
or d90_spec.reach is None
|
or d90_spec.reach is None
|
||||||
or d90_spec.start_rk is None
|
or d90_spec.start_rk is None
|
||||||
@@ -736,6 +778,9 @@ class AdisTSwc(AdisTS):
|
|||||||
def _export_dif_spec(self, study, dif_spec_data, f, qlog, name="0"):
|
def _export_dif_spec(self, study, dif_spec_data, f, qlog, name="0"):
|
||||||
|
|
||||||
for dif_spec in dif_spec_data:
|
for dif_spec in dif_spec_data:
|
||||||
|
if dif_spec.is_deleted():
|
||||||
|
continue
|
||||||
|
|
||||||
if (dif_spec.reach is None
|
if (dif_spec.reach is None
|
||||||
or dif_spec.start_rk is None
|
or dif_spec.start_rk is None
|
||||||
or dif_spec.end_rk is None
|
or dif_spec.end_rk is None
|
||||||
@@ -803,33 +848,8 @@ class AdisTSwc(AdisTS):
|
|||||||
if name != "command_line_arguments":
|
if name != "command_line_arguments":
|
||||||
f.write(f"{dict_names[name]} = {value}\n")
|
f.write(f"{dict_names[name]} = {value}\n")
|
||||||
|
|
||||||
outputrks = study.river.Output_rk_adists.OutputRK_List
|
|
||||||
|
|
||||||
for outputrk in outputrks:
|
|
||||||
self._export_outputrk(study, outputrk, f, qlog)
|
|
||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
def _export_outputrk(self, study, outputrk, f, qlog, name="0"):
|
|
||||||
if (outputrk.reach is None
|
|
||||||
or outputrk.rk is None
|
|
||||||
or outputrk.title is None):
|
|
||||||
return
|
|
||||||
|
|
||||||
edges = study.river.enable_edges()
|
|
||||||
|
|
||||||
id_edges = list(map(lambda x: x.id, edges))
|
|
||||||
|
|
||||||
id_reach = outputrk.reach
|
|
||||||
reach = next((x for x in edges if x.id == id_reach), None)
|
|
||||||
rk = outputrk.rk
|
|
||||||
title = outputrk.title
|
|
||||||
|
|
||||||
if reach is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
f.write(f"output = {study.river.get_edge_id(reach)+1} {rk} {title}\n")
|
|
||||||
|
|
||||||
@timer
|
@timer
|
||||||
def read_bin(self, study, repertory, results, qlog=None, name="0"):
|
def read_bin(self, study, repertory, results, qlog=None, name="0"):
|
||||||
|
|
||||||
@@ -876,7 +896,10 @@ class AdisTSwc(AdisTS):
|
|||||||
|
|
||||||
for i in range(ibmax):
|
for i in range(ibmax):
|
||||||
# Add results reach to reach list
|
# Add results reach to reach list
|
||||||
r = results.river.add(i)
|
geometry_reach = study.river.enable_edges()[i].reach
|
||||||
|
r = results.river.add(
|
||||||
|
i, profiles=geometry_reach.enabled_profiles
|
||||||
|
)
|
||||||
reachs.append(r)
|
reachs.append(r)
|
||||||
|
|
||||||
is1[i] = data[2 * i] - 1 # first section of reach i
|
is1[i] = data[2 * i] - 1 # first section of reach i
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -19,8 +19,9 @@
|
|||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime, timezone
|
||||||
from tools import timer, parse_command_line, get_version, logger_exception
|
from tools import timer, parse_command_line, get_version, logger_exception
|
||||||
|
from tools import parse_datetime
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Installation allow Unix-like signal
|
# Installation allow Unix-like signal
|
||||||
@@ -158,11 +159,15 @@ class CommandLineSolver(AbstractSolver):
|
|||||||
txt = add_file.text
|
txt = add_file.text
|
||||||
txt = txt.replace("@version", get_version())
|
txt = txt.replace("@version", get_version())
|
||||||
txt = txt.replace("@date", datetime.now().isoformat(sep=" "))
|
txt = txt.replace("@date", datetime.now().isoformat(sep=" "))
|
||||||
|
txt = self._prepare_additional_file_text(add_file.path, txt)
|
||||||
|
|
||||||
f.write(txt)
|
f.write(txt)
|
||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
|
def _prepare_additional_file_text(self, path, text):
|
||||||
|
return text
|
||||||
|
|
||||||
def export_study_description(self, study, repertory, qlog, name="0"):
|
def export_study_description(self, study, repertory, qlog, name="0"):
|
||||||
files = []
|
files = []
|
||||||
|
|
||||||
|
|||||||
+65
-23
@@ -65,6 +65,8 @@ class Mage(CommandLineSolver):
|
|||||||
self._cmd_solver = "@path @input -o @output"
|
self._cmd_solver = "@path @input -o @output"
|
||||||
self._cmd_output = ""
|
self._cmd_output = ""
|
||||||
|
|
||||||
|
self._reset_node_names()
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def default_parameters(cls):
|
def default_parameters(cls):
|
||||||
lst = super(Mage, cls).default_parameters()
|
lst = super(Mage, cls).default_parameters()
|
||||||
@@ -125,12 +127,15 @@ class Mage(CommandLineSolver):
|
|||||||
|
|
||||||
_l_alph = len(_alph)
|
_l_alph = len(_alph)
|
||||||
|
|
||||||
_nodes_cnt = 0
|
def _reset_node_names(self):
|
||||||
_nodes_names = {}
|
"""Reset the node-name registry for a new export."""
|
||||||
_nodes_views = set()
|
self._nodes_cnt = 0
|
||||||
|
self._nodes_names = {}
|
||||||
|
self._nodes_views = set()
|
||||||
|
|
||||||
def get_reach_name(self, reach):
|
def get_reach_name(self, reach):
|
||||||
return f"Reach_{reach.pamhyr_id:>3}".replace(" ", "0")
|
index = self._study.river.get_edge_id(reach) + 1
|
||||||
|
return f"Reach_{index:03d}"
|
||||||
|
|
||||||
def get_node_name(self, node):
|
def get_node_name(self, node):
|
||||||
"""Generate a 3 char name for node
|
"""Generate a 3 char name for node
|
||||||
@@ -210,7 +215,7 @@ class Mage(CommandLineSolver):
|
|||||||
# Write header
|
# Write header
|
||||||
edges = study.river.enable_edges()
|
edges = study.river.enable_edges()
|
||||||
for edge in edges:
|
for edge in edges:
|
||||||
name = f"Reach_{edge.pamhyr_id:>3}".replace(" ", "0")
|
name = self.get_reach_name(edge)
|
||||||
|
|
||||||
with mage_file_open(
|
with mage_file_open(
|
||||||
os.path.join(repertory, "net", f"{name}.ST"),
|
os.path.join(repertory, "net", f"{name}.ST"),
|
||||||
@@ -219,7 +224,7 @@ class Mage(CommandLineSolver):
|
|||||||
files.append(str(os.path.join("net", f"{name}.ST")))
|
files.append(str(os.path.join("net", f"{name}.ST")))
|
||||||
|
|
||||||
cnt_num = 1
|
cnt_num = 1
|
||||||
for profile in edge.reach.profiles:
|
for profile in edge.reach.enabled_profiles:
|
||||||
self._export_ST_profile_header(
|
self._export_ST_profile_header(
|
||||||
f, files, profile, cnt_num
|
f, files, profile, cnt_num
|
||||||
)
|
)
|
||||||
@@ -298,7 +303,7 @@ class Mage(CommandLineSolver):
|
|||||||
# Point line
|
# Point line
|
||||||
wfile.write(f"{x} {y} {z} {n} {sediment}\n")
|
wfile.write(f"{x} {y} {z} {n} {sediment}\n")
|
||||||
|
|
||||||
def _export_BC(self, t, bounds, repertory, qlog, name="0"):
|
def _export_BC(self, study, t, bounds, repertory, qlog, name="0"):
|
||||||
files = []
|
files = []
|
||||||
|
|
||||||
if len(bounds) == 0:
|
if len(bounds) == 0:
|
||||||
@@ -328,7 +333,7 @@ class Mage(CommandLineSolver):
|
|||||||
v1 = d[1]
|
v1 = d[1]
|
||||||
|
|
||||||
if t in ["HYD", "LIM"]:
|
if t in ["HYD", "LIM"]:
|
||||||
v0 /= 60 # Convert first column to minute
|
v0 /= 60 # Convert first column to minutes
|
||||||
|
|
||||||
f.write(f"{v0:9} {v1:9} \n")
|
f.write(f"{v0:9} {v1:9} \n")
|
||||||
|
|
||||||
@@ -360,10 +365,17 @@ class Mage(CommandLineSolver):
|
|||||||
elif bound.bctype == "SL":
|
elif bound.bctype == "SL":
|
||||||
QSO.append(bound)
|
QSO.append(bound)
|
||||||
|
|
||||||
files = files + self._export_BC("AVA", AVA, repertory, qlog, name=name)
|
files = files + self._export_BC(
|
||||||
files = files + self._export_BC("HYD", HYD, repertory, qlog, name=name)
|
study, "AVA", AVA, repertory, qlog, name=name
|
||||||
files = files + self._export_BC("LIM", LIM, repertory, qlog, name=name)
|
)
|
||||||
files = files + self._export_QSO(QSO, repertory, qlog, name=name)
|
files = files + self._export_BC(
|
||||||
|
study, "HYD", HYD, repertory, qlog, name=name
|
||||||
|
)
|
||||||
|
files = files + self._export_BC(
|
||||||
|
study, "LIM", LIM, repertory, qlog, name=name
|
||||||
|
)
|
||||||
|
files = files + self._export_QSO(study, QSO, repertory,
|
||||||
|
qlog, name=name)
|
||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
@@ -417,10 +429,11 @@ class Mage(CommandLineSolver):
|
|||||||
if d.is_deleted():
|
if d.is_deleted():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
time = d[0]
|
||||||
if lateral.lctype in ["EV"]:
|
if lateral.lctype in ["EV"]:
|
||||||
f.write(f"{d[0]:10.3f}{-d[1]:10.3f}\n")
|
f.write(f"{time:10.3f}{-d[1]:10.3f}\n")
|
||||||
else:
|
else:
|
||||||
f.write(f"{d[0]:10.3f}{d[1]:10.3f}\n")
|
f.write(f"{time:10.3f}{d[1]:10.3f}\n")
|
||||||
|
|
||||||
def _export_RUG(self, study, repertory, qlog, name="0"):
|
def _export_RUG(self, study, repertory, qlog, name="0"):
|
||||||
files = []
|
files = []
|
||||||
@@ -484,7 +497,12 @@ class Mage(CommandLineSolver):
|
|||||||
if cond.is_deleted():
|
if cond.is_deleted():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
data = cond.data
|
enabled_profiles = set(reach.reach.enabled_profiles)
|
||||||
|
data = [
|
||||||
|
item for item in cond.data
|
||||||
|
if not item.is_deleted()
|
||||||
|
and item["section"] in enabled_profiles
|
||||||
|
]
|
||||||
if len(data) == 0:
|
if len(data) == 0:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@@ -492,9 +510,6 @@ class Mage(CommandLineSolver):
|
|||||||
|
|
||||||
id_sec = 1
|
id_sec = 1
|
||||||
for d in data:
|
for d in data:
|
||||||
if d.is_deleted():
|
|
||||||
continue
|
|
||||||
|
|
||||||
IR = f"{id}"
|
IR = f"{id}"
|
||||||
IS = f"{id_sec}"
|
IS = f"{id_sec}"
|
||||||
discharge = f"{d['discharge']:>10.5f}"
|
discharge = f"{d['discharge']:>10.5f}"
|
||||||
@@ -679,6 +694,23 @@ class Mage(CommandLineSolver):
|
|||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
def _prepare_additional_file_text(self, path, text):
|
||||||
|
if os.path.splitext(path)[1].lower() != ".var":
|
||||||
|
return text
|
||||||
|
|
||||||
|
lines = []
|
||||||
|
for line in text.splitlines(keepends=True):
|
||||||
|
stripped = line.lstrip()
|
||||||
|
fields = stripped.split()
|
||||||
|
if stripped.startswith("$"):
|
||||||
|
# MAGE only recognizes rule markers in the first column.
|
||||||
|
line = stripped
|
||||||
|
elif (not stripped.startswith("*") and len(fields) >= 2
|
||||||
|
and fields[1] == "W2Z"):
|
||||||
|
line = "$ " + stripped
|
||||||
|
lines.append(line)
|
||||||
|
return "".join(lines)
|
||||||
|
|
||||||
def _export_VAR(self, study, repertory, qlog, name="0"):
|
def _export_VAR(self, study, repertory, qlog, name="0"):
|
||||||
files = []
|
files = []
|
||||||
|
|
||||||
@@ -729,9 +761,11 @@ class Mage(CommandLineSolver):
|
|||||||
name = bhs.name
|
name = bhs.name
|
||||||
if name == "":
|
if name == "":
|
||||||
name = f"HS_{bhs.id:>3}".replace(" ", "0")
|
name = f"HS_{bhs.id:>3}".replace(" ", "0")
|
||||||
|
else:
|
||||||
|
name = name.replace(" ", "_")
|
||||||
|
|
||||||
f.write(
|
f.write(
|
||||||
f"${name} clapet"
|
f"${name} clapet\n"
|
||||||
)
|
)
|
||||||
return files
|
return files
|
||||||
|
|
||||||
@@ -957,7 +991,7 @@ class Mage8(Mage):
|
|||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
def _export_QSO(self, bounds, repertory, qlog, name="0"):
|
def _export_QSO(self, study, bounds, repertory, qlog, name="0"):
|
||||||
files = []
|
files = []
|
||||||
|
|
||||||
if len(bounds) == 0:
|
if len(bounds) == 0:
|
||||||
@@ -987,7 +1021,8 @@ class Mage8(Mage):
|
|||||||
|
|
||||||
# Data
|
# Data
|
||||||
for d in bound.data:
|
for d in bound.data:
|
||||||
f.write(f"{d[0]/60:10.3f}{d[1]:10.3f}\n")
|
time = d[0] / 60
|
||||||
|
f.write(f"{time:10.3f}{d[1]:10.3f}\n")
|
||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
@@ -1004,6 +1039,7 @@ class Mage8(Mage):
|
|||||||
@timer
|
@timer
|
||||||
def export(self, study, repertory, qlog=None, name="0"):
|
def export(self, study, repertory, qlog=None, name="0"):
|
||||||
self._study = study
|
self._study = study
|
||||||
|
self._reset_node_names()
|
||||||
name = study.name.replace(" ", "_")
|
name = study.name.replace(" ", "_")
|
||||||
|
|
||||||
# Define GRA file name
|
# Define GRA file name
|
||||||
@@ -1091,7 +1127,10 @@ class Mage8(Mage):
|
|||||||
|
|
||||||
for i in range(nb_reach):
|
for i in range(nb_reach):
|
||||||
# Add results reach to reach list
|
# Add results reach to reach list
|
||||||
r = results.river.add(i)
|
geometry_reach = study.river.enable_edges()[i].reach
|
||||||
|
r = results.river.add(
|
||||||
|
i, profiles=geometry_reach.enabled_profiles
|
||||||
|
)
|
||||||
reachs.append(r)
|
reachs.append(r)
|
||||||
|
|
||||||
# ID of first and last reach profiles
|
# ID of first and last reach profiles
|
||||||
@@ -1396,7 +1435,10 @@ class Mage8(Mage):
|
|||||||
zfd_lst = []
|
zfd_lst = []
|
||||||
|
|
||||||
for r in reachs:
|
for r in reachs:
|
||||||
z_min = r.geometry.get_z_min()
|
z_min = [
|
||||||
|
profile.geometry.z_min()
|
||||||
|
for profile in r.profiles
|
||||||
|
]
|
||||||
sls = map(
|
sls = map(
|
||||||
lambda p: p.get_ts_key(ts_list[0], "sl")[0],
|
lambda p: p.get_ts_key(ts_list[0], "sl")[0],
|
||||||
r.profiles
|
r.profiles
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ from Solver.Mage import (
|
|||||||
Mage7, Mage8, MageFake7,
|
Mage7, Mage8, MageFake7,
|
||||||
)
|
)
|
||||||
from Solver.AdisTS import AdisTSwc
|
from Solver.AdisTS import AdisTSwc
|
||||||
|
from Solver.AdisTT import AdisTTwc
|
||||||
from Solver.RubarBE import Rubar3, RubarBE
|
from Solver.RubarBE import Rubar3, RubarBE
|
||||||
|
|
||||||
_translate = QCoreApplication.translate
|
_translate = QCoreApplication.translate
|
||||||
@@ -33,6 +34,7 @@ solver_long_name = {
|
|||||||
"mage8": "Mage v8",
|
"mage8": "Mage v8",
|
||||||
# "mage_fake7": "Mage fake v7",
|
# "mage_fake7": "Mage fake v7",
|
||||||
"adistswc": "Adis-TS_WC",
|
"adistswc": "Adis-TS_WC",
|
||||||
|
"adisttwc": "Adis-TT_WC",
|
||||||
# "rubarbe": "RubarBE",
|
# "rubarbe": "RubarBE",
|
||||||
"rubar3": "Rubar3",
|
"rubar3": "Rubar3",
|
||||||
}
|
}
|
||||||
@@ -43,6 +45,7 @@ solver_type_list = {
|
|||||||
"mage8": Mage8,
|
"mage8": Mage8,
|
||||||
# "mage_fake7": MageFake7,
|
# "mage_fake7": MageFake7,
|
||||||
"adistswc": AdisTSwc,
|
"adistswc": AdisTSwc,
|
||||||
|
"adisttwc": AdisTTwc,
|
||||||
# "rubarbe": RubarBE,
|
# "rubarbe": RubarBE,
|
||||||
"rubar3": Rubar3,
|
"rubar3": Rubar3,
|
||||||
}
|
}
|
||||||
@@ -54,7 +54,7 @@ class Plot(PamhyrPlot):
|
|||||||
self._isometric_axis = False
|
self._isometric_axis = False
|
||||||
|
|
||||||
self._auto_relim_update = True
|
self._auto_relim_update = True
|
||||||
self._autoscale_update = False
|
self._autoscale_update = True
|
||||||
|
|
||||||
def custom_ticks(self):
|
def custom_ticks(self):
|
||||||
if self.data.header[0] != "time":
|
if self.data.header[0] != "time":
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ from datetime import date, time, datetime, timedelta
|
|||||||
from tools import (
|
from tools import (
|
||||||
trace, timer,
|
trace, timer,
|
||||||
timestamp_to_old_pamhyr_date,
|
timestamp_to_old_pamhyr_date,
|
||||||
old_pamhyr_date_to_timestamp
|
old_pamhyr_date_to_timestamp, format_datetime, parse_datetime
|
||||||
)
|
)
|
||||||
|
|
||||||
from View.Tools.PamhyrTable import PamhyrTableModel
|
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||||
@@ -94,10 +94,13 @@ class TableModel(PamhyrTableModel):
|
|||||||
v = v.replace(',', '.')
|
v = v.replace(',', '.')
|
||||||
value = f"{float(v):.4f}"
|
value = f"{float(v):.4f}"
|
||||||
elif self._data.header[column] == "time":
|
elif self._data.header[column] == "time":
|
||||||
if self._opt_data == "time":
|
if self.time_system == "time":
|
||||||
value = timestamp_to_old_pamhyr_date(int(v))
|
value = timestamp_to_old_pamhyr_date(int(v))
|
||||||
else:
|
else:
|
||||||
value = str(datetime.fromtimestamp(v))
|
value = format_datetime(
|
||||||
|
parse_datetime(self.start_date)
|
||||||
|
+ timedelta(seconds=float(v))
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
value = f"{v}"
|
value = f"{v}"
|
||||||
|
|
||||||
@@ -114,6 +117,10 @@ class TableModel(PamhyrTableModel):
|
|||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
if (self._data.header[column] == "time"
|
||||||
|
and self.time_system == "date"):
|
||||||
|
value = self.date_to_elapsed_seconds(value)
|
||||||
|
|
||||||
row = self.get_true_data_row(row)
|
row = self.get_true_data_row(row)
|
||||||
|
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
@@ -232,17 +239,18 @@ class TableModel(PamhyrTableModel):
|
|||||||
if len(data) == 0:
|
if len(data) == 0:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
rows = [self._data.new_from_data(header, d) for d in data]
|
||||||
|
except (ValueError, TypeError, IndexError) as error:
|
||||||
|
logger.warning(error)
|
||||||
|
return False
|
||||||
|
|
||||||
self.layoutAboutToBeChanged.emit()
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
PasteCommand(
|
PasteCommand(
|
||||||
self._data, row,
|
self._data, row,
|
||||||
list(
|
rows
|
||||||
map(
|
|
||||||
lambda d: self._data.new_from_data(header, d),
|
|
||||||
data
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from Modules import Modules
|
||||||
|
|
||||||
from tools import timer, trace
|
from tools import timer, trace
|
||||||
|
|
||||||
from numpy import sqrt
|
from numpy import sqrt
|
||||||
@@ -173,7 +175,8 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||||||
},
|
},
|
||||||
data=self._data,
|
data=self._data,
|
||||||
undo=self._undo_stack,
|
undo=self._undo_stack,
|
||||||
opt_data=self._study.time_system
|
opt_data=self._study.time_system,
|
||||||
|
study=self._study
|
||||||
)
|
)
|
||||||
|
|
||||||
table.setModel(self._table)
|
table.setModel(self._table)
|
||||||
@@ -261,6 +264,11 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||||||
self._d50sigma.set_d50(self._data.d50)
|
self._d50sigma.set_d50(self._data.d50)
|
||||||
self._d50sigma.set_sigma(self._data.sigma)
|
self._d50sigma.set_sigma(self._data.sigma)
|
||||||
|
|
||||||
|
def _propagated_update(self, key=Modules(0)):
|
||||||
|
if Modules.STUDY in key:
|
||||||
|
self._table.layoutChanged.emit()
|
||||||
|
self.plot.update()
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
self.plot.update()
|
self.plot.update()
|
||||||
|
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ class DelCommand(QUndoCommand):
|
|||||||
self._bcs.insert(self._tab, row, el)
|
self._bcs.insert(self._tab, row, el)
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._bcs.delete_i(self._tab, self._rows)
|
self._bcs.delete(self._tab, [el for _, el in self._bc])
|
||||||
|
|
||||||
|
|
||||||
class SortCommand(QUndoCommand):
|
class SortCommand(QUndoCommand):
|
||||||
|
|||||||
@@ -21,10 +21,11 @@ import traceback
|
|||||||
|
|
||||||
from datetime import date, time, datetime, timedelta
|
from datetime import date, time, datetime, timedelta
|
||||||
|
|
||||||
|
from tools import parse_datetime
|
||||||
from tools import (
|
from tools import (
|
||||||
trace, timer,
|
trace, timer,
|
||||||
timestamp_to_old_pamhyr_date,
|
timestamp_to_old_pamhyr_date,
|
||||||
old_pamhyr_date_to_timestamp
|
old_pamhyr_date_to_timestamp, format_datetime
|
||||||
)
|
)
|
||||||
|
|
||||||
from View.Tools.PamhyrTable import PamhyrTableModel
|
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||||
@@ -84,10 +85,13 @@ class TableModel(PamhyrTableModel):
|
|||||||
if self._data._types[column] == float:
|
if self._data._types[column] == float:
|
||||||
value = f"{v:.4f}"
|
value = f"{v:.4f}"
|
||||||
elif self._data.header[column] == "time":
|
elif self._data.header[column] == "time":
|
||||||
if self._opt_data == "time":
|
if self.time_system == "time":
|
||||||
value = timestamp_to_old_pamhyr_date(int(v))
|
value = timestamp_to_old_pamhyr_date(int(v))
|
||||||
else:
|
else:
|
||||||
value = str(datetime.fromtimestamp(v))
|
value = format_datetime(
|
||||||
|
parse_datetime(self.start_date)
|
||||||
|
+ timedelta(seconds=float(v))
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
value = f"{v}"
|
value = f"{v}"
|
||||||
|
|
||||||
@@ -104,6 +108,10 @@ class TableModel(PamhyrTableModel):
|
|||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
if (self._data.header[column] == "time"
|
||||||
|
and self.time_system == "date"):
|
||||||
|
value = self.date_to_elapsed_seconds(value)
|
||||||
|
|
||||||
row = self.get_true_data_row(row)
|
row = self.get_true_data_row(row)
|
||||||
|
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
@@ -163,17 +171,18 @@ class TableModel(PamhyrTableModel):
|
|||||||
if len(data) == 0:
|
if len(data) == 0:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
rows = [self._data.new_from_data(header, d) for d in data]
|
||||||
|
except (ValueError, TypeError, IndexError) as error:
|
||||||
|
logger.warning(error)
|
||||||
|
return False
|
||||||
|
|
||||||
self.layoutAboutToBeChanged.emit()
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
PasteCommand(
|
PasteCommand(
|
||||||
self._data, row,
|
self._data, row,
|
||||||
list(
|
rows
|
||||||
map(
|
|
||||||
lambda d: self._data.new_from_data(header, d),
|
|
||||||
data
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from Modules import Modules
|
||||||
|
|
||||||
from tools import timer, trace
|
from tools import timer, trace
|
||||||
|
|
||||||
from View.Tools.PamhyrWindow import PamhyrWindow
|
from View.Tools.PamhyrWindow import PamhyrWindow
|
||||||
@@ -64,14 +66,22 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||||||
name = trad[self._pamhyr_name]
|
name = trad[self._pamhyr_name]
|
||||||
|
|
||||||
if self._data is not None:
|
if self._data is not None:
|
||||||
|
pollutant_name = next(
|
||||||
|
(
|
||||||
|
pollutant.name
|
||||||
|
for pollutant in study.river.Pollutants.Pollutants_List
|
||||||
|
if pollutant.id == self._data.pollutant
|
||||||
|
),
|
||||||
|
None
|
||||||
|
)
|
||||||
n = self._data.node
|
n = self._data.node
|
||||||
node_name = next(filter(
|
node_name = next(filter(
|
||||||
lambda x: x.id == n, study.river._nodes
|
lambda x: x.id == n, study.river._nodes
|
||||||
)).name
|
)).name
|
||||||
name += (
|
name += f" - {study.name}"
|
||||||
f" - {study.name} " +
|
if pollutant_name is not None:
|
||||||
f"({node_name})"
|
name += f" - {pollutant_name}"
|
||||||
)
|
name += f" ({node_name})"
|
||||||
|
|
||||||
super(EditBoundaryConditionWindow, self).__init__(
|
super(EditBoundaryConditionWindow, self).__init__(
|
||||||
title=name,
|
title=name,
|
||||||
@@ -120,7 +130,8 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||||||
},
|
},
|
||||||
data=self._data,
|
data=self._data,
|
||||||
undo=self._undo_stack,
|
undo=self._undo_stack,
|
||||||
opt_data=self._study.time_system
|
opt_data=self._study.time_system,
|
||||||
|
study=self._study
|
||||||
)
|
)
|
||||||
|
|
||||||
table.setModel(self._table)
|
table.setModel(self._table)
|
||||||
@@ -153,8 +164,14 @@ class EditBoundaryConditionWindow(PamhyrWindow):
|
|||||||
self.find(QAction, "action_sort").triggered.connect(self.sort)
|
self.find(QAction, "action_sort").triggered.connect(self.sort)
|
||||||
self._table.dataChanged.connect(self.update)
|
self._table.dataChanged.connect(self.update)
|
||||||
|
|
||||||
|
def _propagated_update(self, key=Modules(0)):
|
||||||
|
if Modules.STUDY in key:
|
||||||
|
self._table.layoutChanged.emit()
|
||||||
|
self.plot.update()
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
self.plot.update()
|
self.plot.update()
|
||||||
|
self.plot.fit_to_data()
|
||||||
|
|
||||||
def index_selected_row(self):
|
def index_selected_row(self):
|
||||||
table = self.find(QTableView, "tableView")
|
table = self.find(QTableView, "tableView")
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
# Plot.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from tools import timer, trace
|
||||||
|
from View.Tools.PamhyrPlot import PamhyrPlot
|
||||||
|
|
||||||
|
from PyQt5.QtCore import (
|
||||||
|
QCoreApplication
|
||||||
|
)
|
||||||
|
|
||||||
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class Plot(PamhyrPlot):
|
||||||
|
def __init__(self, mode="time", data=None,
|
||||||
|
trad=None, canvas=None, toolbar=None,
|
||||||
|
parent=None):
|
||||||
|
super(Plot, self).__init__(
|
||||||
|
canvas=canvas,
|
||||||
|
trad=trad,
|
||||||
|
data=data,
|
||||||
|
toolbar=toolbar,
|
||||||
|
parent=parent
|
||||||
|
)
|
||||||
|
|
||||||
|
self._table_headers = self._trad.get_dict("table_headers")
|
||||||
|
|
||||||
|
header = self.data.header
|
||||||
|
|
||||||
|
self.label_x = self._table_headers[header[0]]
|
||||||
|
self.label_y = self._table_headers[header[1]]
|
||||||
|
|
||||||
|
self._mode = mode
|
||||||
|
self._isometric_axis = False
|
||||||
|
|
||||||
|
self._auto_relim_update = True
|
||||||
|
self._autoscale_update = False
|
||||||
|
|
||||||
|
def custom_ticks(self):
|
||||||
|
if self.data.header[0] != "time":
|
||||||
|
return
|
||||||
|
|
||||||
|
self.set_ticks_time_formater()
|
||||||
|
|
||||||
|
@timer
|
||||||
|
def draw(self):
|
||||||
|
self.init_axes()
|
||||||
|
|
||||||
|
if len(self.data) == 0:
|
||||||
|
self._init = False
|
||||||
|
return
|
||||||
|
|
||||||
|
self.draw_data()
|
||||||
|
self.custom_ticks()
|
||||||
|
|
||||||
|
self.idle()
|
||||||
|
self._init = True
|
||||||
|
|
||||||
|
def draw_data(self):
|
||||||
|
# Plot data
|
||||||
|
x = list(map(lambda v: v[0], self.data.data))
|
||||||
|
y = list(map(lambda v: v[1], self.data.data))
|
||||||
|
|
||||||
|
self._line, = self.canvas.axes.plot(
|
||||||
|
x, y,
|
||||||
|
color=self.color_plot,
|
||||||
|
**self.plot_default_kargs
|
||||||
|
)
|
||||||
|
|
||||||
|
@timer
|
||||||
|
def update(self, ind=None):
|
||||||
|
if not self._init:
|
||||||
|
self.draw()
|
||||||
|
return
|
||||||
|
|
||||||
|
self.update_data()
|
||||||
|
|
||||||
|
self.update_idle()
|
||||||
|
|
||||||
|
def update_data(self):
|
||||||
|
x = list(map(lambda v: v[0], self.data.data))
|
||||||
|
y = list(map(lambda v: v[1], self.data.data))
|
||||||
|
|
||||||
|
self._line.set_data(x, y)
|
||||||
@@ -0,0 +1,194 @@
|
|||||||
|
# Table.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import traceback
|
||||||
|
|
||||||
|
from datetime import date, time, datetime, timedelta
|
||||||
|
|
||||||
|
from tools import parse_datetime
|
||||||
|
from tools import (
|
||||||
|
trace, timer,
|
||||||
|
timestamp_to_old_pamhyr_date,
|
||||||
|
old_pamhyr_date_to_timestamp, format_datetime
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||||
|
|
||||||
|
from PyQt5.QtCore import (
|
||||||
|
Qt, QVariant, QAbstractTableModel,
|
||||||
|
QCoreApplication, QModelIndex, pyqtSlot,
|
||||||
|
QRect, QTime, QDateTime,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QTableView, QAbstractItemView, QSpinBox,
|
||||||
|
QTimeEdit, QDateTimeEdit, QItemDelegate,
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.BoundaryConditionsTemperature.Edit.UndoCommand import (
|
||||||
|
AddCommand, DelCommand, SetDataCommand, PasteCommand, SortCommand,
|
||||||
|
)
|
||||||
|
|
||||||
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class TableModel(PamhyrTableModel):
|
||||||
|
def get_true_data_row(self, row):
|
||||||
|
if len(self._data.data) > 0:
|
||||||
|
bc = self._data.data[row]
|
||||||
|
else:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
return next(
|
||||||
|
map(
|
||||||
|
lambda e: e[0],
|
||||||
|
filter(
|
||||||
|
lambda e: e[1] == bc,
|
||||||
|
enumerate(self._data._data)
|
||||||
|
)
|
||||||
|
), 0
|
||||||
|
)
|
||||||
|
|
||||||
|
def data(self, index, role):
|
||||||
|
if role == Qt.TextAlignmentRole:
|
||||||
|
return Qt.AlignHCenter | Qt.AlignVCenter
|
||||||
|
|
||||||
|
if role != Qt.ItemDataRole.DisplayRole:
|
||||||
|
return QVariant()
|
||||||
|
|
||||||
|
row = index.row()
|
||||||
|
column = index.column()
|
||||||
|
|
||||||
|
value = QVariant()
|
||||||
|
|
||||||
|
if 0 <= column < 2:
|
||||||
|
row = self.get_true_data_row(row)
|
||||||
|
v = self._data._data[row][column]
|
||||||
|
if self._data._types[column] == float:
|
||||||
|
value = f"{v:.2f}"
|
||||||
|
elif self._data.header[column] == "time":
|
||||||
|
if self.time_system == "time":
|
||||||
|
value = timestamp_to_old_pamhyr_date(int(v))
|
||||||
|
else:
|
||||||
|
value = format_datetime(
|
||||||
|
parse_datetime(self.start_date)
|
||||||
|
+ timedelta(seconds=float(v))
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
value = f"{v}"
|
||||||
|
|
||||||
|
return value
|
||||||
|
|
||||||
|
def setData(self, index, value, role=Qt.EditRole):
|
||||||
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
|
return False
|
||||||
|
|
||||||
|
if self.is_same_data(index, value):
|
||||||
|
return False
|
||||||
|
|
||||||
|
row = index.row()
|
||||||
|
column = index.column()
|
||||||
|
|
||||||
|
try:
|
||||||
|
if (self._data.header[column] == "time"
|
||||||
|
and self.time_system == "date"):
|
||||||
|
value = self.date_to_elapsed_seconds(value)
|
||||||
|
|
||||||
|
row = self.get_true_data_row(row)
|
||||||
|
|
||||||
|
self._undo.push(
|
||||||
|
SetDataCommand(
|
||||||
|
self._data, row, column, value
|
||||||
|
)
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.info(e)
|
||||||
|
logger.debug(traceback.format_exc())
|
||||||
|
|
||||||
|
self.dataChanged.emit(index, index)
|
||||||
|
return True
|
||||||
|
|
||||||
|
def add(self, row, parent=QModelIndex()):
|
||||||
|
self.beginInsertRows(parent, row, row - 1)
|
||||||
|
|
||||||
|
self._undo.push(
|
||||||
|
AddCommand(
|
||||||
|
self._data, row
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.endInsertRows()
|
||||||
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
|
def delete(self, rows, parent=QModelIndex()):
|
||||||
|
self.beginRemoveRows(parent, rows[0], rows[-1])
|
||||||
|
_rows = list(
|
||||||
|
map(
|
||||||
|
lambda r: self.get_true_data_row(r),
|
||||||
|
rows
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self._undo.push(
|
||||||
|
DelCommand(
|
||||||
|
self._data, _rows
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.endRemoveRows()
|
||||||
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
|
def sort(self, _reverse, parent=QModelIndex()):
|
||||||
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
|
||||||
|
self._undo.push(
|
||||||
|
SortCommand(
|
||||||
|
self._data, _reverse
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
self.update()
|
||||||
|
|
||||||
|
def paste(self, row, header, data):
|
||||||
|
if len(data) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
rows = [self._data.new_from_data(header, d) for d in data]
|
||||||
|
except (ValueError, TypeError, IndexError) as error:
|
||||||
|
logger.warning(error)
|
||||||
|
return False
|
||||||
|
|
||||||
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
|
||||||
|
self._undo.push(
|
||||||
|
PasteCommand(
|
||||||
|
self._data, row,
|
||||||
|
rows
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
self.update()
|
||||||
|
|
||||||
|
def update(self):
|
||||||
|
# self.auto_sort()
|
||||||
|
self.layoutChanged.emit()
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
# UndoCommand.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from copy import deepcopy
|
||||||
|
from tools import trace, timer
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QMessageBox, QUndoCommand, QUndoStack,
|
||||||
|
)
|
||||||
|
|
||||||
|
from Model.BoundaryConditionsTemperature.BoundaryConditionTemperature \
|
||||||
|
import BoundaryConditionTemperature
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class SetDataCommand(QUndoCommand):
|
||||||
|
def __init__(self, data, index, column, new_value):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._index = index
|
||||||
|
self._column = column
|
||||||
|
self._old = self._data.get_i(self._index)[self._column]
|
||||||
|
self._new = new_value
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
self._data._set_i_c_v(self._index, self._column, self._old)
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
self._data._set_i_c_v(self._index, self._column, self._new)
|
||||||
|
|
||||||
|
|
||||||
|
class AddCommand(QUndoCommand):
|
||||||
|
def __init__(self, data, index):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._index = index
|
||||||
|
self._new = None
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
del self._data._data[self._index]
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
if self._new is None:
|
||||||
|
self._new = self._data.add(self._index)
|
||||||
|
else:
|
||||||
|
self._data.insert(self._index, self._new)
|
||||||
|
|
||||||
|
|
||||||
|
class DelCommand(QUndoCommand):
|
||||||
|
def __init__(self, data, rows):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._rows = rows
|
||||||
|
|
||||||
|
self._bc = []
|
||||||
|
for row in rows:
|
||||||
|
self._bc.append((row, self._data._data[row]))
|
||||||
|
self._bc.sort()
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
for row, el in self._bc:
|
||||||
|
el.set_as_not_deleted()
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
for row, el in self._bc:
|
||||||
|
el.set_as_deleted()
|
||||||
|
|
||||||
|
|
||||||
|
class PasteCommand(QUndoCommand):
|
||||||
|
def __init__(self, data, row, bcs):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._row = row
|
||||||
|
self._bcs = bcs
|
||||||
|
self._bcs.reverse()
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
self._data.delete_i(
|
||||||
|
range(self._row, self._row + len(self._bcs))
|
||||||
|
)
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
for bc in self._bcs:
|
||||||
|
self._data.insert(self._row, bc)
|
||||||
|
|
||||||
|
|
||||||
|
class SortCommand(QUndoCommand):
|
||||||
|
def __init__(self, data, _reverse):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._reverse = _reverse
|
||||||
|
|
||||||
|
self._old = self._data.data
|
||||||
|
self._indexes = None
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
ll = self._data.data
|
||||||
|
self._data.sort(
|
||||||
|
key=lambda x: self._indexes[ll.index(x)]
|
||||||
|
)
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
self._data.sort(
|
||||||
|
_reverse=self._reverse,
|
||||||
|
key=lambda x: x[0]
|
||||||
|
)
|
||||||
|
if self._indexes is None:
|
||||||
|
self._indexes = list(
|
||||||
|
map(
|
||||||
|
lambda p: self._old.index(p),
|
||||||
|
self._data.data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self._old = None
|
||||||
@@ -0,0 +1,238 @@
|
|||||||
|
# Window.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from Modules import Modules
|
||||||
|
|
||||||
|
from tools import timer, trace
|
||||||
|
|
||||||
|
from View.Tools.PamhyrWindow import PamhyrWindow
|
||||||
|
from View.Tools.PamhyrWidget import PamhyrWidget
|
||||||
|
from View.Tools.PamhyrDelegate import PamhyrExTimeDelegate
|
||||||
|
|
||||||
|
from PyQt5.QtGui import (
|
||||||
|
QKeySequence,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5 import QtCore
|
||||||
|
from PyQt5.QtCore import (
|
||||||
|
Qt, QVariant, QAbstractTableModel, QCoreApplication,
|
||||||
|
pyqtSlot, pyqtSignal,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QDialogButtonBox, QPushButton, QLineEdit,
|
||||||
|
QFileDialog, QTableView, QAbstractItemView,
|
||||||
|
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||||
|
QHeaderView, QDoubleSpinBox, QVBoxLayout,
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.Tools.Plot.PamhyrCanvas import MplCanvas
|
||||||
|
from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
|
||||||
|
|
||||||
|
from View.BoundaryConditionsTemperature.Edit.translate import BCETranslate
|
||||||
|
from View.BoundaryConditionsTemperature.Edit.Table import TableModel
|
||||||
|
from View.BoundaryConditionsTemperature.Edit.Plot import Plot
|
||||||
|
|
||||||
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class EditBoundaryConditionWindow(PamhyrWindow):
|
||||||
|
_pamhyr_ui = "EditBoundaryConditionsTemperature"
|
||||||
|
_pamhyr_name = "Edit Boundary Conditions Temperature"
|
||||||
|
|
||||||
|
def __init__(self, data=None, study=None, config=None, parent=None):
|
||||||
|
self._data = data
|
||||||
|
trad = BCETranslate()
|
||||||
|
|
||||||
|
name = trad[self._pamhyr_name]
|
||||||
|
|
||||||
|
if self._data is not None:
|
||||||
|
n = self._data.node
|
||||||
|
node_name = next(filter(
|
||||||
|
lambda x: x.id == n, study.river._nodes
|
||||||
|
)).name
|
||||||
|
name += (
|
||||||
|
f" - {study.name} " +
|
||||||
|
f"({node_name})"
|
||||||
|
)
|
||||||
|
|
||||||
|
super(EditBoundaryConditionWindow, self).__init__(
|
||||||
|
title=name,
|
||||||
|
study=study,
|
||||||
|
config=config,
|
||||||
|
trad=trad,
|
||||||
|
parent=parent
|
||||||
|
)
|
||||||
|
|
||||||
|
self._hash_data.append(data)
|
||||||
|
|
||||||
|
self.setup_table()
|
||||||
|
self.setup_plot()
|
||||||
|
self.setup_connections()
|
||||||
|
|
||||||
|
def setup_table(self):
|
||||||
|
table_headers = self._trad.get_dict("table_headers")
|
||||||
|
|
||||||
|
if self._study.is_editable():
|
||||||
|
editable_headers = self._trad.get_dict("table_headers")
|
||||||
|
else:
|
||||||
|
editable_headers = []
|
||||||
|
|
||||||
|
self._data.header = ["time", "temperature"]
|
||||||
|
|
||||||
|
headers = {}
|
||||||
|
for h in self._data.header:
|
||||||
|
headers[h] = table_headers[h]
|
||||||
|
|
||||||
|
self._delegate_time = PamhyrExTimeDelegate(
|
||||||
|
data=self._data,
|
||||||
|
mode=self._study.time_system,
|
||||||
|
parent=self
|
||||||
|
)
|
||||||
|
|
||||||
|
table = self.find(QTableView, "tableView")
|
||||||
|
self._table = TableModel(
|
||||||
|
table_view=table,
|
||||||
|
table_headers=headers,
|
||||||
|
editable_headers=editable_headers,
|
||||||
|
delegates={
|
||||||
|
# "time": self._delegate_time,
|
||||||
|
},
|
||||||
|
data=self._data,
|
||||||
|
undo=self._undo_stack,
|
||||||
|
opt_data=self._study.time_system,
|
||||||
|
study=self._study
|
||||||
|
)
|
||||||
|
|
||||||
|
table.setModel(self._table)
|
||||||
|
table.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||||
|
table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
|
||||||
|
table.setAlternatingRowColors(True)
|
||||||
|
|
||||||
|
def setup_plot(self):
|
||||||
|
self.canvas = MplCanvas(width=5, height=4, dpi=100)
|
||||||
|
self.canvas.setObjectName("canvas")
|
||||||
|
self.toolbar = PamhyrPlotToolbar(
|
||||||
|
self.canvas, self
|
||||||
|
)
|
||||||
|
self.verticalLayout.addWidget(self.toolbar)
|
||||||
|
self.verticalLayout.addWidget(self.canvas)
|
||||||
|
|
||||||
|
self.plot = Plot(
|
||||||
|
canvas=self.canvas,
|
||||||
|
data=self._data,
|
||||||
|
mode=self._study.time_system,
|
||||||
|
trad=self._trad,
|
||||||
|
toolbar=self.toolbar,
|
||||||
|
)
|
||||||
|
self.plot.draw()
|
||||||
|
|
||||||
|
def setup_connections(self):
|
||||||
|
if self._study.is_editable():
|
||||||
|
self.find(QAction, "action_add").triggered.connect(self.add)
|
||||||
|
self.find(QAction, "action_del").triggered.connect(self.delete)
|
||||||
|
self.find(QAction, "action_sort").triggered.connect(self.sort)
|
||||||
|
self._table.dataChanged.connect(self.update)
|
||||||
|
|
||||||
|
def _propagated_update(self, key=Modules(0)):
|
||||||
|
if Modules.STUDY in key:
|
||||||
|
self._table.layoutChanged.emit()
|
||||||
|
self.plot.update()
|
||||||
|
|
||||||
|
def update(self):
|
||||||
|
self.plot.update()
|
||||||
|
self.plot.fit_to_data()
|
||||||
|
|
||||||
|
def index_selected_row(self):
|
||||||
|
table = self.find(QTableView, "tableView")
|
||||||
|
return table.selectionModel()\
|
||||||
|
.selectedRows()[0]\
|
||||||
|
.row()
|
||||||
|
|
||||||
|
def index_selected_rows(self):
|
||||||
|
table = self.find(QTableView, "tableView")
|
||||||
|
return list(
|
||||||
|
# Delete duplicate
|
||||||
|
set(
|
||||||
|
map(
|
||||||
|
lambda i: i.row(),
|
||||||
|
table.selectedIndexes()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def add(self):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
if len(self._data) == 0 or len(rows) == 0:
|
||||||
|
self._table.add(0)
|
||||||
|
else:
|
||||||
|
self._table.add(rows[0])
|
||||||
|
|
||||||
|
self.plot.update()
|
||||||
|
|
||||||
|
def delete(self):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
if len(rows) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
self._table.delete(rows)
|
||||||
|
self.plot.update()
|
||||||
|
|
||||||
|
def sort(self):
|
||||||
|
self._table.sort(False)
|
||||||
|
self.plot.update()
|
||||||
|
|
||||||
|
def _copy(self):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
|
||||||
|
table = []
|
||||||
|
table.append(self._data.header)
|
||||||
|
|
||||||
|
data = self._data.data
|
||||||
|
for row in rows:
|
||||||
|
table.append(list(data[row]))
|
||||||
|
|
||||||
|
self.copyTableIntoClipboard(table)
|
||||||
|
|
||||||
|
def _paste(self):
|
||||||
|
header, data = self.parseClipboardTable()
|
||||||
|
|
||||||
|
logger.debug(f"paste: h:{header}, d:{data}")
|
||||||
|
|
||||||
|
if len(data) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
row = 0
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
if len(rows) != 0:
|
||||||
|
row = rows[0]
|
||||||
|
|
||||||
|
self._table.paste(row, header, data)
|
||||||
|
self.plot.update()
|
||||||
|
|
||||||
|
def _undo(self):
|
||||||
|
self._table.undo()
|
||||||
|
self.plot.update()
|
||||||
|
|
||||||
|
def _redo(self):
|
||||||
|
self._table.redo()
|
||||||
|
self.plot.update()
|
||||||
+10
-10
@@ -1,5 +1,5 @@
|
|||||||
# translate.py -- Pamhyr
|
# translate.py -- Pamhyr
|
||||||
# Copyright (C) 2023-2026 INRAE
|
# Copyright (C) 2023-2025 INRAE
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -20,21 +20,21 @@ from PyQt5.QtCore import QCoreApplication
|
|||||||
|
|
||||||
from View.Translate import MainTranslate
|
from View.Translate import MainTranslate
|
||||||
|
|
||||||
|
from View.BoundaryCondition.translate import BCTranslate
|
||||||
|
|
||||||
_translate = QCoreApplication.translate
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
|
||||||
class OutputRKAdisTSTranslate(MainTranslate):
|
class BCETranslate(BCTranslate):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super(OutputRKAdisTSTranslate, self).__init__()
|
super(BCETranslate, self).__init__()
|
||||||
|
|
||||||
self._dict["Output RK"] = _translate(
|
self._dict["Edit Boundary Conditions Temperature"] = _translate(
|
||||||
"OutputRKAdisTS", "Output RK"
|
"BoundaryConditionsTemperature",
|
||||||
|
"Edit boundary conditions Temperature"
|
||||||
)
|
)
|
||||||
|
|
||||||
self._dict["x"] = _translate("OutputRKAdisTS", "X (m)")
|
|
||||||
|
|
||||||
self._sub_dict["table_headers"] = {
|
self._sub_dict["table_headers"] = {
|
||||||
"title": self._dict["title"],
|
"time": self._dict["time"],
|
||||||
"reach": self._dict["reach"],
|
"temperature": self._dict["unit_temperature"],
|
||||||
"rk": self._dict["unit_rk"],
|
|
||||||
}
|
}
|
||||||
+84
-88
@@ -1,5 +1,5 @@
|
|||||||
# Table.py -- Pamhyr
|
# Table.py -- Pamhyr
|
||||||
# Copyright (C) 2023-2026 INRAE
|
# Copyright (C) 2023-2025 INRAE
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -36,60 +36,36 @@ from PyQt5.QtWidgets import (
|
|||||||
|
|
||||||
from View.Tools.PamhyrTable import PamhyrTableModel
|
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||||
|
|
||||||
from View.OutputRKAdisTS.UndoCommand import (
|
from View.BoundaryConditionsTemperature.UndoCommand import (
|
||||||
SetTitleCommand, SetReachCommand, SetRKCommand,
|
SetNodeCommand, SetNameCommand,
|
||||||
SetEnabledCommand, AddCommand, DelCommand,
|
AddCommand, DelCommand
|
||||||
)
|
)
|
||||||
|
|
||||||
from functools import reduce
|
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
_translate = QCoreApplication.translate
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
|
||||||
class ComboBoxDelegate(QItemDelegate):
|
class ComboBoxDelegate(QItemDelegate):
|
||||||
def __init__(self, data=None, trad=None, parent=None, mode="reaches"):
|
def __init__(self, data=None, mode="node", tab="",
|
||||||
|
trad=None, parent=None):
|
||||||
super(ComboBoxDelegate, self).__init__(parent)
|
super(ComboBoxDelegate, self).__init__(parent)
|
||||||
|
|
||||||
self._data = data
|
self._data = data
|
||||||
self._trad = trad
|
|
||||||
self._mode = mode
|
self._mode = mode
|
||||||
|
self._tab = tab
|
||||||
|
self._trad = trad
|
||||||
|
|
||||||
def createEditor(self, parent, option, index):
|
def createEditor(self, parent, option, index):
|
||||||
self.editor = QComboBox(parent)
|
self.editor = QComboBox(parent)
|
||||||
|
|
||||||
val = []
|
if self._mode == "node":
|
||||||
if self._mode == "rk":
|
self.editor.addItems(
|
||||||
reach_id = self._data.Output_rk_adists \
|
[self._trad["not_associated"]] +
|
||||||
.get(index.row()) \
|
self._data.nodes_names()
|
||||||
.reach
|
|
||||||
|
|
||||||
if reach_id is not None:
|
|
||||||
reach = next(
|
|
||||||
filter(
|
|
||||||
lambda edge: edge.id == reach_id, self._data.edges()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
val = list(
|
|
||||||
map(
|
|
||||||
lambda rk: str(rk), reach.reach.get_rk()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
val = list(
|
|
||||||
map(
|
|
||||||
lambda n: n.name, self._data.edges()
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
self.editor.addItems(
|
self.editor.setCurrentText(index.data(Qt.DisplayRole))
|
||||||
[self._trad['not_associated']] +
|
|
||||||
val
|
|
||||||
)
|
|
||||||
|
|
||||||
self.editor.setCurrentText(str(index.data(Qt.DisplayRole)))
|
|
||||||
return self.editor
|
return self.editor
|
||||||
|
|
||||||
def setEditorData(self, editor, index):
|
def setEditorData(self, editor, index):
|
||||||
@@ -115,10 +91,27 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
|
|
||||||
|
|
||||||
class TableModel(PamhyrTableModel):
|
class TableModel(PamhyrTableModel):
|
||||||
def _setup_lst(self):
|
def __init__(self, bc_list=None, trad=None, **kwargs):
|
||||||
self._lst = self._data._Output_rk_adists
|
self._trad = trad
|
||||||
|
self._bc_list = bc_list
|
||||||
|
|
||||||
def rowCount(self, parent):
|
super(TableModel, self).__init__(trad=trad, **kwargs)
|
||||||
|
|
||||||
|
def _setup_lst(self):
|
||||||
|
self._lst = self._bc_list.lst
|
||||||
|
|
||||||
|
def get(self, row):
|
||||||
|
if row < 0 or row >= len(self._lst):
|
||||||
|
return None
|
||||||
|
return self._lst[row]
|
||||||
|
|
||||||
|
def _global_row(self, row):
|
||||||
|
bc = self.get(row)
|
||||||
|
if bc is None:
|
||||||
|
return None
|
||||||
|
return self._bc_list.index(bc)
|
||||||
|
|
||||||
|
def rowCount(self, parent=QModelIndex()):
|
||||||
return len(self._lst)
|
return len(self._lst)
|
||||||
|
|
||||||
def data(self, index, role):
|
def data(self, index, role):
|
||||||
@@ -128,20 +121,20 @@ class TableModel(PamhyrTableModel):
|
|||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
if self._headers[column] == "title":
|
if self._headers[column] == "name":
|
||||||
return self._lst.get(row).title
|
n = self._lst[row].name
|
||||||
elif self._headers[column] == "reach":
|
if n is None or n == "":
|
||||||
n = self._lst.get(row).reach
|
return self._trad["default"]
|
||||||
if n is None:
|
|
||||||
return self._trad['not_associated']
|
|
||||||
return next(filter(
|
|
||||||
lambda edge: edge.id == n, self._data.edges())
|
|
||||||
).name
|
|
||||||
elif self._headers[column] == "rk":
|
|
||||||
n = self._lst.get(row).rk
|
|
||||||
if n is None:
|
|
||||||
return self._trad['not_associated']
|
|
||||||
return n
|
return n
|
||||||
|
elif self._headers[column] == "node":
|
||||||
|
n = self._lst[row].node
|
||||||
|
if n is None:
|
||||||
|
return self._trad["not_associated"]
|
||||||
|
tmp = next(filter(lambda x: x.id == n, self._data._nodes), None)
|
||||||
|
if tmp is not None:
|
||||||
|
return tmp.name
|
||||||
|
else:
|
||||||
|
return self._trad["not_associated"]
|
||||||
|
|
||||||
return QVariant()
|
return QVariant()
|
||||||
|
|
||||||
@@ -154,76 +147,79 @@ class TableModel(PamhyrTableModel):
|
|||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
na = self._trad['not_associated']
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if self._headers[column] == "title":
|
if self._headers[column] == "name":
|
||||||
|
global_row = self._global_row(row)
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
SetTitleCommand(
|
SetNameCommand(
|
||||||
self._lst, row, value
|
self._bc_list, global_row, value
|
||||||
|
)
|
||||||
|
)
|
||||||
|
elif self._headers[column] == "node":
|
||||||
|
global_row = self._global_row(row)
|
||||||
|
node = next(
|
||||||
|
filter(lambda n: n.name == value, self._data.nodes()),
|
||||||
|
None
|
||||||
|
)
|
||||||
|
self._undo.push(
|
||||||
|
SetNodeCommand(
|
||||||
|
self._bc_list, global_row, node
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
elif self._headers[column] == "reach":
|
|
||||||
if value == na:
|
|
||||||
value = None
|
|
||||||
|
|
||||||
self._undo.push(
|
|
||||||
SetReachCommand(
|
|
||||||
self._lst, row, self._data.edge(value)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
elif self._headers[column] == "rk":
|
|
||||||
if value == na:
|
|
||||||
value = None
|
|
||||||
|
|
||||||
self._undo.push(
|
|
||||||
SetRKCommand(
|
|
||||||
self._lst, row, value
|
|
||||||
)
|
|
||||||
)
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.info(e)
|
logger.info(e)
|
||||||
logger.debug(traceback.format_exc())
|
logger.debug(traceback.format_exc())
|
||||||
|
|
||||||
self.dataChanged.emit(index, index)
|
if self._headers[column] == "node" and self.rowCount() > 0:
|
||||||
|
self.dataChanged.emit(
|
||||||
|
self.index(0, column),
|
||||||
|
self.index(self.rowCount() - 1, column)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self.dataChanged.emit(index, index)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def add(self, row, parent=QModelIndex()):
|
def add(self, row, parent=QModelIndex()):
|
||||||
self.beginInsertRows(parent, row, row - 1)
|
row = len(self._lst)
|
||||||
|
self.beginInsertRows(parent, row, row)
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
AddCommand(
|
AddCommand(
|
||||||
self._lst, row
|
self._bc_list, len(self._bc_list)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
self._setup_lst()
|
||||||
self.endInsertRows()
|
self.endInsertRows()
|
||||||
self.layoutChanged.emit()
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
def delete(self, rows, parent=QModelIndex()):
|
def delete(self, rows, parent=QModelIndex()):
|
||||||
self.beginRemoveRows(parent, rows[0], rows[-1])
|
self.beginRemoveRows(parent, rows[0], rows[-1])
|
||||||
|
|
||||||
|
row_by_bc = {
|
||||||
|
id(bc): row for row, bc in enumerate(self._bc_list._lst)
|
||||||
|
}
|
||||||
|
global_rows = [
|
||||||
|
row_by_bc[id(self._lst[row])]
|
||||||
|
for row in rows
|
||||||
|
if 0 <= row < len(self._lst)
|
||||||
|
]
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
DelCommand(
|
DelCommand(
|
||||||
self._lst, rows
|
self._bc_list, global_rows
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
self._setup_lst()
|
||||||
self.endRemoveRows()
|
self.endRemoveRows()
|
||||||
self.layoutChanged.emit()
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
def enabled(self, row, enabled, parent=QModelIndex()):
|
|
||||||
self._undo.push(
|
|
||||||
SetEnabledCommand(
|
|
||||||
self._lst, row, enabled
|
|
||||||
)
|
|
||||||
)
|
|
||||||
self.layoutChanged.emit()
|
|
||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._undo.undo()
|
self._undo.undo()
|
||||||
|
self._setup_lst()
|
||||||
self.layoutChanged.emit()
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._undo.redo()
|
self._undo.redo()
|
||||||
|
self._setup_lst()
|
||||||
self.layoutChanged.emit()
|
self.layoutChanged.emit()
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
# UndoCommand.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from copy import deepcopy
|
||||||
|
from tools import trace, timer
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QMessageBox, QUndoCommand, QUndoStack,
|
||||||
|
)
|
||||||
|
|
||||||
|
from Model.BoundaryConditionsTemperature.BoundaryConditionTemperature \
|
||||||
|
import BoundaryConditionTemperature
|
||||||
|
from Model.BoundaryConditionsTemperature.BoundaryConditionsTemperatureList \
|
||||||
|
import BoundaryConditionsTemperatureList
|
||||||
|
|
||||||
|
|
||||||
|
class SetNodeCommand(QUndoCommand):
|
||||||
|
def __init__(self, bcs, index, node):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._bcs = bcs
|
||||||
|
self._index = index
|
||||||
|
self._old = self._bcs.get(self._index).node
|
||||||
|
self._new = node.id if node is not None else None
|
||||||
|
self._previous = next(
|
||||||
|
(
|
||||||
|
bc for i, bc in enumerate(self._bcs.lst)
|
||||||
|
if i != self._index and bc.node == self._new
|
||||||
|
),
|
||||||
|
None
|
||||||
|
)
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
self._bcs.get(self._index).node = self._old
|
||||||
|
if self._previous is not None:
|
||||||
|
self._previous.node = self._new
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
self._bcs.get(self._index).node = self._new
|
||||||
|
if self._previous is not None:
|
||||||
|
self._previous.node = None
|
||||||
|
|
||||||
|
|
||||||
|
class SetNameCommand(QUndoCommand):
|
||||||
|
def __init__(self, bcs, index, name):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._bcs = bcs
|
||||||
|
self._index = index
|
||||||
|
self._name = name
|
||||||
|
self._old = self._bcs.get(self._index).name
|
||||||
|
self._new = self._name
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
self._bcs.get(self._index).name = self._old
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
self._bcs.get(self._index).name = self._new
|
||||||
|
|
||||||
|
|
||||||
|
class AddCommand(QUndoCommand):
|
||||||
|
def __init__(self, bcs, index):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._bcs = bcs
|
||||||
|
self._index = index
|
||||||
|
self._new = None
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
self._bcs.delete_i([self._index])
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
if self._new is None:
|
||||||
|
self._new = self._bcs.new(self._index)
|
||||||
|
else:
|
||||||
|
self._bcs.insert(self._index, self._new)
|
||||||
|
|
||||||
|
|
||||||
|
class DelCommand(QUndoCommand):
|
||||||
|
def __init__(self, bcs, rows):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._bcs = bcs
|
||||||
|
self._rows = rows
|
||||||
|
|
||||||
|
self._bc = []
|
||||||
|
for row in rows:
|
||||||
|
self._bc.append((row, self._bcs._lst[row]))
|
||||||
|
self._bc.sort()
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
for row, el in self._bc:
|
||||||
|
self._bcs.insert(row, el)
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
self._bcs.delete_i(self._rows)
|
||||||
@@ -0,0 +1,192 @@
|
|||||||
|
# Window.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from tools import trace, timer, logger_exception
|
||||||
|
|
||||||
|
from View.Tools.PamhyrWindow import PamhyrWindow
|
||||||
|
|
||||||
|
from PyQt5.QtGui import (
|
||||||
|
QKeySequence,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5.QtCore import (
|
||||||
|
Qt, QVariant, QAbstractTableModel,
|
||||||
|
QCoreApplication, QModelIndex, pyqtSlot,
|
||||||
|
QRect,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QDialogButtonBox, QPushButton, QLineEdit,
|
||||||
|
QFileDialog, QTableView, QAbstractItemView,
|
||||||
|
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||||
|
QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
|
||||||
|
QWidget,
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.BoundaryConditionsTemperature.Table import (
|
||||||
|
TableModel, ComboBoxDelegate
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.Network.GraphWidget import GraphWidget
|
||||||
|
from View.BoundaryConditionsTemperature.translate import BCTemperatureTranslate
|
||||||
|
from View.BoundaryConditionsTemperature.Edit.Window \
|
||||||
|
import EditBoundaryConditionWindow
|
||||||
|
|
||||||
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class BoundaryConditionsTemperatureWindow(PamhyrWindow):
|
||||||
|
_pamhyr_ui = "BoundaryConditionsTemperature"
|
||||||
|
_pamhyr_name = "Boundary conditions temperature"
|
||||||
|
|
||||||
|
def __init__(self, data=None, study=None,
|
||||||
|
config=None, parent=None):
|
||||||
|
self._data = data
|
||||||
|
trad = BCTemperatureTranslate()
|
||||||
|
|
||||||
|
name = (
|
||||||
|
trad[self._pamhyr_name] +
|
||||||
|
" - " + study.name
|
||||||
|
)
|
||||||
|
|
||||||
|
super(BoundaryConditionsTemperatureWindow, self).__init__(
|
||||||
|
title=name,
|
||||||
|
study=study,
|
||||||
|
config=config,
|
||||||
|
trad=trad,
|
||||||
|
parent=parent
|
||||||
|
)
|
||||||
|
|
||||||
|
self._bcs = self._study.river.boundary_conditions_temperature
|
||||||
|
|
||||||
|
self.setup_graph()
|
||||||
|
self.setup_table()
|
||||||
|
self.setup_connections()
|
||||||
|
|
||||||
|
def setup_table(self):
|
||||||
|
self._delegate_node = ComboBoxDelegate(
|
||||||
|
trad=self._trad,
|
||||||
|
data=self._study.river,
|
||||||
|
mode="node",
|
||||||
|
parent=self
|
||||||
|
)
|
||||||
|
|
||||||
|
if self._study.is_editable():
|
||||||
|
editable_headers = self._trad.get_dict("table_headers")
|
||||||
|
else:
|
||||||
|
editable_headers = []
|
||||||
|
|
||||||
|
table = self.find(QTableView, f"tableView")
|
||||||
|
self._table = TableModel(
|
||||||
|
table_view=table,
|
||||||
|
table_headers=self._trad.get_dict("table_headers"),
|
||||||
|
editable_headers=editable_headers,
|
||||||
|
delegates={
|
||||||
|
"node": self._delegate_node,
|
||||||
|
},
|
||||||
|
trad=self._trad,
|
||||||
|
bc_list=self._study.river.boundary_conditions_temperature,
|
||||||
|
undo=self._undo_stack,
|
||||||
|
data=self._study.river
|
||||||
|
)
|
||||||
|
table.setModel(self._table)
|
||||||
|
table.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||||
|
table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
|
||||||
|
table.setAlternatingRowColors(True)
|
||||||
|
|
||||||
|
def setup_graph(self):
|
||||||
|
self.graph_widget = GraphWidget(
|
||||||
|
self._study.river,
|
||||||
|
min_size=None, size=(200, 200),
|
||||||
|
only_display=True,
|
||||||
|
parent=self
|
||||||
|
)
|
||||||
|
self.graph_layout = self.find(QVBoxLayout, "verticalLayout")
|
||||||
|
self.graph_layout.addWidget(self.graph_widget)
|
||||||
|
|
||||||
|
def setup_connections(self):
|
||||||
|
if self._study.is_editable():
|
||||||
|
self.find(QAction, "action_add").triggered.connect(self.add)
|
||||||
|
self.find(QAction, "action_del").triggered.connect(self.delete)
|
||||||
|
|
||||||
|
self.find(QAction, "action_edit").triggered.connect(self.edit)
|
||||||
|
|
||||||
|
def index_selected_row(self):
|
||||||
|
table = self.find(QTableView, f"tableView")
|
||||||
|
return table.selectionModel()\
|
||||||
|
.selectedRows()[0]\
|
||||||
|
.row()
|
||||||
|
|
||||||
|
def index_selected_rows(self):
|
||||||
|
table = self.find(QTableView, f"tableView")
|
||||||
|
return list(
|
||||||
|
# Delete duplicate
|
||||||
|
set(
|
||||||
|
map(
|
||||||
|
lambda i: i.row(),
|
||||||
|
table.selectedIndexes()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def add(self):
|
||||||
|
self._table.add(self._table.rowCount())
|
||||||
|
|
||||||
|
def delete(self):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
if len(rows) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
self._table.delete(rows)
|
||||||
|
|
||||||
|
def _copy(self):
|
||||||
|
logger.info("TODO: copy")
|
||||||
|
|
||||||
|
def _paste(self):
|
||||||
|
logger.info("TODO: paste")
|
||||||
|
|
||||||
|
def _undo(self):
|
||||||
|
self._table.undo()
|
||||||
|
|
||||||
|
def _redo(self):
|
||||||
|
self._table.redo()
|
||||||
|
|
||||||
|
def edit(self):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
for row in rows:
|
||||||
|
data = self._table.get(row)
|
||||||
|
|
||||||
|
if data.node is None:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if self.sub_window_exists(
|
||||||
|
EditBoundaryConditionWindow,
|
||||||
|
data=[self._study, None, data]
|
||||||
|
):
|
||||||
|
continue
|
||||||
|
|
||||||
|
win = EditBoundaryConditionWindow(
|
||||||
|
data=data,
|
||||||
|
study=self._study,
|
||||||
|
parent=self
|
||||||
|
)
|
||||||
|
win.show()
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# Adists.py -- Pamhyr study checkers
|
# translate.py -- Pamhyr
|
||||||
# Copyright (C) 2023-2026 INRAE
|
# Copyright (C) 2023-2025 INRAE
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# This program is free software: you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -16,37 +16,25 @@
|
|||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import time
|
|
||||||
import logging
|
|
||||||
from functools import reduce
|
|
||||||
|
|
||||||
from PyQt5.QtCore import QCoreApplication
|
from PyQt5.QtCore import QCoreApplication
|
||||||
|
|
||||||
from Modules import Modules
|
from View.Translate import MainTranslate
|
||||||
from Checker.Checker import AbstractModelChecker, STATUS
|
|
||||||
|
|
||||||
_translate = QCoreApplication.translate
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
logger = logging.getLogger()
|
|
||||||
|
|
||||||
|
class BCTemperatureTranslate(MainTranslate):
|
||||||
class AdistsOutputRKChecker(AbstractModelChecker):
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super(AdistsOutputRKChecker, self).__init__()
|
super(BCTemperatureTranslate, self).__init__()
|
||||||
|
|
||||||
self._name = _translate("Checker", "AdisTS output RK checker")
|
self._dict["Boundary conditions temperature"] = _translate(
|
||||||
self._description = _translate(
|
"BoundaryConditionsTemperature", "Boundary conditions temperature"
|
||||||
"Checker", "Check output RK"
|
)
|
||||||
|
self._dict["default"] = _translate(
|
||||||
|
"BoundaryConditionsTemperature", "default"
|
||||||
)
|
)
|
||||||
self._modules = Modules.OUTPUT_RK
|
|
||||||
|
|
||||||
def run(self, study):
|
self._sub_dict["table_headers"] = {
|
||||||
ok = True
|
"name": self._dict["name"],
|
||||||
nerror = 0
|
"node": _translate("BoundaryCondition", "Node"),
|
||||||
self._summary = "ok"
|
}
|
||||||
self._status = STATUS.OK
|
|
||||||
|
|
||||||
if not self.basic_check(study):
|
|
||||||
return False
|
|
||||||
|
|
||||||
return ok
|
|
||||||
@@ -53,12 +53,13 @@ class CheckListWindowAdisTS(PamhyrWindow):
|
|||||||
|
|
||||||
def __init__(self, autorun: bool = True,
|
def __init__(self, autorun: bool = True,
|
||||||
study=None, config=None,
|
study=None, config=None,
|
||||||
solver=None, parent=None, mage_rep=None):
|
solver=None, parent=None, mage_rep=None, mode="adists"):
|
||||||
trad = CheckListTranslate()
|
trad = CheckListTranslate()
|
||||||
|
|
||||||
self._autorun = autorun
|
self._autorun = autorun
|
||||||
self._solver = solver
|
self._solver = solver
|
||||||
self._mage_rep = mage_rep
|
self._mage_rep = mage_rep
|
||||||
|
self._mode = mode
|
||||||
|
|
||||||
name = trad[self._pamhyr_name] + " - " + study.name
|
name = trad[self._pamhyr_name] + " - " + study.name
|
||||||
|
|
||||||
@@ -73,6 +74,8 @@ class CheckListWindowAdisTS(PamhyrWindow):
|
|||||||
|
|
||||||
# Add solver to hash computation data
|
# Add solver to hash computation data
|
||||||
self._hash_data.append(self._solver)
|
self._hash_data.append(self._solver)
|
||||||
|
self._hash_data.append(self._mage_rep)
|
||||||
|
self._hash_data.append(self._mode)
|
||||||
|
|
||||||
self._checker_list = (
|
self._checker_list = (
|
||||||
self._study.checkers() +
|
self._study.checkers() +
|
||||||
@@ -169,7 +172,7 @@ class CheckListWindowAdisTS(PamhyrWindow):
|
|||||||
if not errors:
|
if not errors:
|
||||||
self.find(QPushButton, "pushButton_ok").setEnabled(True)
|
self.find(QPushButton, "pushButton_ok").setEnabled(True)
|
||||||
if self._autorun:
|
if self._autorun:
|
||||||
self._parent.solver_log_adists(self._solver, self._mage_rep)
|
self.open_solver_log()
|
||||||
self.end()
|
self.end()
|
||||||
|
|
||||||
self.update_statusbar()
|
self.update_statusbar()
|
||||||
@@ -196,5 +199,11 @@ class CheckListWindowAdisTS(PamhyrWindow):
|
|||||||
self.end()
|
self.end()
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
self._parent.solver_log_adists(self._solver, self._mage_rep)
|
self.open_solver_log()
|
||||||
# self.end()
|
# self.end()
|
||||||
|
|
||||||
|
def open_solver_log(self):
|
||||||
|
if self._mode == "adistt":
|
||||||
|
self._parent.solver_log_adistt(self._solver, self._mage_rep)
|
||||||
|
else:
|
||||||
|
self._parent.solver_log_adists(self._solver, self._mage_rep)
|
||||||
@@ -43,6 +43,7 @@ from PyQt5.QtWidgets import (
|
|||||||
QDialogButtonBox, QPushButton, QLineEdit,
|
QDialogButtonBox, QPushButton, QLineEdit,
|
||||||
QFileDialog, QTableView, QAbstractItemView,
|
QFileDialog, QTableView, QAbstractItemView,
|
||||||
QComboBox, QUndoStack, QShortcut, QHeaderView,
|
QComboBox, QUndoStack, QShortcut, QHeaderView,
|
||||||
|
QCheckBox,
|
||||||
)
|
)
|
||||||
|
|
||||||
from Modules import Modules
|
from Modules import Modules
|
||||||
@@ -119,11 +120,17 @@ class ConfigureWindow(PamhyrDialog):
|
|||||||
editable_headers=["name", "comment", "minor", "medium"],
|
editable_headers=["name", "comment", "minor", "medium"],
|
||||||
data=self._stricklers,
|
data=self._stricklers,
|
||||||
undo=self._undo_stack,
|
undo=self._undo_stack,
|
||||||
|
trad=self._trad_stricklers,
|
||||||
|
display_manning=self._config.display_manning,
|
||||||
|
unique_names=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
def setup_data(self):
|
def setup_data(self):
|
||||||
# Backup
|
# Backup
|
||||||
self.set_check_box("checkBox_backup", self._config.backup_enable)
|
self.set_check_box("checkBox_backup", self._config.backup_enable)
|
||||||
|
self.set_check_box(
|
||||||
|
"checkBox_display_manning", self._config.display_manning
|
||||||
|
)
|
||||||
# self.set_line_edit_text("lineEdit_backup_path",
|
# self.set_line_edit_text("lineEdit_backup_path",
|
||||||
# self._config.backup_path)
|
# self._config.backup_path)
|
||||||
self.set_time_edit("timeEdit_backup_frequence",
|
self.set_time_edit("timeEdit_backup_frequence",
|
||||||
@@ -167,6 +174,10 @@ class ConfigureWindow(PamhyrDialog):
|
|||||||
for button in buttons:
|
for button in buttons:
|
||||||
self.find(QPushButton, button).clicked.connect(buttons[button])
|
self.find(QPushButton, button).clicked.connect(buttons[button])
|
||||||
|
|
||||||
|
self.find(QCheckBox, "checkBox_display_manning").stateChanged.connect(
|
||||||
|
self.update_stricklers_display
|
||||||
|
)
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
# Solvers
|
# Solvers
|
||||||
self._config.solvers = self.solver_table_model._data.copy()
|
self._config.solvers = self.solver_table_model._data.copy()
|
||||||
@@ -178,6 +189,9 @@ class ConfigureWindow(PamhyrDialog):
|
|||||||
self._config.backup_frequence = self.get_time_edit(
|
self._config.backup_frequence = self.get_time_edit(
|
||||||
"timeEdit_backup_frequence"
|
"timeEdit_backup_frequence"
|
||||||
)
|
)
|
||||||
|
self._config.display_manning = self.get_check_box(
|
||||||
|
"checkBox_display_manning"
|
||||||
|
)
|
||||||
# self._config.backup_max = self.get_spin_box("spinBox_backup_max")
|
# self._config.backup_max = self.get_spin_box("spinBox_backup_max")
|
||||||
|
|
||||||
# Stricklers
|
# Stricklers
|
||||||
@@ -237,6 +251,12 @@ class ConfigureWindow(PamhyrDialog):
|
|||||||
|
|
||||||
# Stricklers
|
# Stricklers
|
||||||
|
|
||||||
|
def update_stricklers_display(self):
|
||||||
|
self._stricklers_table.display_manning = self.get_check_box(
|
||||||
|
"checkBox_display_manning"
|
||||||
|
)
|
||||||
|
self._stricklers_table.layoutChanged.emit()
|
||||||
|
|
||||||
def index_selected_rows_strikclers(self):
|
def index_selected_rows_strikclers(self):
|
||||||
table = self.find(QTableView, f"tableView_stricklers")
|
table = self.find(QTableView, f"tableView_stricklers")
|
||||||
return list(
|
return list(
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
else:
|
else:
|
||||||
val = list(
|
val = list(
|
||||||
map(
|
map(
|
||||||
lambda n: n.name, self._data.edges()
|
lambda n: n.name, self._data.enable_edges()
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -123,9 +123,16 @@ class D90TableModel(PamhyrTableModel):
|
|||||||
self._undo.indexChanged.connect(lambda _: self.update())
|
self._undo.indexChanged.connect(lambda _: self.update())
|
||||||
|
|
||||||
def _setup_lst(self):
|
def _setup_lst(self):
|
||||||
|
enabled_reaches = {
|
||||||
|
reach.id for reach in self._river.enable_edges()
|
||||||
|
}
|
||||||
self._lst = list(
|
self._lst = list(
|
||||||
filter(
|
filter(
|
||||||
lambda d90: d90._deleted is False,
|
lambda d90: (
|
||||||
|
d90._deleted is False
|
||||||
|
and (d90.reach in (None, -1)
|
||||||
|
or d90.reach in enabled_reaches)
|
||||||
|
),
|
||||||
self._data._data
|
self._data._data
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
else:
|
else:
|
||||||
val = list(
|
val = list(
|
||||||
map(
|
map(
|
||||||
lambda n: n.name, self._data.edges()
|
lambda n: n.name, self._data.enable_edges()
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -125,9 +125,16 @@ class DIFTableModel(PamhyrTableModel):
|
|||||||
self._undo.indexChanged.connect(lambda _: self.update())
|
self._undo.indexChanged.connect(lambda _: self.update())
|
||||||
|
|
||||||
def _setup_lst(self):
|
def _setup_lst(self):
|
||||||
|
enabled_reaches = {
|
||||||
|
reach.id for reach in self._river.enable_edges()
|
||||||
|
}
|
||||||
self._lst = list(
|
self._lst = list(
|
||||||
filter(
|
filter(
|
||||||
lambda dif: dif._deleted is False,
|
lambda dif: (
|
||||||
|
dif._deleted is False
|
||||||
|
and (dif.reach in (None, -1)
|
||||||
|
or dif.reach in enabled_reaches)
|
||||||
|
),
|
||||||
self._data._data
|
self._data._data
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import logging
|
|||||||
|
|
||||||
from tools import timer, flatten
|
from tools import timer, flatten
|
||||||
from View.Tools.PamhyrPlot import PamhyrPlot
|
from View.Tools.PamhyrPlot import PamhyrPlot
|
||||||
|
from View.Tools.CoefficientDisplay import display_coefficient
|
||||||
|
|
||||||
from PyQt5.QtCore import (
|
from PyQt5.QtCore import (
|
||||||
QCoreApplication
|
QCoreApplication
|
||||||
@@ -32,7 +33,7 @@ _translate = QCoreApplication.translate
|
|||||||
|
|
||||||
class PlotStricklers(PamhyrPlot):
|
class PlotStricklers(PamhyrPlot):
|
||||||
def __init__(self, data=None, canvas=None, trad=None,
|
def __init__(self, data=None, canvas=None, trad=None,
|
||||||
toolbar=None, parent=None):
|
toolbar=None, display_manning=True, parent=None):
|
||||||
super(PlotStricklers, self).__init__(
|
super(PlotStricklers, self).__init__(
|
||||||
canvas=canvas,
|
canvas=canvas,
|
||||||
trad=trad,
|
trad=trad,
|
||||||
@@ -42,7 +43,11 @@ class PlotStricklers(PamhyrPlot):
|
|||||||
)
|
)
|
||||||
|
|
||||||
self.label_x = self._trad["rk"]
|
self.label_x = self._trad["rk"]
|
||||||
self.label_y = self._trad["strickler_plot"]
|
self._display_manning = display_manning
|
||||||
|
self.label_y = (
|
||||||
|
self._trad["manning_plot"] if display_manning
|
||||||
|
else self._trad["strickler_plot"]
|
||||||
|
)
|
||||||
|
|
||||||
self.line_rk_elevation = [None, None]
|
self.line_rk_elevation = [None, None]
|
||||||
|
|
||||||
@@ -113,8 +118,12 @@ class PlotStricklers(PamhyrPlot):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
coef_minor = list(map(lambda s: s.minor, coef))
|
coef_minor = [
|
||||||
coef_medium = list(map(lambda s: s.medium, coef))
|
display_coefficient(s.minor, self._display_manning) for s in coef
|
||||||
|
]
|
||||||
|
coef_medium = [
|
||||||
|
display_coefficient(s.medium, self._display_manning) for s in coef
|
||||||
|
]
|
||||||
|
|
||||||
self.line_rk_elevation[0] = self.canvas.axes.plot(
|
self.line_rk_elevation[0] = self.canvas.axes.plot(
|
||||||
rk, coef_minor,
|
rk, coef_minor,
|
||||||
|
|||||||
+81
-16
@@ -42,6 +42,7 @@ from View.Frictions.UndoCommand import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
from View.Tools.PamhyrTable import PamhyrTableModel
|
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||||
|
from View.Tools.CoefficientDisplay import display_strickler
|
||||||
|
|
||||||
from View.Frictions.translate import *
|
from View.Frictions.translate import *
|
||||||
|
|
||||||
@@ -51,30 +52,64 @@ _translate = QCoreApplication.translate
|
|||||||
|
|
||||||
|
|
||||||
class ComboBoxDelegate(QItemDelegate):
|
class ComboBoxDelegate(QItemDelegate):
|
||||||
def __init__(self, data=None, study=None,
|
def __init__(self, data=None, study=None, application_stricklers=None,
|
||||||
mode="stricklers", trad=None, parent=None):
|
mode="stricklers", trad=None, display_manning=True,
|
||||||
|
parent=None):
|
||||||
super(ComboBoxDelegate, self).__init__(parent)
|
super(ComboBoxDelegate, self).__init__(parent)
|
||||||
|
|
||||||
self._data = data
|
self._data = data
|
||||||
self._study = study
|
self._study = study
|
||||||
|
self._application_stricklers = application_stricklers or []
|
||||||
self._trad = trad
|
self._trad = trad
|
||||||
self._mode = mode
|
self._mode = mode
|
||||||
|
self._display_manning = display_manning
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def same_strickler(first, second):
|
||||||
|
return (
|
||||||
|
first.name == second.name
|
||||||
|
and first.comment == second.comment
|
||||||
|
and first.minor == second.minor
|
||||||
|
and first.medium == second.medium
|
||||||
|
)
|
||||||
|
|
||||||
def createEditor(self, parent, option, index):
|
def createEditor(self, parent, option, index):
|
||||||
self.editor = QComboBox(parent)
|
self.editor = QComboBox(parent)
|
||||||
|
|
||||||
if self._mode == "stricklers":
|
if self._mode == "stricklers":
|
||||||
self.editor.addItems(
|
self.editor.addItem(self._trad["not_defined"], None)
|
||||||
[self._trad["not_defined"]] +
|
study_stricklers = self._study.river.stricklers.stricklers
|
||||||
list(
|
for strickler in study_stricklers:
|
||||||
map(
|
self.editor.addItem(
|
||||||
lambda s: str(s),
|
display_strickler(strickler, self._display_manning),
|
||||||
self._study.river.stricklers.stricklers
|
strickler
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
application_stricklers = [
|
||||||
|
application_strickler
|
||||||
|
for application_strickler in self._application_stricklers
|
||||||
|
if not any(
|
||||||
|
self.same_strickler(
|
||||||
|
application_strickler, study_strickler
|
||||||
|
)
|
||||||
|
for study_strickler in study_stricklers
|
||||||
|
)
|
||||||
|
]
|
||||||
|
if application_stricklers:
|
||||||
|
self.editor.insertSeparator(self.editor.count())
|
||||||
|
for strickler in application_stricklers:
|
||||||
|
self.editor.addItem(
|
||||||
|
display_strickler(
|
||||||
|
strickler, self._display_manning
|
||||||
|
),
|
||||||
|
strickler
|
||||||
|
)
|
||||||
|
elif self._mode == "rk":
|
||||||
|
self.editor.addItems(
|
||||||
|
list(map(str, self._data.reach.get_rk()))
|
||||||
)
|
)
|
||||||
|
|
||||||
self.editor.setCurrentText(index.data(Qt.DisplayRole))
|
self.editor.setCurrentText(str(index.data(Qt.DisplayRole)))
|
||||||
return self.editor
|
return self.editor
|
||||||
|
|
||||||
def setEditorData(self, editor, index):
|
def setEditorData(self, editor, index):
|
||||||
@@ -82,8 +117,9 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
self.editor.currentTextChanged.connect(self.currentItemChanged)
|
self.editor.currentTextChanged.connect(self.currentItemChanged)
|
||||||
|
|
||||||
def setModelData(self, editor, model, index):
|
def setModelData(self, editor, model, index):
|
||||||
text = str(editor.currentText())
|
value = editor.currentData() if self._mode == "stricklers" else \
|
||||||
model.setData(index, text)
|
str(editor.currentText())
|
||||||
|
model.setData(index, value)
|
||||||
editor.close()
|
editor.close()
|
||||||
editor.deleteLater()
|
editor.deleteLater()
|
||||||
|
|
||||||
@@ -100,10 +136,33 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
|
|
||||||
|
|
||||||
class FrictionTableModel(PamhyrTableModel):
|
class FrictionTableModel(PamhyrTableModel):
|
||||||
|
def __init__(self, *args, display_manning=False, **kwargs):
|
||||||
|
self.display_manning = display_manning
|
||||||
|
super(FrictionTableModel, self).__init__(*args, **kwargs)
|
||||||
|
|
||||||
def _setup_lst(self):
|
def _setup_lst(self):
|
||||||
self._lst = self._data.frictions
|
self._lst = self._data.frictions
|
||||||
self._study = self._opt_data
|
self._study = self._opt_data
|
||||||
|
|
||||||
|
def study_strickler(self, strickler):
|
||||||
|
if strickler is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
study_stricklers = self._study.river.stricklers
|
||||||
|
if any(s is strickler for s in study_stricklers.stricklers):
|
||||||
|
return strickler
|
||||||
|
|
||||||
|
for current in study_stricklers.stricklers:
|
||||||
|
if ComboBoxDelegate.same_strickler(current, strickler):
|
||||||
|
return current
|
||||||
|
|
||||||
|
copied = study_stricklers.new(len(study_stricklers))
|
||||||
|
copied.name = strickler.name
|
||||||
|
copied.comment = strickler.comment
|
||||||
|
copied.minor = strickler.minor
|
||||||
|
copied.medium = strickler.medium
|
||||||
|
return copied
|
||||||
|
|
||||||
def data(self, index, role):
|
def data(self, index, role):
|
||||||
if role != Qt.ItemDataRole.DisplayRole:
|
if role != Qt.ItemDataRole.DisplayRole:
|
||||||
return QVariant()
|
return QVariant()
|
||||||
@@ -121,12 +180,12 @@ class FrictionTableModel(PamhyrTableModel):
|
|||||||
value = self._lst.get(row).begin_strickler
|
value = self._lst.get(row).begin_strickler
|
||||||
if value is None:
|
if value is None:
|
||||||
return self._trad["not_defined"]
|
return self._trad["not_defined"]
|
||||||
return str(value)
|
return display_strickler(value, self.display_manning)
|
||||||
elif self._headers[column] == "end_strickler":
|
elif self._headers[column] == "end_strickler":
|
||||||
value = self._lst.get(row).end_strickler
|
value = self._lst.get(row).end_strickler
|
||||||
if value is None:
|
if value is None:
|
||||||
return self._trad["not_defined"]
|
return self._trad["not_defined"]
|
||||||
return str(value)
|
return display_strickler(value, self.display_manning)
|
||||||
|
|
||||||
return QVariant()
|
return QVariant()
|
||||||
|
|
||||||
@@ -160,15 +219,21 @@ class FrictionTableModel(PamhyrTableModel):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
elif self._headers[column] == "begin_strickler":
|
elif self._headers[column] == "begin_strickler":
|
||||||
|
strickler = value if hasattr(value, "minor") else \
|
||||||
|
self._study.river.strickler(value)
|
||||||
|
strickler = self.study_strickler(strickler)
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
SetBeginStricklerCommand(
|
SetBeginStricklerCommand(
|
||||||
self._lst, row, self._study.river.strickler(value)
|
self._lst, row, strickler
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
elif self._headers[column] == "end_strickler":
|
elif self._headers[column] == "end_strickler":
|
||||||
|
strickler = value if hasattr(value, "minor") else \
|
||||||
|
self._study.river.strickler(value)
|
||||||
|
strickler = self.study_strickler(strickler)
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
SetEndStricklerCommand(
|
SetEndStricklerCommand(
|
||||||
self._lst, row, self._study.river.strickler(value)
|
self._lst, row, strickler
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@@ -67,6 +67,9 @@ class FrictionsWindow(PamhyrWindow):
|
|||||||
def __init__(self, reach=None, study=None, config=None, parent=None):
|
def __init__(self, reach=None, study=None, config=None, parent=None):
|
||||||
trad = FrictionsTranslate()
|
trad = FrictionsTranslate()
|
||||||
|
|
||||||
|
if config is None and parent is not None:
|
||||||
|
config = getattr(parent, "conf", None)
|
||||||
|
|
||||||
if reach is not None:
|
if reach is not None:
|
||||||
self._reach = reach
|
self._reach = reach
|
||||||
else:
|
else:
|
||||||
@@ -101,8 +104,20 @@ class FrictionsWindow(PamhyrWindow):
|
|||||||
self._delegate_stricklers = ComboBoxDelegate(
|
self._delegate_stricklers = ComboBoxDelegate(
|
||||||
data=self._reach,
|
data=self._reach,
|
||||||
study=self._study,
|
study=self._study,
|
||||||
|
application_stricklers=(
|
||||||
|
self._config.stricklers.stricklers
|
||||||
|
if self._config is not None else []
|
||||||
|
),
|
||||||
mode="stricklers",
|
mode="stricklers",
|
||||||
trad=self._trad,
|
trad=self._trad,
|
||||||
|
display_manning=getattr(self._config, "display_manning", False),
|
||||||
|
parent=self
|
||||||
|
)
|
||||||
|
self._delegate_rk = ComboBoxDelegate(
|
||||||
|
data=self._reach,
|
||||||
|
study=self._study,
|
||||||
|
mode="rk",
|
||||||
|
trad=self._trad,
|
||||||
parent=self
|
parent=self
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -115,18 +130,27 @@ class FrictionsWindow(PamhyrWindow):
|
|||||||
editable_headers = []
|
editable_headers = []
|
||||||
|
|
||||||
table = self.find(QTableView, f"tableView")
|
table = self.find(QTableView, f"tableView")
|
||||||
|
table_headers = self._trad.get_dict("table_headers").copy()
|
||||||
|
table_headers["begin_strickler"] = (
|
||||||
|
self._trad["manning"]
|
||||||
|
if getattr(self._config, "display_manning", False)
|
||||||
|
else self._trad["strickler"]
|
||||||
|
)
|
||||||
self._table = FrictionTableModel(
|
self._table = FrictionTableModel(
|
||||||
table_view=table,
|
table_view=table,
|
||||||
table_headers=self._trad.get_dict("table_headers"),
|
table_headers=table_headers,
|
||||||
editable_headers=editable_headers,
|
editable_headers=editable_headers,
|
||||||
delegates={
|
delegates={
|
||||||
|
"begin_rk": self._delegate_rk,
|
||||||
|
"end_rk": self._delegate_rk,
|
||||||
"begin_strickler": self._delegate_stricklers,
|
"begin_strickler": self._delegate_stricklers,
|
||||||
"end_strickler": self._delegate_stricklers,
|
# "end_strickler": self._delegate_stricklers,
|
||||||
},
|
},
|
||||||
data=self._reach,
|
data=self._reach,
|
||||||
trad=self._trad,
|
trad=self._trad,
|
||||||
undo=self._undo_stack,
|
undo=self._undo_stack,
|
||||||
opt_data=self._study
|
opt_data=self._study,
|
||||||
|
display_manning=getattr(self._config, "display_manning", False)
|
||||||
)
|
)
|
||||||
table.setModel(self._table)
|
table.setModel(self._table)
|
||||||
table.setSelectionBehavior(QAbstractItemView.SelectRows)
|
table.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||||
@@ -158,7 +182,8 @@ class FrictionsWindow(PamhyrWindow):
|
|||||||
canvas=self.canvas_2,
|
canvas=self.canvas_2,
|
||||||
data=self._reach,
|
data=self._reach,
|
||||||
trad=self._trad,
|
trad=self._trad,
|
||||||
toolbar=None
|
toolbar=None,
|
||||||
|
display_manning=getattr(self._config, "display_manning", False)
|
||||||
)
|
)
|
||||||
self.plot_2.draw()
|
self.plot_2.draw()
|
||||||
|
|
||||||
@@ -198,9 +223,41 @@ class FrictionsWindow(PamhyrWindow):
|
|||||||
# self._propagate_update(key=Modules.FRICTION)
|
# self._propagate_update(key=Modules.FRICTION)
|
||||||
|
|
||||||
def _propagated_update(self, key=Modules(0)):
|
def _propagated_update(self, key=Modules(0)):
|
||||||
if Modules.GEOMETRY not in key:
|
if Modules.CONFIG in key:
|
||||||
return
|
self.update_config()
|
||||||
|
|
||||||
|
if Modules.GEOMETRY in key:
|
||||||
|
self.update_plot()
|
||||||
|
|
||||||
|
for _, window in self.sub_win_list:
|
||||||
|
window._propagated_update(key=key)
|
||||||
|
|
||||||
|
def update_config(self):
|
||||||
|
display_manning = getattr(
|
||||||
|
self._config, "display_manning", False
|
||||||
|
)
|
||||||
|
|
||||||
|
self._delegate_stricklers._application_stricklers = (
|
||||||
|
self._config.stricklers.stricklers
|
||||||
|
if self._config is not None else []
|
||||||
|
)
|
||||||
|
self._delegate_stricklers._display_manning = display_manning
|
||||||
|
|
||||||
|
self._table.display_manning = display_manning
|
||||||
|
self._table._table_headers["begin_strickler"] = (
|
||||||
|
self._trad["manning"] if display_manning
|
||||||
|
else self._trad["strickler"]
|
||||||
|
)
|
||||||
|
self._table.headerDataChanged.emit(
|
||||||
|
Qt.Horizontal, 0, self._table.columnCount() - 1
|
||||||
|
)
|
||||||
|
self._table.layoutChanged.emit()
|
||||||
|
|
||||||
|
self.plot_2._display_manning = display_manning
|
||||||
|
self.plot_2.label_y = (
|
||||||
|
self._trad["manning_plot"] if display_manning
|
||||||
|
else self._trad["strickler_plot"]
|
||||||
|
)
|
||||||
self.update_plot()
|
self.update_plot()
|
||||||
|
|
||||||
def _set_current_reach(self):
|
def _set_current_reach(self):
|
||||||
@@ -265,13 +322,13 @@ class FrictionsWindow(PamhyrWindow):
|
|||||||
def edit_stricklers(self):
|
def edit_stricklers(self):
|
||||||
if self.sub_window_exists(
|
if self.sub_window_exists(
|
||||||
StricklersWindow,
|
StricklersWindow,
|
||||||
data=[self._study, self.parent.conf]
|
data=[self._study, self._config]
|
||||||
):
|
):
|
||||||
return
|
return
|
||||||
|
|
||||||
strick = StricklersWindow(
|
strick = StricklersWindow(
|
||||||
study=self._study,
|
study=self._study,
|
||||||
config=self.parent.conf,
|
config=self._config,
|
||||||
parent=self
|
parent=self
|
||||||
)
|
)
|
||||||
strick.show()
|
strick.show()
|
||||||
|
|||||||
@@ -31,9 +31,18 @@ class FrictionsTranslate(MainTranslate):
|
|||||||
self._dict["strickler_plot"] = _translate(
|
self._dict["strickler_plot"] = _translate(
|
||||||
"Frictions", "Strickler ($m^{1/3}/s$)"
|
"Frictions", "Strickler ($m^{1/3}/s$)"
|
||||||
)
|
)
|
||||||
|
self._dict["manning_plot"] = _translate(
|
||||||
|
"Frictions", "Manning ($s/m^{1/3}$)"
|
||||||
|
)
|
||||||
self._dict["stricklers"] = _translate(
|
self._dict["stricklers"] = _translate(
|
||||||
"Frictions", "Stricklers"
|
"Frictions", "Stricklers"
|
||||||
)
|
)
|
||||||
|
self._dict["strickler"] = _translate(
|
||||||
|
"Frictions", "Strickler"
|
||||||
|
)
|
||||||
|
self._dict["manning"] = _translate(
|
||||||
|
"Frictions", "Manning"
|
||||||
|
)
|
||||||
|
|
||||||
self._dict["Edit frictions"] = _translate(
|
self._dict["Edit frictions"] = _translate(
|
||||||
"Frictions", "Edit frictions"
|
"Frictions", "Edit frictions"
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ class PlotAC(PamhyrPlot):
|
|||||||
profile_id = 0
|
profile_id = 0
|
||||||
|
|
||||||
profile = self.data.profile(profile_id)
|
profile = self.data.profile(profile_id)
|
||||||
if profile is None:
|
if profile is None or self._parent.tableView.isRowHidden(profile_id):
|
||||||
return
|
return
|
||||||
|
|
||||||
station = profile.get_station()
|
station = profile.get_station()
|
||||||
@@ -192,21 +192,24 @@ class PlotAC(PamhyrPlot):
|
|||||||
self.plot_selected.set_data([], [])
|
self.plot_selected.set_data([], [])
|
||||||
self.next_plot_selected.set_data([], [])
|
self.next_plot_selected.set_data([], [])
|
||||||
|
|
||||||
if 0 <= previous_id < self.data.number_profiles:
|
if (0 <= previous_id < self.data.number_profiles
|
||||||
|
and not self._parent.tableView.isRowHidden(previous_id)):
|
||||||
self.previous_plot_selected.set_data(
|
self.previous_plot_selected.set_data(
|
||||||
self.data.profile(previous_id).get_station(),
|
self.data.profile(previous_id).get_station(),
|
||||||
self.data.profile(previous_id).z()
|
self.data.profile(previous_id).z()
|
||||||
)
|
)
|
||||||
self.previous_plot_selected.set_visible(True)
|
self.previous_plot_selected.set_visible(True)
|
||||||
|
|
||||||
if 0 <= profile_id < self.data.number_profiles:
|
if (0 <= profile_id < self.data.number_profiles
|
||||||
|
and not self._parent.tableView.isRowHidden(profile_id)):
|
||||||
self.plot_selected.set_data(
|
self.plot_selected.set_data(
|
||||||
self.data.profile(profile_id).get_station(),
|
self.data.profile(profile_id).get_station(),
|
||||||
self.data.profile(profile_id).z()
|
self.data.profile(profile_id).z()
|
||||||
)
|
)
|
||||||
self.plot_selected.set_visible(True)
|
self.plot_selected.set_visible(True)
|
||||||
|
|
||||||
if 0 <= next_id < self.data.number_profiles:
|
if (0 <= next_id < self.data.number_profiles
|
||||||
|
and not self._parent.tableView.isRowHidden(next_id)):
|
||||||
self.next_plot_selected.set_data(
|
self.next_plot_selected.set_data(
|
||||||
self.data.profile(next_id).get_station(),
|
self.data.profile(next_id).get_station(),
|
||||||
self.data.profile(next_id).z()
|
self.data.profile(next_id).z()
|
||||||
|
|||||||
@@ -110,9 +110,9 @@ class PlotRKZ(PamhyrPlot):
|
|||||||
def _closest_rk(self, event):
|
def _closest_rk(self, event):
|
||||||
|
|
||||||
s = event.artist.get_segments()
|
s = event.artist.get_segments()
|
||||||
x = [i[0, 0] for i in s]
|
|
||||||
mx = event.mouseevent.xdata
|
mx = event.mouseevent.xdata
|
||||||
points = enumerate(x)
|
points = [(i, segment[0, 0]) for i, segment in enumerate(s)
|
||||||
|
if len(segment)]
|
||||||
|
|
||||||
def dist_mouse(point):
|
def dist_mouse(point):
|
||||||
x = point[1]
|
x = point[1]
|
||||||
@@ -136,6 +136,7 @@ class PlotRKZ(PamhyrPlot):
|
|||||||
if len(ind) == 0:
|
if len(ind) == 0:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
ind = [i for i in ind if not self._table.isRowHidden(i)]
|
||||||
for i in ind:
|
for i in ind:
|
||||||
index.append(QItemSelectionRange(self._table.model().index(i, 0)))
|
index.append(QItemSelectionRange(self._table.model().index(i, 0)))
|
||||||
|
|
||||||
@@ -150,18 +151,7 @@ class PlotRKZ(PamhyrPlot):
|
|||||||
self._table.scrollTo(self._table.model().index(ind[-1], 0))
|
self._table.scrollTo(self._table.model().index(ind[-1], 0))
|
||||||
|
|
||||||
def _select_range_in_table(self, ind1, ind2):
|
def _select_range_in_table(self, ind1, ind2):
|
||||||
if self._table is not None:
|
self._select_in_table(list(range(ind1, ind2 + 1)))
|
||||||
self._table.setFocus()
|
|
||||||
selection = self._table.selectionModel()
|
|
||||||
index = QItemSelection(self._table.model().index(ind1, 0),
|
|
||||||
self._table.model().index(ind2, 0))
|
|
||||||
selection.select(
|
|
||||||
index,
|
|
||||||
QItemSelectionModel.Rows |
|
|
||||||
QItemSelectionModel.ClearAndSelect |
|
|
||||||
QItemSelectionModel.Select
|
|
||||||
)
|
|
||||||
self._table.scrollTo(self._table.model().index(ind2, 0))
|
|
||||||
|
|
||||||
@timer
|
@timer
|
||||||
def redraw(self, data):
|
def redraw(self, data):
|
||||||
@@ -213,13 +203,23 @@ class PlotRKZ(PamhyrPlot):
|
|||||||
picker=10,
|
picker=10,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if self._table is not None:
|
||||||
|
segments = self.line_rk_zmin_zmax.get_segments()
|
||||||
|
self.line_rk_zmin_zmax.set_segments([
|
||||||
|
segment[:0] if self._table.isRowHidden(row) else segment
|
||||||
|
for row, segment in enumerate(segments)
|
||||||
|
])
|
||||||
|
|
||||||
def color_highlight(self):
|
def color_highlight(self):
|
||||||
rows = sorted(list(
|
rows = sorted(list(
|
||||||
set(
|
set(
|
||||||
(i.row() for i in self.parent.tableView.selectedIndexes())
|
(i.row() for i in self.parent.tableView.selectedIndexes())
|
||||||
)
|
)
|
||||||
))
|
))
|
||||||
colors = [self.color_plot for row in range(len(self._data))]
|
colors = [
|
||||||
|
"darkorange" if profile.interpolated else self.color_plot
|
||||||
|
for profile in self._data.profiles
|
||||||
|
]
|
||||||
style = ["-" for row in range(len(self._data))]
|
style = ["-" for row in range(len(self._data))]
|
||||||
if len(rows) > 0:
|
if len(rows) > 0:
|
||||||
for row in rows:
|
for row in rows:
|
||||||
|
|||||||
+15
-18
@@ -136,6 +136,7 @@ class PlotXY(PamhyrPlot):
|
|||||||
index = QItemSelection()
|
index = QItemSelection()
|
||||||
if len(ind) == 0:
|
if len(ind) == 0:
|
||||||
return
|
return
|
||||||
|
ind = [i for i in ind if not self._table.isRowHidden(i)]
|
||||||
for i in ind:
|
for i in ind:
|
||||||
index.append(QItemSelectionRange(self._table.model().index(i, 0)))
|
index.append(QItemSelectionRange(self._table.model().index(i, 0)))
|
||||||
selection.select(
|
selection.select(
|
||||||
@@ -149,18 +150,7 @@ class PlotXY(PamhyrPlot):
|
|||||||
self._table.scrollTo(self._table.model().index(ind[-1], 0))
|
self._table.scrollTo(self._table.model().index(ind[-1], 0))
|
||||||
|
|
||||||
def _select_range_in_table(self, ind1, ind2):
|
def _select_range_in_table(self, ind1, ind2):
|
||||||
if self._table is not None:
|
self._select_in_table(list(range(ind1, ind2 + 1)))
|
||||||
self._table.setFocus()
|
|
||||||
selection = self._table.selectionModel()
|
|
||||||
index = QItemSelection(self._table.model().index(ind1, 0),
|
|
||||||
self._table.model().index(ind2, 0))
|
|
||||||
selection.select(
|
|
||||||
index,
|
|
||||||
QItemSelectionModel.Rows |
|
|
||||||
QItemSelectionModel.ClearAndSelect |
|
|
||||||
QItemSelectionModel.Select
|
|
||||||
)
|
|
||||||
self._table.scrollTo(self._table.model().index(ind2, 0))
|
|
||||||
|
|
||||||
@timer
|
@timer
|
||||||
def redraw(self, data):
|
def redraw(self, data):
|
||||||
@@ -189,10 +179,14 @@ class PlotXY(PamhyrPlot):
|
|||||||
|
|
||||||
def draw_xy(self):
|
def draw_xy(self):
|
||||||
self.line_xy = []
|
self.line_xy = []
|
||||||
for xy in zip(self.data.get_x(), self.data.get_y()):
|
for row, profile in enumerate(self.data.profiles):
|
||||||
self.line_xy.append(np.column_stack(xy))
|
hidden = self._table is not None and self._table.isRowHidden(row)
|
||||||
|
self.line_xy.append(
|
||||||
|
np.empty((0, 2)) if hidden or len(profile) == 0
|
||||||
|
else np.column_stack((profile.x(), profile.y()))
|
||||||
|
)
|
||||||
|
|
||||||
self._colors, self._style = self.color_hightlight()
|
self._colors, self._style = self.color_highlight()
|
||||||
self.line_xy_collection = collections.LineCollection(
|
self.line_xy_collection = collections.LineCollection(
|
||||||
self.line_xy,
|
self.line_xy,
|
||||||
colors=self._colors,
|
colors=self._colors,
|
||||||
@@ -201,13 +195,16 @@ class PlotXY(PamhyrPlot):
|
|||||||
)
|
)
|
||||||
self.canvas.axes.add_collection(self.line_xy_collection)
|
self.canvas.axes.add_collection(self.line_xy_collection)
|
||||||
|
|
||||||
def color_hightlight(self):
|
def color_highlight(self):
|
||||||
rows = sorted(list(
|
rows = sorted(list(
|
||||||
set(
|
set(
|
||||||
(i.row() for i in self.parent.tableView.selectedIndexes())
|
(i.row() for i in self.parent.tableView.selectedIndexes())
|
||||||
)
|
)
|
||||||
))
|
))
|
||||||
colors = [self.color_plot for row in range(len(self._data))]
|
colors = [
|
||||||
|
"darkorange" if profile.interpolated else self.color_plot
|
||||||
|
for profile in self._data.profiles
|
||||||
|
]
|
||||||
style = ["-" for row in range(len(self._data))]
|
style = ["-" for row in range(len(self._data))]
|
||||||
if len(rows) > 0:
|
if len(rows) > 0:
|
||||||
for row in rows:
|
for row in rows:
|
||||||
@@ -320,7 +317,7 @@ class PlotXY(PamhyrPlot):
|
|||||||
|
|
||||||
def update_current(self):
|
def update_current(self):
|
||||||
if self._current_data_update:
|
if self._current_data_update:
|
||||||
self._colors, self._style = self.color_hightlight()
|
self._colors, self._style = self.color_highlight()
|
||||||
self.line_xy_collection.set_colors(self._colors)
|
self.line_xy_collection.set_colors(self._colors)
|
||||||
self.line_xy_collection.set_linestyle(self._style)
|
self.line_xy_collection.set_linestyle(self._style)
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,11 @@ class SetDataCommand(QUndoCommand):
|
|||||||
self._index = index
|
self._index = index
|
||||||
self._old = old_value
|
self._old = old_value
|
||||||
self._new = self.type(new_value)
|
self._new = self.type(new_value)
|
||||||
|
if self._profile.old_interpolated == "":
|
||||||
|
if self._profile.interpolated:
|
||||||
|
self._profile.old_interpolated = "interpolated"
|
||||||
|
else:
|
||||||
|
self._profile.old_interpolated = "not_interpolated"
|
||||||
|
|
||||||
|
|
||||||
class SetXCommand(SetDataCommand):
|
class SetXCommand(SetDataCommand):
|
||||||
@@ -46,10 +51,19 @@ class SetXCommand(SetDataCommand):
|
|||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._profile.point(self._index).x = self._old
|
self._profile.point(self._index).x = self._old
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._profile.point(self._index).x = self._new
|
self._profile.point(self._index).x = self._new
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -60,10 +74,19 @@ class SetYCommand(SetDataCommand):
|
|||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._profile.point(self._index).y = self._old
|
self._profile.point(self._index).y = self._old
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._profile.point(self._index).y = self._new
|
self._profile.point(self._index).y = self._new
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -74,10 +97,19 @@ class SetZCommand(SetDataCommand):
|
|||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._profile.point(self._index).z = self._old
|
self._profile.point(self._index).z = self._old
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._profile.point(self._index).z = self._new
|
self._profile.point(self._index).z = self._new
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -89,9 +121,20 @@ class SetNameCommand(SetDataCommand):
|
|||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._profile.point(self._index).name = self._old
|
self._profile.point(self._index).name = self._old
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._profile.point(self._index).name = self._new
|
self._profile.point(self._index).name = self._new
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
class AddCommand(QUndoCommand):
|
class AddCommand(QUndoCommand):
|
||||||
@@ -104,6 +147,13 @@ class AddCommand(QUndoCommand):
|
|||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._profile.delete_i([self._index])
|
self._profile.delete_i([self._index])
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
@@ -111,7 +161,8 @@ class AddCommand(QUndoCommand):
|
|||||||
self._point = self._profile.insert(self._index)
|
self._point = self._profile.insert(self._index)
|
||||||
else:
|
else:
|
||||||
self._profile.insert_point(self._index, self._point)
|
self._profile.insert_point(self._index, self._point)
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -125,10 +176,19 @@ class DelCommand(QUndoCommand):
|
|||||||
def undo(self):
|
def undo(self):
|
||||||
for point in self._points:
|
for point in self._points:
|
||||||
point.set_as_not_deleted()
|
point.set_as_not_deleted()
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._profile.delete_points(self._points)
|
self._profile.delete_points(self._points)
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -153,10 +213,19 @@ class SortCommand(QUndoCommand):
|
|||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._profile.sort_with_indexes(self._indexes)
|
self._profile.sort_with_indexes(self._indexes)
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._profile.sort(self._column, self._reverse)
|
self._profile.sort(self._column, self._reverse)
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -173,6 +242,13 @@ class MoveCommand(QUndoCommand):
|
|||||||
self._profile.move_up_point(self._i)
|
self._profile.move_up_point(self._i)
|
||||||
else:
|
else:
|
||||||
self._profile.move_down_point(self._i)
|
self._profile.move_down_point(self._i)
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
@@ -180,6 +256,8 @@ class MoveCommand(QUndoCommand):
|
|||||||
self._profile.move_up_point(self._i)
|
self._profile.move_up_point(self._i)
|
||||||
else:
|
else:
|
||||||
self._profile.move_down_point(self._i)
|
self._profile.move_down_point(self._i)
|
||||||
|
self._profile.increase_modification_count()
|
||||||
|
self._profile.interpolated = False
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -191,10 +269,19 @@ class ReverseCommand(QUndoCommand):
|
|||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._profile.reverse()
|
self._profile.reverse()
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._profile.reverse()
|
self._profile.reverse()
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -209,10 +296,19 @@ class PurgeCommand(QUndoCommand):
|
|||||||
def undo(self):
|
def undo(self):
|
||||||
for point in self._deleted:
|
for point in self._deleted:
|
||||||
point.set_as_not_deleted()
|
point.set_as_not_deleted()
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._deleted = self._profile.purge(self._np_purge)
|
self._deleted = self._profile.purge(self._np_purge)
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
|
|
||||||
@@ -228,9 +324,18 @@ class PasteCommand(QUndoCommand):
|
|||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._profile.delete_points(self._points)
|
self._profile.delete_points(self._points)
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
for point in self._points:
|
for point in self._points:
|
||||||
self._profile.insert_point(self._row, point)
|
self._profile.insert_point(self._row, point)
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.increase_modification_count()
|
||||||
self._profile.modified()
|
self._profile.modified()
|
||||||
@@ -128,6 +128,15 @@ class ProfileWindow(PamhyrWindow):
|
|||||||
self._tablemodel.blockSignals(False)
|
self._tablemodel.blockSignals(False)
|
||||||
|
|
||||||
def setup_connections(self):
|
def setup_connections(self):
|
||||||
|
navigation_actions = {
|
||||||
|
"action_previous_profile": self.previous_profile,
|
||||||
|
"action_next_profile": self.next_profile,
|
||||||
|
}
|
||||||
|
|
||||||
|
for action in navigation_actions:
|
||||||
|
self.find(QAction, action)\
|
||||||
|
.triggered.connect(navigation_actions[action])
|
||||||
|
|
||||||
if self._study.is_read_only():
|
if self._study.is_read_only():
|
||||||
actions = {}
|
actions = {}
|
||||||
else:
|
else:
|
||||||
@@ -152,6 +161,74 @@ class ProfileWindow(PamhyrWindow):
|
|||||||
.connect(self.update_points_selection)
|
.connect(self.update_points_selection)
|
||||||
|
|
||||||
self._tablemodel.dataChanged.connect(self.update)
|
self._tablemodel.dataChanged.connect(self.update)
|
||||||
|
self.update_navigation_actions()
|
||||||
|
|
||||||
|
def previous_profile(self):
|
||||||
|
self.navigate_profile(-1)
|
||||||
|
|
||||||
|
def next_profile(self):
|
||||||
|
self.navigate_profile(1)
|
||||||
|
|
||||||
|
def profiles(self):
|
||||||
|
"""Return profiles from the geometry model owning this profile."""
|
||||||
|
return self._profile.reach.profiles
|
||||||
|
|
||||||
|
def navigate_profile(self, offset):
|
||||||
|
profiles = self.profiles()
|
||||||
|
|
||||||
|
try:
|
||||||
|
index = profiles.index(self._profile)
|
||||||
|
except ValueError:
|
||||||
|
self.update_navigation_actions()
|
||||||
|
return
|
||||||
|
|
||||||
|
target_index = index + offset
|
||||||
|
if not 0 <= target_index < len(profiles):
|
||||||
|
self.update_navigation_actions()
|
||||||
|
return
|
||||||
|
|
||||||
|
target = profiles[target_index]
|
||||||
|
if self._parent is not None and self._parent.sub_window_exists(
|
||||||
|
ProfileWindow,
|
||||||
|
data=[self._study, self._config, target]
|
||||||
|
):
|
||||||
|
self.close()
|
||||||
|
return
|
||||||
|
|
||||||
|
self.set_profile(target)
|
||||||
|
|
||||||
|
def set_profile(self, profile):
|
||||||
|
self._profile = profile
|
||||||
|
self._hash_data[-1] = profile
|
||||||
|
self._undo_stack.clear()
|
||||||
|
|
||||||
|
self._tablemodel.beginResetModel()
|
||||||
|
self._tablemodel._data = profile
|
||||||
|
self._tablemodel._setup_lst()
|
||||||
|
self._tablemodel.endResetModel()
|
||||||
|
|
||||||
|
self._plot.data = profile
|
||||||
|
self._plot.highlight = None
|
||||||
|
self._plot.draw()
|
||||||
|
|
||||||
|
self._title = (
|
||||||
|
self._trad[self._pamhyr_name] +
|
||||||
|
f" - {profile.name} {profile.rk}"
|
||||||
|
)
|
||||||
|
self._set_title()
|
||||||
|
self.update_navigation_actions()
|
||||||
|
|
||||||
|
def update_navigation_actions(self):
|
||||||
|
profiles = self.profiles()
|
||||||
|
try:
|
||||||
|
index = profiles.index(self._profile)
|
||||||
|
except ValueError:
|
||||||
|
index = -1
|
||||||
|
|
||||||
|
self.find(QAction, "action_previous_profile")\
|
||||||
|
.setEnabled(index > 0)
|
||||||
|
self.find(QAction, "action_next_profile")\
|
||||||
|
.setEnabled(0 <= index < len(profiles) - 1)
|
||||||
|
|
||||||
def update_points_selection(self):
|
def update_points_selection(self):
|
||||||
rows = self.index_selected_rows()
|
rows = self.index_selected_rows()
|
||||||
|
|||||||
@@ -64,15 +64,20 @@ class GeometryReachTableModel(PamhyrTableModel):
|
|||||||
if not index.isValid():
|
if not index.isValid():
|
||||||
return QVariant()
|
return QVariant()
|
||||||
|
|
||||||
|
profile = self._data.profile(index.row())
|
||||||
|
|
||||||
|
if role == Qt.BackgroundRole and not profile.is_enabled:
|
||||||
|
return QColor(190, 190, 190)
|
||||||
|
|
||||||
if role == Qt.DisplayRole and index.column() == 0:
|
if role == Qt.DisplayRole and index.column() == 0:
|
||||||
return self._data.profile(index.row()).name
|
return profile.name
|
||||||
|
|
||||||
if role == Qt.DisplayRole and index.column() == 1:
|
if role == Qt.DisplayRole and index.column() == 1:
|
||||||
rk = self._data.profile(index.row()).rk
|
rk = profile.rk
|
||||||
return f"{rk:.4f}"
|
return f"{rk:.4f}"
|
||||||
|
|
||||||
if role == Qt.DisplayRole and index.column() == 2:
|
if role == Qt.DisplayRole and index.column() == 2:
|
||||||
return str(self._data.profile(index.row()).nb_points)
|
return str(profile.nb_points)
|
||||||
|
|
||||||
if role == Qt.TextAlignmentRole:
|
if role == Qt.TextAlignmentRole:
|
||||||
return Qt.AlignHCenter | Qt.AlignVCenter
|
return Qt.AlignHCenter | Qt.AlignVCenter
|
||||||
@@ -155,6 +160,14 @@ class GeometryReachTableModel(PamhyrTableModel):
|
|||||||
self.endRemoveRows()
|
self.endRemoveRows()
|
||||||
self.layoutChanged.emit()
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
|
def enabled(self, rows, enabled):
|
||||||
|
self._undo.push(
|
||||||
|
SetEnabledCommand(
|
||||||
|
self._data, rows, enabled
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
def sort_profiles(self, _reverse):
|
def sort_profiles(self, _reverse):
|
||||||
self.layoutAboutToBeChanged.emit()
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
from PyQt5.QtCore import QCoreApplication
|
from PyQt5.QtCore import QCoreApplication
|
||||||
|
|
||||||
from View.Translate import MainTranslate
|
from View.Translate import MainTranslate
|
||||||
|
from View.WeatherParameters.translate import WeatherParametersTranslate
|
||||||
|
|
||||||
_translate = QCoreApplication.translate
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
@@ -44,6 +45,63 @@ class GeometryTranslate(MainTranslate):
|
|||||||
self._dict["cross_sections"] = _translate("Geometry", "cross-sections")
|
self._dict["cross_sections"] = _translate("Geometry", "cross-sections")
|
||||||
self._dict["profile"] = _translate("Geometry", "cross-section")
|
self._dict["profile"] = _translate("Geometry", "cross-section")
|
||||||
self._dict["profiles"] = _translate("Geometry", "cross-sections")
|
self._dict["profiles"] = _translate("Geometry", "cross-sections")
|
||||||
|
self._dict["show_interpolated_profiles"] = _translate(
|
||||||
|
"Geometry", "Show interpolated profiles"
|
||||||
|
)
|
||||||
|
self._dict["cross_section_enabled_count"] = _translate(
|
||||||
|
"Geometry", "Cross-section enabled ({count} disabled)"
|
||||||
|
)
|
||||||
|
self._dict["profile_disable_blocked"] = _translate(
|
||||||
|
"Geometry", "The cross-section cannot be disabled."
|
||||||
|
)
|
||||||
|
self._dict["profile_disable_blocked_info"] = _translate(
|
||||||
|
"Geometry",
|
||||||
|
"It is referenced by the following data:\n{dependencies}\n\n"
|
||||||
|
"Change or remove these associations before disabling it."
|
||||||
|
)
|
||||||
|
self._dict["profile_dependency"] = _translate(
|
||||||
|
"Geometry", "{kind} “{name}” ({association})"
|
||||||
|
)
|
||||||
|
self._dict["initial_condition"] = _translate(
|
||||||
|
"Geometry", "Initial condition"
|
||||||
|
)
|
||||||
|
self._dict["initial_condition_temperature"] = _translate(
|
||||||
|
"Geometry", "Initial condition temperature"
|
||||||
|
)
|
||||||
|
self._dict["hydraulic_structure"] = _translate(
|
||||||
|
"Geometry", "Hydraulic structure"
|
||||||
|
)
|
||||||
|
self._dict["lateral_contribution"] = _translate(
|
||||||
|
"Geometry", "Lateral contribution"
|
||||||
|
)
|
||||||
|
self._dict["weather_parameter"] = _translate(
|
||||||
|
"Geometry", "Weather parameter"
|
||||||
|
)
|
||||||
|
self._dict["section"] = _translate("Geometry", "cross-section")
|
||||||
|
self._dict["begin_section"] = _translate(
|
||||||
|
"Geometry", "beginning cross-section"
|
||||||
|
)
|
||||||
|
self._dict["end_section"] = _translate(
|
||||||
|
"Geometry", "end cross-section"
|
||||||
|
)
|
||||||
|
self._dict["cross_section_pk"] = _translate(
|
||||||
|
"Geometry", "cross-section PK"
|
||||||
|
)
|
||||||
|
|
||||||
|
weather_parameters = WeatherParametersTranslate().get_dict(
|
||||||
|
"weather_parameters"
|
||||||
|
)
|
||||||
|
self._sub_dict["weather_parameter_types"] = {
|
||||||
|
"AT": weather_parameters["air_temperature"],
|
||||||
|
"SH": weather_parameters["specific_humidity"],
|
||||||
|
"GR": weather_parameters["global_radiation"],
|
||||||
|
"RWS": weather_parameters["reference_wind_speed"],
|
||||||
|
"GT": weather_parameters["surface_temperature"],
|
||||||
|
"GFR": weather_parameters["surface_flow_rate"],
|
||||||
|
"ALB": weather_parameters["albedo"],
|
||||||
|
"SC": weather_parameters["shading_coefficient"],
|
||||||
|
"CCF": weather_parameters["cloud_cover_fraction"],
|
||||||
|
}
|
||||||
|
|
||||||
self._dict["transverse_abscissa"] = _translate(
|
self._dict["transverse_abscissa"] = _translate(
|
||||||
"Geometry", "Transverse abscissa (m)"
|
"Geometry", "Transverse abscissa (m)"
|
||||||
@@ -97,6 +155,15 @@ class GeometryTranslate(MainTranslate):
|
|||||||
self._dict["format_not_exportable"] = _translate(
|
self._dict["format_not_exportable"] = _translate(
|
||||||
"Geometry", "The format of the file is not exportable."
|
"Geometry", "The format of the file is not exportable."
|
||||||
)
|
)
|
||||||
|
self._dict["export_options"] = _translate(
|
||||||
|
"Geometry", "Export options"
|
||||||
|
)
|
||||||
|
self._dict["export_options_text"] = _translate(
|
||||||
|
"Geometry", "Exportation of the cross-sections."
|
||||||
|
)
|
||||||
|
self._dict["export_interpolated_profiles"] = _translate(
|
||||||
|
"Geometry", "Export with interpolated cross-sections"
|
||||||
|
)
|
||||||
self._dict["update_rk_error"] = _translate(
|
self._dict["update_rk_error"] = _translate(
|
||||||
"Geometry",
|
"Geometry",
|
||||||
"RK update can't be executed."
|
"RK update can't be executed."
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ class SetDataCommand(QUndoCommand):
|
|||||||
self._index = index
|
self._index = index
|
||||||
self._old = old_value
|
self._old = old_value
|
||||||
self._new = self.type(new_value)
|
self._new = self.type(new_value)
|
||||||
|
self._profile = self._reach.profile(self._index)
|
||||||
|
|
||||||
|
|
||||||
class SetNameCommand(SetDataCommand):
|
class SetNameCommand(SetDataCommand):
|
||||||
@@ -48,24 +49,73 @@ class SetNameCommand(SetDataCommand):
|
|||||||
self.type = str
|
self.type = str
|
||||||
super(SetNameCommand, self).__init__(
|
super(SetNameCommand, self).__init__(
|
||||||
reach, index, old_value, new_value)
|
reach, index, old_value, new_value)
|
||||||
|
if self._profile.old_interpolated == "":
|
||||||
|
if self._profile.interpolated:
|
||||||
|
self._profile.old_interpolated = "interpolated"
|
||||||
|
else:
|
||||||
|
self._profile.old_interpolated = "not_interpolated"
|
||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._reach.profile(self._index).name = self._old
|
self._profile.name = self._old
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._reach.profile(self._index).name = self._new
|
# Name setter will automatically update the interpolated attribute
|
||||||
|
self._profile.name = self._new
|
||||||
|
self._profile.increase_modification_count()
|
||||||
|
|
||||||
|
|
||||||
class SetRKCommand(SetDataCommand):
|
class SetRKCommand(SetDataCommand):
|
||||||
def __init__(self, reach, index, old_value, new_value):
|
def __init__(self, reach, index, old_value, new_value):
|
||||||
self.type = float
|
self.type = float
|
||||||
super(SetRKCommand, self).__init__(reach, index, old_value, new_value)
|
super(SetRKCommand, self).__init__(reach, index, old_value, new_value)
|
||||||
|
if self._profile.old_interpolated == "":
|
||||||
|
if self._profile.interpolated:
|
||||||
|
self._profile.old_interpolated = "interpolated"
|
||||||
|
else:
|
||||||
|
self._profile.old_interpolated = "not_interpolated"
|
||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._reach.profile(self._index).rk = self._old
|
self._profile.rk = self._old
|
||||||
|
self._profile.decrease_modification_count()
|
||||||
|
if self._profile.modification_count == 0:
|
||||||
|
if self._profile.old_interpolated == "interpolated":
|
||||||
|
self._profile.interpolated = True
|
||||||
|
else:
|
||||||
|
self._profile.interpolated = False
|
||||||
|
self._profile.old_interpolated = ""
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
self._reach.profile(self._index).rk = self._new
|
# RK setter will automatically update the interpolated attribute
|
||||||
|
self._profile.rk = self._new
|
||||||
|
self._profile.increase_modification_count()
|
||||||
|
|
||||||
|
|
||||||
|
class SetEnabledCommand(QUndoCommand):
|
||||||
|
def __init__(self, reach, rows, enabled):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._profiles = [reach.profile(row) for row in rows]
|
||||||
|
self._old = [profile.is_enabled for profile in self._profiles]
|
||||||
|
self._new = bool(enabled)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _set_enabled(profile, enabled):
|
||||||
|
profile.enabled = enabled
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
for profile, enabled in zip(self._profiles, self._old):
|
||||||
|
self._set_enabled(profile, enabled)
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
for profile in self._profiles:
|
||||||
|
self._set_enabled(profile, self._new)
|
||||||
|
|
||||||
|
|
||||||
class AddCommand(QUndoCommand):
|
class AddCommand(QUndoCommand):
|
||||||
|
|||||||
+189
-8
@@ -99,9 +99,11 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
self._profile_window = []
|
self._profile_window = []
|
||||||
|
|
||||||
self.setup_table()
|
self.setup_table()
|
||||||
|
self.setup_checkbox()
|
||||||
self.setup_plots()
|
self.setup_plots()
|
||||||
self.setup_statusbar()
|
self.setup_statusbar()
|
||||||
self.setup_connections()
|
self.setup_connections()
|
||||||
|
self.update_meshing_action()
|
||||||
|
|
||||||
def setup_table(self):
|
def setup_table(self):
|
||||||
if self._study.is_read_only():
|
if self._study.is_read_only():
|
||||||
@@ -124,6 +126,13 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
|
table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
|
||||||
table.setAlternatingRowColors(True)
|
table.setAlternatingRowColors(True)
|
||||||
|
|
||||||
|
def setup_checkbox(self):
|
||||||
|
self.find(QCheckBox, "checkBox_show_interpolated").setText(
|
||||||
|
self._trad["show_interpolated_profiles"]
|
||||||
|
)
|
||||||
|
self._checkbox = self.find(QCheckBox, "checkBox_enabled")
|
||||||
|
self._set_checkbox_state()
|
||||||
|
|
||||||
def setup_plots(self):
|
def setup_plots(self):
|
||||||
self.setup_plots_xy()
|
self.setup_plots_xy()
|
||||||
self.setup_plots_rkc()
|
self.setup_plots_rkc()
|
||||||
@@ -191,6 +200,18 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
self._status_label.setText(txt)
|
self._status_label.setText(txt)
|
||||||
|
|
||||||
def setup_connections(self):
|
def setup_connections(self):
|
||||||
|
self.find(QCheckBox, "checkBox_show_interpolated").toggled.connect(
|
||||||
|
self.update_interpolated_profiles_visibility
|
||||||
|
)
|
||||||
|
self.find(QCheckBox, "checkBox_show_interpolated").toggled.connect(
|
||||||
|
self.update_redraw
|
||||||
|
)
|
||||||
|
self._table.modelReset.connect(
|
||||||
|
self.update_interpolated_profiles_visibility)
|
||||||
|
self._table.rowsInserted.connect(
|
||||||
|
self.update_interpolated_profiles_visibility)
|
||||||
|
self._table.rowsRemoved.connect(
|
||||||
|
self.update_interpolated_profiles_visibility)
|
||||||
if self._study.is_read_only():
|
if self._study.is_read_only():
|
||||||
actions = {
|
actions = {
|
||||||
"action_export": self.export_to_file,
|
"action_export": self.export_to_file,
|
||||||
@@ -223,15 +244,46 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
.selectionChanged\
|
.selectionChanged\
|
||||||
.connect(self.select_current_profile)
|
.connect(self.select_current_profile)
|
||||||
|
|
||||||
|
if not self._study.is_read_only():
|
||||||
|
self._checkbox.clicked.connect(self._set_profiles_state)
|
||||||
|
|
||||||
self._table.layoutChanged.connect(self.update_redraw)
|
self._table.layoutChanged.connect(self.update_redraw)
|
||||||
|
|
||||||
def update(self):
|
def update(self):
|
||||||
self._update()
|
self._update()
|
||||||
|
|
||||||
|
def update_interpolated_profiles_visibility(self):
|
||||||
|
show_interpolated = self.find(
|
||||||
|
QCheckBox, "checkBox_show_interpolated"
|
||||||
|
).isChecked()
|
||||||
|
selection = self.tableView.selectionModel()
|
||||||
|
for row in range(self._table.rowCount()):
|
||||||
|
hidden = not show_interpolated \
|
||||||
|
and self._reach.profile(row).interpolated
|
||||||
|
self.tableView.setRowHidden(row, hidden)
|
||||||
|
if hidden:
|
||||||
|
selection.select(
|
||||||
|
self._table.index(row, 0),
|
||||||
|
QItemSelectionModel.Deselect | QItemSelectionModel.Rows
|
||||||
|
)
|
||||||
|
if selection.currentIndex().row() == row:
|
||||||
|
selection.setCurrentIndex(QModelIndex(),
|
||||||
|
QItemSelectionModel.NoUpdate)
|
||||||
|
|
||||||
def update_redraw(self):
|
def update_redraw(self):
|
||||||
self._update(redraw=True)
|
self._update(redraw=True)
|
||||||
|
|
||||||
|
def update_meshing_action(self):
|
||||||
|
enabled = (
|
||||||
|
not self._study.is_read_only()
|
||||||
|
and self._reach.number_profiles > 0
|
||||||
|
)
|
||||||
|
self.find(QAction, "action_meshing").setEnabled(enabled)
|
||||||
|
|
||||||
def _update(self, redraw=False, propagate=True):
|
def _update(self, redraw=False, propagate=True):
|
||||||
|
self.update_interpolated_profiles_visibility()
|
||||||
|
self.update_meshing_action()
|
||||||
|
|
||||||
if redraw:
|
if redraw:
|
||||||
self._plot_xy.redraw(data=self._reach)
|
self._plot_xy.redraw(data=self._reach)
|
||||||
self._plot_rkc.redraw(data=self._reach)
|
self._plot_rkc.redraw(data=self._reach)
|
||||||
@@ -287,13 +339,14 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
|
|
||||||
if self.sub_window_exists(
|
if self.sub_window_exists(
|
||||||
ProfileWindow,
|
ProfileWindow,
|
||||||
data=[None, None, profile]
|
data=[self._study, self._config, profile]
|
||||||
):
|
):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
win = ProfileWindow(
|
win = ProfileWindow(
|
||||||
profile=profile,
|
profile=profile,
|
||||||
study=self._study,
|
study=self._study,
|
||||||
|
config=self._config,
|
||||||
parent=self,
|
parent=self,
|
||||||
)
|
)
|
||||||
self._profile_window.append(win)
|
self._profile_window.append(win)
|
||||||
@@ -302,6 +355,9 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
self.tableView.model().blockSignals(False)
|
self.tableView.model().blockSignals(False)
|
||||||
|
|
||||||
def edit_meshing(self):
|
def edit_meshing(self):
|
||||||
|
if self._reach.number_profiles == 0:
|
||||||
|
return
|
||||||
|
|
||||||
rows = list(
|
rows = list(
|
||||||
set(
|
set(
|
||||||
(i.row() for i in self.tableView.selectedIndexes())
|
(i.row() for i in self.tableView.selectedIndexes())
|
||||||
@@ -314,6 +370,10 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
trad=self._trad,
|
trad=self._trad,
|
||||||
parent=self
|
parent=self
|
||||||
)
|
)
|
||||||
|
dlg.adjustSize()
|
||||||
|
dialog_geometry = dlg.frameGeometry()
|
||||||
|
dialog_geometry.moveCenter(self.frameGeometry().center())
|
||||||
|
dlg.move(dialog_geometry.topLeft())
|
||||||
if dlg.exec():
|
if dlg.exec():
|
||||||
data = {
|
data = {
|
||||||
"step": dlg.space_step,
|
"step": dlg.space_step,
|
||||||
@@ -472,6 +532,7 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
data=self._reach,
|
data=self._reach,
|
||||||
trad=self._trad,
|
trad=self._trad,
|
||||||
toolbar=self._toolbar_ac,
|
toolbar=self._toolbar_ac,
|
||||||
|
parent=self,
|
||||||
)
|
)
|
||||||
self._plot_ac.draw()
|
self._plot_ac.draw()
|
||||||
|
|
||||||
@@ -520,6 +581,92 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
self._plot_ac.draw()
|
self._plot_ac.draw()
|
||||||
|
|
||||||
self.tableView.model().blockSignals(False)
|
self.tableView.model().blockSignals(False)
|
||||||
|
self._set_checkbox_state()
|
||||||
|
|
||||||
|
def index_selected_rows(self):
|
||||||
|
return [
|
||||||
|
index.row()
|
||||||
|
for index in self.tableView.selectionModel().selectedRows()
|
||||||
|
]
|
||||||
|
|
||||||
|
def _set_checkbox_state(self):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
editable = not self._study.is_read_only()
|
||||||
|
disabled_count = (self._reach.number_profiles -
|
||||||
|
self._reach.number_enabled_profiles)
|
||||||
|
self._checkbox.setText(
|
||||||
|
self._trad["cross_section_enabled_count"].format(
|
||||||
|
count=disabled_count
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self._checkbox.setEnabled(editable and len(rows) > 0)
|
||||||
|
if len(rows) == 0:
|
||||||
|
self._checkbox.setTristate(False)
|
||||||
|
self._checkbox.setChecked(False)
|
||||||
|
return
|
||||||
|
|
||||||
|
states = {
|
||||||
|
self._reach.profile(row).is_enabled
|
||||||
|
for row in rows
|
||||||
|
}
|
||||||
|
if len(states) == 1:
|
||||||
|
self._checkbox.setTristate(False)
|
||||||
|
self._checkbox.setChecked(states.pop())
|
||||||
|
else:
|
||||||
|
self._checkbox.setTristate(True)
|
||||||
|
self._checkbox.setCheckState(Qt.PartiallyChecked)
|
||||||
|
|
||||||
|
def _set_profiles_state(self, enabled):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
if len(rows) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
if not enabled:
|
||||||
|
blocked = []
|
||||||
|
for row in rows:
|
||||||
|
profile = self._reach.profile(row)
|
||||||
|
dependencies = self._study.river.profile_dependencies(profile)
|
||||||
|
if len(dependencies) != 0:
|
||||||
|
blocked.append((profile, dependencies))
|
||||||
|
|
||||||
|
if len(blocked) != 0:
|
||||||
|
details = []
|
||||||
|
for profile, dependencies in blocked:
|
||||||
|
details.append(f"{profile.name}:")
|
||||||
|
for dependency in dependencies:
|
||||||
|
item = dependency["item"]
|
||||||
|
if dependency["kind"] == "weather_parameter":
|
||||||
|
name = self._trad.get_dict(
|
||||||
|
"weather_parameter_types"
|
||||||
|
).get(item.type, item.type)
|
||||||
|
else:
|
||||||
|
name = getattr(item, "name", "")
|
||||||
|
if name == "":
|
||||||
|
name = self._trad[dependency["kind"]]
|
||||||
|
details.append(
|
||||||
|
" - " +
|
||||||
|
self._trad["profile_dependency"].format(
|
||||||
|
kind=self._trad[dependency["kind"]],
|
||||||
|
name=name,
|
||||||
|
association=self._trad[
|
||||||
|
dependency["association"]
|
||||||
|
],
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self._set_checkbox_state()
|
||||||
|
self.message_box(
|
||||||
|
self._trad["profile_disable_blocked"],
|
||||||
|
self._trad["profile_disable_blocked_info"].format(
|
||||||
|
dependencies="\n".join(details)
|
||||||
|
),
|
||||||
|
window_title=self._trad["warning"],
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
self._checkbox.setTristate(False)
|
||||||
|
self._table.enabled(rows, enabled)
|
||||||
|
|
||||||
def add(self):
|
def add(self):
|
||||||
if len(self.tableView.selectedIndexes()) == 0:
|
if len(self.tableView.selectedIndexes()) == 0:
|
||||||
@@ -706,6 +853,10 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
# self.update_plot_rkc()
|
# self.update_plot_rkc()
|
||||||
|
|
||||||
def export_to_file(self):
|
def export_to_file(self):
|
||||||
|
export_interpolated = self._ask_export_options()
|
||||||
|
if export_interpolated is None:
|
||||||
|
return
|
||||||
|
|
||||||
settings = QSettings(
|
settings = QSettings(
|
||||||
QSettings.IniFormat,
|
QSettings.IniFormat,
|
||||||
QSettings.UserScope, 'MyOrg'
|
QSettings.UserScope, 'MyOrg'
|
||||||
@@ -735,7 +886,9 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
suffix = Path(filename).suffix
|
suffix = Path(filename).suffix
|
||||||
if suffix != "":
|
if suffix != "":
|
||||||
if suffix == ".st" or suffix == ".ST":
|
if suffix == ".st" or suffix == ".ST":
|
||||||
self._export_to_file_st(filename[:-3])
|
self._export_to_file_st(
|
||||||
|
filename[:-3], export_interpolated
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
# Warning popup when the format is not exportable
|
# Warning popup when the format is not exportable
|
||||||
win = QtWidgets.QMessageBox()
|
win = QtWidgets.QMessageBox()
|
||||||
@@ -746,18 +899,46 @@ class GeometryWindow(PamhyrWindow):
|
|||||||
|
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
self._export_to_file_st(filename)
|
self._export_to_file_st(filename, export_interpolated)
|
||||||
|
|
||||||
def _export_to_file_st(self, filename):
|
def _ask_export_options(self):
|
||||||
|
win = QtWidgets.QMessageBox(self)
|
||||||
|
win.setIcon(QtWidgets.QMessageBox.Question)
|
||||||
|
win.setWindowTitle(self._trad["export_options"])
|
||||||
|
win.setText(self._trad["export_options_text"])
|
||||||
|
win.setStandardButtons(
|
||||||
|
QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel
|
||||||
|
)
|
||||||
|
|
||||||
|
export_interpolated = QCheckBox(
|
||||||
|
self._trad["export_interpolated_profiles"], win
|
||||||
|
)
|
||||||
|
export_interpolated.setChecked(True)
|
||||||
|
win.setCheckBox(export_interpolated)
|
||||||
|
|
||||||
|
if win.exec() != QtWidgets.QMessageBox.Ok:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return export_interpolated.isChecked()
|
||||||
|
|
||||||
|
def _export_to_file_st(self, filename, export_interpolated=True):
|
||||||
with open(filename+".st", "w+") as f:
|
with open(filename+".st", "w+") as f:
|
||||||
f.write("# Exported from Pamhyr2\n")
|
f.write("# Exported from Pamhyr2\n")
|
||||||
self._export_to_file_st_reach(f, self._reach)
|
self._export_to_file_st_reach(
|
||||||
|
f, self._reach, export_interpolated
|
||||||
|
)
|
||||||
|
|
||||||
def _export_to_file_st_reach(self, wfile, reach):
|
def _export_to_file_st_reach(self, wfile, reach,
|
||||||
|
export_interpolated=True):
|
||||||
pid = 0
|
pid = 0
|
||||||
for profile in reach.profiles:
|
for profile in reach.profiles:
|
||||||
self._export_to_file_st_profile(wfile, profile, pid)
|
is_interpolated = profile.name.lower().startswith("interpol")
|
||||||
pid += 1
|
if is_interpolated and not export_interpolated:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if profile.enabled:
|
||||||
|
self._export_to_file_st_profile(wfile, profile, pid)
|
||||||
|
pid += 1
|
||||||
|
|
||||||
def _export_to_file_st_profile(self, wfile, profile, pid):
|
def _export_to_file_st_profile(self, wfile, profile, pid):
|
||||||
num = f"{pid:>6}"
|
num = f"{pid:>6}"
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
val = []
|
val = []
|
||||||
if self._mode == "rk":
|
if self._mode == "rk":
|
||||||
reach = self._data.hydraulic_structures\
|
reach = self._data.hydraulic_structures\
|
||||||
.get(index.row())\
|
.get_for_enabled_reaches(index.row())\
|
||||||
.input_reach
|
.input_reach
|
||||||
if reach is not None:
|
if reach is not None:
|
||||||
val = list(
|
val = list(
|
||||||
@@ -73,7 +73,7 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
else:
|
else:
|
||||||
val = list(
|
val = list(
|
||||||
map(
|
map(
|
||||||
lambda n: n.name, self._data.edges()
|
lambda n: n.name, self._data.enable_edges()
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -94,16 +94,19 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
|
|
||||||
if self._mode == "rk":
|
if self._mode == "rk":
|
||||||
reach = self._data.hydraulic_structures\
|
reach = self._data.hydraulic_structures\
|
||||||
.get(index.row())\
|
.get_for_enabled_reaches(index.row())\
|
||||||
.input_reach
|
.input_reach
|
||||||
profiles = list(
|
if reach is None:
|
||||||
filter(
|
value = None
|
||||||
lambda p: p.display_name() == text,
|
else:
|
||||||
reach.reach.profiles
|
profiles = list(
|
||||||
|
filter(
|
||||||
|
lambda p: p.display_name() == text,
|
||||||
|
reach.reach.profiles
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
|
|
||||||
value = profiles[0] if len(profiles) > 0 else None
|
value = profiles[0] if len(profiles) > 0 else None
|
||||||
else:
|
else:
|
||||||
value = text
|
value = text
|
||||||
|
|
||||||
@@ -128,20 +131,22 @@ class TableModel(PamhyrTableModel):
|
|||||||
self._lst = self._data._hydraulic_structures
|
self._lst = self._data._hydraulic_structures
|
||||||
|
|
||||||
def get_true_data_row(self, row):
|
def get_true_data_row(self, row):
|
||||||
hs = self._lst.get(row)
|
hs = self._lst.get_for_enabled_reaches(row)
|
||||||
|
if hs is None:
|
||||||
|
return len(self._lst.lst)
|
||||||
|
|
||||||
return next(
|
return next(
|
||||||
map(
|
map(
|
||||||
lambda e: e[0],
|
lambda e: e[0],
|
||||||
filter(
|
filter(
|
||||||
lambda e: e[1] == hs,
|
lambda e: e[1] == hs,
|
||||||
enumerate(self._lst._lst)
|
enumerate(self._lst.lst)
|
||||||
)
|
)
|
||||||
), 0
|
), 0
|
||||||
)
|
)
|
||||||
|
|
||||||
def rowCount(self, parent):
|
def rowCount(self, parent):
|
||||||
return len(self._lst)
|
return len(self._lst.enabled_reaches_list)
|
||||||
|
|
||||||
def data(self, index, role):
|
def data(self, index, role):
|
||||||
if role != Qt.ItemDataRole.DisplayRole:
|
if role != Qt.ItemDataRole.DisplayRole:
|
||||||
@@ -149,16 +154,17 @@ class TableModel(PamhyrTableModel):
|
|||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
structure = self._lst.get_for_enabled_reaches(row)
|
||||||
|
|
||||||
if self._headers[column] == "name":
|
if self._headers[column] == "name":
|
||||||
return self._lst.get(row).name
|
return structure.name
|
||||||
elif self._headers[column] == "reach":
|
elif self._headers[column] == "reach":
|
||||||
n = self._lst.get(row).input_reach
|
n = structure.input_reach
|
||||||
if n is None:
|
if n is None:
|
||||||
return self._trad['not_associated']
|
return self._trad['not_associated']
|
||||||
return n.name
|
return n.name
|
||||||
elif self._headers[column] == "rk":
|
elif self._headers[column] == "rk":
|
||||||
n = self._lst.get(row).input_section
|
n = structure.input_section
|
||||||
if n is None:
|
if n is None:
|
||||||
return self._trad['not_associated']
|
return self._trad['not_associated']
|
||||||
return n.display_name()
|
return n.display_name()
|
||||||
@@ -174,6 +180,7 @@ class TableModel(PamhyrTableModel):
|
|||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
row = self.get_true_data_row(row)
|
||||||
na = self._trad['not_associated']
|
na = self._trad['not_associated']
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -220,7 +220,7 @@ class HydraulicStructuresWindow(PamhyrWindow):
|
|||||||
|
|
||||||
def add(self):
|
def add(self):
|
||||||
rows = self.index_selected_rows()
|
rows = self.index_selected_rows()
|
||||||
if len(self._hs_lst) == 0 or len(rows) == 0:
|
if len(self._hs_lst.enabled_reaches_list) == 0 or len(rows) == 0:
|
||||||
self._table.add(0)
|
self._table.add(0)
|
||||||
else:
|
else:
|
||||||
self._table.add(rows[0])
|
self._table.add(rows[0])
|
||||||
@@ -247,7 +247,7 @@ class HydraulicStructuresWindow(PamhyrWindow):
|
|||||||
def edit(self):
|
def edit(self):
|
||||||
rows = self.index_selected_rows()
|
rows = self.index_selected_rows()
|
||||||
for row in rows:
|
for row in rows:
|
||||||
data = self._hs_lst.get(row)
|
data = self._hs_lst.get_for_enabled_reaches(row)
|
||||||
|
|
||||||
if self.sub_window_exists(
|
if self.sub_window_exists(
|
||||||
BasicHydraulicStructuresWindow,
|
BasicHydraulicStructuresWindow,
|
||||||
@@ -269,7 +269,8 @@ class HydraulicStructuresWindow(PamhyrWindow):
|
|||||||
self._checkbox.setChecked(True)
|
self._checkbox.setChecked(True)
|
||||||
else:
|
else:
|
||||||
self._checkbox.setEnabled(True)
|
self._checkbox.setEnabled(True)
|
||||||
self._checkbox.setChecked(self._hs_lst.get(row).enabled)
|
structure = self._hs_lst.get_for_enabled_reaches(row)
|
||||||
|
self._checkbox.setChecked(structure.enabled)
|
||||||
|
|
||||||
def _set_structure_state(self):
|
def _set_structure_state(self):
|
||||||
rows = self.index_selected_rows()
|
rows = self.index_selected_rows()
|
||||||
@@ -288,16 +289,18 @@ class HydraulicStructuresWindow(PamhyrWindow):
|
|||||||
def _update_clear_plot(self):
|
def _update_clear_plot(self):
|
||||||
rows = self.index_selected_rows()
|
rows = self.index_selected_rows()
|
||||||
|
|
||||||
if len(rows) == 0 or len(self._hs_lst) == 0:
|
if (len(rows) == 0 or
|
||||||
|
len(self._hs_lst.enabled_reaches_list) == 0):
|
||||||
self._update_clear_all()
|
self._update_clear_all()
|
||||||
return
|
return
|
||||||
|
|
||||||
reach = self._hs_lst.get(rows[0]).input_reach
|
structure = self._hs_lst.get_for_enabled_reaches(rows[0])
|
||||||
|
reach = structure.input_reach
|
||||||
if reach is not None:
|
if reach is not None:
|
||||||
self.plot_rkc.set_reach(reach)
|
self.plot_rkc.set_reach(reach)
|
||||||
self.plot_ac.set_reach(reach)
|
self.plot_ac.set_reach(reach)
|
||||||
|
|
||||||
profile = self._hs_lst.get(rows[0]).input_section
|
profile = structure.input_section
|
||||||
if profile is not None:
|
if profile is not None:
|
||||||
profiles = reach.reach\
|
profiles = reach.reach\
|
||||||
.get_profiles_from_rk(
|
.get_profiles_from_rk(
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ from PyQt5.QtWidgets import (
|
|||||||
QDialogButtonBox, QPushButton, QLineEdit,
|
QDialogButtonBox, QPushButton, QLineEdit,
|
||||||
QFileDialog, QTableView, QAbstractItemView,
|
QFileDialog, QTableView, QAbstractItemView,
|
||||||
QUndoStack, QShortcut, QAction, QItemDelegate,
|
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||||
QComboBox,
|
QComboBox, QMessageBox
|
||||||
)
|
)
|
||||||
|
|
||||||
from View.Tools.PamhyrTable import PamhyrTableModel
|
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||||
@@ -290,8 +290,6 @@ class InitialConditionTableModel(PamhyrTableModel):
|
|||||||
logger.error("No results data")
|
logger.error("No results data")
|
||||||
return
|
return
|
||||||
|
|
||||||
self.layoutAboutToBeChanged.emit()
|
|
||||||
|
|
||||||
ts = max(results.get("timestamps"))
|
ts = max(results.get("timestamps"))
|
||||||
res_reach = results.river.get_reach_by_geometry(
|
res_reach = results.river.get_reach_by_geometry(
|
||||||
self._reach.reach
|
self._reach.reach
|
||||||
@@ -307,19 +305,15 @@ class InitialConditionTableModel(PamhyrTableModel):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
self._undo.push(
|
new_data = list(
|
||||||
ReplaceDataCommand(
|
map(
|
||||||
self._lst,
|
lambda d: self._lst.new_from_data(*d),
|
||||||
list(
|
data
|
||||||
map(
|
|
||||||
lambda d: self._lst.new_from_data(*d),
|
|
||||||
data
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
self.layoutAboutToBeChanged.emit()
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
self._undo.push(ReplaceDataCommand(self._lst, new_data))
|
||||||
self.layoutChanged.emit()
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
def read_from_ini(self, file_name):
|
def read_from_ini(self, file_name):
|
||||||
@@ -355,17 +349,31 @@ class InitialConditionTableModel(PamhyrTableModel):
|
|||||||
line_split[2],
|
line_split[2],
|
||||||
line_split[3]])
|
line_split[3]])
|
||||||
|
|
||||||
self._undo.push(
|
new_data = []
|
||||||
ReplaceDataCommand(
|
missing_rks = []
|
||||||
self._lst,
|
for row in data:
|
||||||
list(
|
rk = row[0].strip()
|
||||||
map(
|
try:
|
||||||
lambda d: self._lst.new_from_data(*d),
|
new_data.append(self._lst.new_from_data(*row))
|
||||||
data
|
except ValueError:
|
||||||
)
|
missing_rks.append(rk)
|
||||||
|
logger.warning(
|
||||||
|
f"No profile found for imported RK {rk} "
|
||||||
|
f"in reach {self._reach.name}"
|
||||||
|
)
|
||||||
|
|
||||||
|
self.layoutAboutToBeChanged.emit()
|
||||||
|
self._undo.push(ReplaceDataCommand(self._lst, new_data))
|
||||||
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
|
if missing_rks:
|
||||||
|
QMessageBox.warning(
|
||||||
|
self._table_view,
|
||||||
|
self._trad["missing_rk_title"],
|
||||||
|
self._trad["missing_rk_text"].format(
|
||||||
|
rks=", ".join(missing_rks)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
self._undo.undo()
|
self._undo.undo()
|
||||||
|
|||||||
@@ -42,6 +42,13 @@ class ICTranslate(MainTranslate):
|
|||||||
"InitialCondition", "Mage initial conditions file (*.INI *.ini)")
|
"InitialCondition", "Mage initial conditions file (*.INI *.ini)")
|
||||||
self._dict["file_all"] = _translate(
|
self._dict["file_all"] = _translate(
|
||||||
"InitialCondition", "All files (*)")
|
"InitialCondition", "All files (*)")
|
||||||
|
self._dict["missing_rk_title"] = _translate(
|
||||||
|
"InitialCondition", "Profiles not found")
|
||||||
|
self._dict["missing_rk_text"] = _translate(
|
||||||
|
"InitialCondition",
|
||||||
|
"No profile was found for the following RK values: {rks}. "
|
||||||
|
"They were not imported and must be entered manually."
|
||||||
|
)
|
||||||
|
|
||||||
self._sub_dict["table_headers"] = {
|
self._sub_dict["table_headers"] = {
|
||||||
# "name": _translate("InitialCondition", "Name"),
|
# "name": _translate("InitialCondition", "Name"),
|
||||||
|
|||||||
@@ -55,17 +55,27 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
self._trad = trad
|
self._trad = trad
|
||||||
self._ic_spec_lst = ic_spec_lst
|
self._ic_spec_lst = ic_spec_lst
|
||||||
|
|
||||||
|
def _specifications(self):
|
||||||
|
if hasattr(
|
||||||
|
self._ic_spec_lst,
|
||||||
|
"get_specs_for_enabled_reaches"
|
||||||
|
):
|
||||||
|
return self._ic_spec_lst.get_specs_for_enabled_reaches(
|
||||||
|
self._data.edges()
|
||||||
|
)
|
||||||
|
return self._ic_spec_lst
|
||||||
|
|
||||||
def createEditor(self, parent, option, index):
|
def createEditor(self, parent, option, index):
|
||||||
self.editor = QComboBox(parent)
|
self.editor = QComboBox(parent)
|
||||||
|
|
||||||
val = []
|
val = []
|
||||||
if self._mode == "rk":
|
if self._mode == "rk":
|
||||||
reach_id = self._ic_spec_lst[index.row()].reach
|
reach_id = self._specifications()[index.row()].reach
|
||||||
|
|
||||||
reach = next(filter(lambda edge: edge.id == reach_id,
|
reach = next(filter(lambda edge: edge.id == reach_id,
|
||||||
self._data.edges()), None)
|
self._data.edges()), None)
|
||||||
|
|
||||||
if reach_id is not None:
|
if reach is not None:
|
||||||
val = list(
|
val = list(
|
||||||
map(
|
map(
|
||||||
lambda rk: str(rk), reach.reach.get_rk()
|
lambda rk: str(rk), reach.reach.get_rk()
|
||||||
@@ -74,7 +84,7 @@ class ComboBoxDelegate(QItemDelegate):
|
|||||||
else:
|
else:
|
||||||
val = list(
|
val = list(
|
||||||
map(
|
map(
|
||||||
lambda n: n.name, self._data.edges()
|
lambda n: n.name, self._data.enable_edges()
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -117,11 +127,8 @@ class InitialConditionTableModel(PamhyrTableModel):
|
|||||||
self._data = data
|
self._data = data
|
||||||
|
|
||||||
def _setup_lst(self):
|
def _setup_lst(self):
|
||||||
self._lst = list(
|
self._lst = self._data.get_specs_for_enabled_reaches(
|
||||||
filter(
|
self._river.edges()
|
||||||
lambda ica: ica._deleted is False,
|
|
||||||
self._data._data
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def rowCount(self, parent):
|
def rowCount(self, parent):
|
||||||
@@ -137,7 +144,7 @@ class InitialConditionTableModel(PamhyrTableModel):
|
|||||||
if self._headers[column] == "name":
|
if self._headers[column] == "name":
|
||||||
n = self._lst[row].name
|
n = self._lst[row].name
|
||||||
if n is None or n == "":
|
if n is None or n == "":
|
||||||
return self._trad['not_associated']
|
return self._trad['not_defined']
|
||||||
return n
|
return n
|
||||||
elif self._headers[column] == "reach":
|
elif self._headers[column] == "reach":
|
||||||
n = self._lst[row].reach
|
n = self._lst[row].reach
|
||||||
@@ -159,27 +166,27 @@ class InitialConditionTableModel(PamhyrTableModel):
|
|||||||
elif self._headers[column] == "concentration":
|
elif self._headers[column] == "concentration":
|
||||||
n = self._lst[row].concentration
|
n = self._lst[row].concentration
|
||||||
if n is None:
|
if n is None:
|
||||||
return self._trad['not_associated']
|
return self._trad['not_defined']
|
||||||
return n
|
return n
|
||||||
elif self._headers[column] == "eg":
|
elif self._headers[column] == "eg":
|
||||||
n = self._lst[row].eg
|
n = self._lst[row].eg
|
||||||
if n is None:
|
if n is None:
|
||||||
return self._trad['not_associated']
|
return self._trad['not_defined']
|
||||||
return n
|
return n
|
||||||
elif self._headers[column] == "em":
|
elif self._headers[column] == "em":
|
||||||
n = self._lst[row].em
|
n = self._lst[row].em
|
||||||
if n is None:
|
if n is None:
|
||||||
return self._trad['not_associated']
|
return self._trad['not_defined']
|
||||||
return n
|
return n
|
||||||
elif self._headers[column] == "ed":
|
elif self._headers[column] == "ed":
|
||||||
n = self._lst[row].ed
|
n = self._lst[row].ed
|
||||||
if n is None:
|
if n is None:
|
||||||
return self._trad['not_associated']
|
return self._trad['not_defined']
|
||||||
return n
|
return n
|
||||||
elif self._headers[column] == "rate":
|
elif self._headers[column] == "rate":
|
||||||
n = self._lst[row].rate
|
n = self._lst[row].rate
|
||||||
if n is None:
|
if n is None:
|
||||||
return self._trad['not_associated']
|
return self._trad['not_defined']
|
||||||
return n
|
return n
|
||||||
|
|
||||||
return QVariant()
|
return QVariant()
|
||||||
@@ -198,13 +205,14 @@ class InitialConditionTableModel(PamhyrTableModel):
|
|||||||
if self._headers[column] != "reach":
|
if self._headers[column] != "reach":
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
SetCommandSpec(
|
SetCommandSpec(
|
||||||
self._lst, row, self._headers[column], value
|
self._data, self._lst, row,
|
||||||
|
self._headers[column], value
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
elif self._headers[column] == "reach":
|
elif self._headers[column] == "reach":
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
SetCommandSpec(
|
SetCommandSpec(
|
||||||
self._lst, row, self._headers[column],
|
self._data, self._lst, row, self._headers[column],
|
||||||
self._river.edge(value).id
|
self._river.edge(value).id
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -80,31 +80,31 @@ class SetCommand(QUndoCommand):
|
|||||||
|
|
||||||
|
|
||||||
class SetCommandSpec(QUndoCommand):
|
class SetCommandSpec(QUndoCommand):
|
||||||
def __init__(self, data, row, column, new_value):
|
def __init__(self, parent, data, row, column, new_value):
|
||||||
QUndoCommand.__init__(self)
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
self._data = data
|
self._parent = parent
|
||||||
self._row = row
|
self._value = data[row]
|
||||||
self._column = column
|
self._column = column
|
||||||
|
|
||||||
if self._column == "name":
|
if self._column == "name":
|
||||||
self._old = self._data[self._row].name
|
self._old = self._value.name
|
||||||
elif self._column == "reach":
|
elif self._column == "reach":
|
||||||
self._old = self._data[self._row].reach
|
self._old = self._value.reach
|
||||||
elif self._column == "start_rk":
|
elif self._column == "start_rk":
|
||||||
self._old = self._data[self._row].start_rk
|
self._old = self._value.start_rk
|
||||||
elif self._column == "end_rk":
|
elif self._column == "end_rk":
|
||||||
self._old = self._data[self._row].end_rk
|
self._old = self._value.end_rk
|
||||||
elif self._column == "concentration":
|
elif self._column == "concentration":
|
||||||
self._old = self._data[self._row].concentration
|
self._old = self._value.concentration
|
||||||
elif self._column == "eg":
|
elif self._column == "eg":
|
||||||
self._old = self._data[self._row].eg
|
self._old = self._value.eg
|
||||||
elif self._column == "em":
|
elif self._column == "em":
|
||||||
self._old = self._data[self._row].em
|
self._old = self._value.em
|
||||||
elif self._column == "ed":
|
elif self._column == "ed":
|
||||||
self._old = self._data[self._row].ed
|
self._old = self._value.ed
|
||||||
elif self._column == "rate":
|
elif self._column == "rate":
|
||||||
self._old = self._data[self._row].rate
|
self._old = self._value.rate
|
||||||
|
|
||||||
_type = float
|
_type = float
|
||||||
if column == "name":
|
if column == "name":
|
||||||
@@ -115,44 +115,12 @@ class SetCommandSpec(QUndoCommand):
|
|||||||
self._new = _type(new_value)
|
self._new = _type(new_value)
|
||||||
|
|
||||||
def undo(self):
|
def undo(self):
|
||||||
if self._column == "name":
|
setattr(self._value, self._column, self._old)
|
||||||
self._data[self._row].name = self._old
|
self._parent.modified()
|
||||||
elif self._column == "reach":
|
|
||||||
self._data[self._row].reach = self._old
|
|
||||||
elif self._column == "start_rk":
|
|
||||||
self._data[self._row].start_rk = self._old
|
|
||||||
elif self._column == "end_rk":
|
|
||||||
self._data[self._row].end_rk = self._old
|
|
||||||
elif self._column == "concentration":
|
|
||||||
self._data[self._row].concentration = self._old
|
|
||||||
elif self._column == "eg":
|
|
||||||
self._data[self._row].eg = self._old
|
|
||||||
elif self._column == "em":
|
|
||||||
self._data[self._row].em = self._old
|
|
||||||
elif self._column == "ed":
|
|
||||||
self._data[self._row].ed = self._old
|
|
||||||
elif self._column == "rate":
|
|
||||||
self._data[self._row].rate = self._old
|
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
if self._column == "name":
|
setattr(self._value, self._column, self._new)
|
||||||
self._data[self._row].name = self._new
|
self._parent.modified()
|
||||||
elif self._column == "reach":
|
|
||||||
self._data[self._row].reach = self._new
|
|
||||||
elif self._column == "start_rk":
|
|
||||||
self._data[self._row].start_rk = self._new
|
|
||||||
elif self._column == "end_rk":
|
|
||||||
self._data[self._row].end_rk = self._new
|
|
||||||
elif self._column == "concentration":
|
|
||||||
self._data[self._row].concentration = self._new
|
|
||||||
elif self._column == "eg":
|
|
||||||
self._data[self._row].eg = self._new
|
|
||||||
elif self._column == "em":
|
|
||||||
self._data[self._row].em = self._new
|
|
||||||
elif self._column == "ed":
|
|
||||||
self._data[self._row].ed = self._new
|
|
||||||
elif self._column == "rate":
|
|
||||||
self._data[self._row].rate = self._new
|
|
||||||
|
|
||||||
|
|
||||||
class AddCommand(QUndoCommand):
|
class AddCommand(QUndoCommand):
|
||||||
|
|||||||
@@ -152,14 +152,14 @@ class InitialConditionsAdisTSWindow(PamhyrWindow):
|
|||||||
self._delegate_reach = ComboBoxDelegate(
|
self._delegate_reach = ComboBoxDelegate(
|
||||||
trad=self._trad,
|
trad=self._trad,
|
||||||
data=self._study.river,
|
data=self._study.river,
|
||||||
ic_spec_lst=self._data[0]._data,
|
ic_spec_lst=self._data[0],
|
||||||
parent=self,
|
parent=self,
|
||||||
mode="reaches"
|
mode="reaches"
|
||||||
)
|
)
|
||||||
self._delegate_rk = ComboBoxDelegate(
|
self._delegate_rk = ComboBoxDelegate(
|
||||||
trad=self._trad,
|
trad=self._trad,
|
||||||
data=self._study.river,
|
data=self._study.river,
|
||||||
ic_spec_lst=self._data[0]._data,
|
ic_spec_lst=self._data[0],
|
||||||
parent=self,
|
parent=self,
|
||||||
mode="rk"
|
mode="rk"
|
||||||
)
|
)
|
||||||
@@ -308,7 +308,10 @@ class InitialConditionsAdisTSWindow(PamhyrWindow):
|
|||||||
|
|
||||||
def add(self):
|
def add(self):
|
||||||
rows = self.index_selected_rows()
|
rows = self.index_selected_rows()
|
||||||
if len(self._data[0]._data) == 0 or len(rows) == 0:
|
visible = self._data[0].get_specs_for_enabled_reaches(
|
||||||
|
self._study.river.edges()
|
||||||
|
)
|
||||||
|
if len(visible) == 0 or len(rows) == 0:
|
||||||
self._table_spec.add(0)
|
self._table_spec.add(0)
|
||||||
else:
|
else:
|
||||||
self._table_spec.add(rows[0])
|
self._table_spec.add(rows[0])
|
||||||
|
|||||||
@@ -0,0 +1,336 @@
|
|||||||
|
# Table.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import traceback
|
||||||
|
from tools import trace, timer
|
||||||
|
|
||||||
|
from PyQt5.QtCore import (
|
||||||
|
Qt, QVariant, QAbstractTableModel,
|
||||||
|
QCoreApplication, QModelIndex, pyqtSlot,
|
||||||
|
QRect,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QDialogButtonBox, QPushButton, QLineEdit,
|
||||||
|
QFileDialog, QTableView, QAbstractItemView,
|
||||||
|
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||||
|
QComboBox, QMessageBox,
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||||
|
|
||||||
|
from View.InitialConditionsTemperature.UndoCommand import (
|
||||||
|
AddCommand, SetCommandSpec,
|
||||||
|
DelCommand,
|
||||||
|
)
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
|
||||||
|
class ComboBoxDelegate(QItemDelegate):
|
||||||
|
def __init__(self, data=None, ic_spec_lst=None,
|
||||||
|
trad=None, parent=None, mode="reaches"):
|
||||||
|
super(ComboBoxDelegate, self).__init__(parent)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._mode = mode
|
||||||
|
self._trad = trad
|
||||||
|
self._ic_spec_lst = ic_spec_lst
|
||||||
|
|
||||||
|
def createEditor(self, parent, option, index):
|
||||||
|
self.editor = QComboBox(parent)
|
||||||
|
|
||||||
|
val = []
|
||||||
|
if self._mode == "rk":
|
||||||
|
reach_id = self._ic_spec_lst[index.row()].reach
|
||||||
|
|
||||||
|
reach = next(filter(lambda edge: edge.id == reach_id,
|
||||||
|
self._data.edges()), None)
|
||||||
|
|
||||||
|
if reach is not None:
|
||||||
|
val = list(
|
||||||
|
map(
|
||||||
|
lambda profile: profile.display_name(),
|
||||||
|
reach.reach.profiles
|
||||||
|
)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
val = list(
|
||||||
|
map(
|
||||||
|
lambda n: n.name, self._data.enable_edges()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.editor.addItems(
|
||||||
|
[self._trad['not_associated']] +
|
||||||
|
val
|
||||||
|
)
|
||||||
|
|
||||||
|
self.editor.setCurrentText(str(index.data(Qt.DisplayRole)))
|
||||||
|
return self.editor
|
||||||
|
|
||||||
|
def setEditorData(self, editor, index):
|
||||||
|
value = index.data(Qt.DisplayRole)
|
||||||
|
self.editor.currentTextChanged.connect(self.currentItemChanged)
|
||||||
|
|
||||||
|
def setModelData(self, editor, model, index):
|
||||||
|
text = str(editor.currentText())
|
||||||
|
value = text
|
||||||
|
|
||||||
|
if self._mode == "rk":
|
||||||
|
reach_id = self._ic_spec_lst[index.row()].reach
|
||||||
|
reach = next(
|
||||||
|
(
|
||||||
|
edge for edge in self._data.edges()
|
||||||
|
if edge.id == reach_id
|
||||||
|
),
|
||||||
|
None
|
||||||
|
)
|
||||||
|
if reach is not None:
|
||||||
|
profile = next(
|
||||||
|
(
|
||||||
|
profile for profile in reach.reach.profiles
|
||||||
|
if profile.display_name() == text
|
||||||
|
),
|
||||||
|
None
|
||||||
|
)
|
||||||
|
if profile is not None:
|
||||||
|
value = profile.rk
|
||||||
|
|
||||||
|
model.setData(index, value)
|
||||||
|
editor.close()
|
||||||
|
editor.deleteLater()
|
||||||
|
|
||||||
|
def updateEditorGeometry(self, editor, option, index):
|
||||||
|
r = QRect(option.rect)
|
||||||
|
if self.editor.windowFlags() & Qt.Popup:
|
||||||
|
if editor.parent() is not None:
|
||||||
|
r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
|
||||||
|
editor.setGeometry(r)
|
||||||
|
|
||||||
|
@pyqtSlot()
|
||||||
|
def currentItemChanged(self):
|
||||||
|
self.commitData.emit(self.sender())
|
||||||
|
|
||||||
|
|
||||||
|
class InitialConditionTableModel(PamhyrTableModel):
|
||||||
|
def __init__(self, river=None, data=None, **kwargs):
|
||||||
|
self._river = river
|
||||||
|
|
||||||
|
super(InitialConditionTableModel, self).__init__(data=data, **kwargs)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
|
||||||
|
def _setup_lst(self):
|
||||||
|
enabled_reach_ids = {
|
||||||
|
reach.id
|
||||||
|
for reach in self._river.enable_edges()
|
||||||
|
}
|
||||||
|
self._lst = list(
|
||||||
|
filter(
|
||||||
|
lambda ica: (
|
||||||
|
ica._deleted is False and
|
||||||
|
(
|
||||||
|
ica.reach in (None, -1) or
|
||||||
|
ica.reach in enabled_reach_ids
|
||||||
|
)
|
||||||
|
),
|
||||||
|
self._data._data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def refresh(self):
|
||||||
|
self.beginResetModel()
|
||||||
|
try:
|
||||||
|
self._setup_lst()
|
||||||
|
finally:
|
||||||
|
self.endResetModel()
|
||||||
|
|
||||||
|
def rowCount(self, parent):
|
||||||
|
return len(self._lst)
|
||||||
|
|
||||||
|
def data(self, index, role):
|
||||||
|
if role != Qt.ItemDataRole.DisplayRole:
|
||||||
|
return QVariant()
|
||||||
|
|
||||||
|
row = index.row()
|
||||||
|
column = index.column()
|
||||||
|
|
||||||
|
if self._headers[column] == "name":
|
||||||
|
n = self._lst[row].name
|
||||||
|
if n is None or n == "":
|
||||||
|
return self._trad['not_defined']
|
||||||
|
return n
|
||||||
|
elif self._headers[column] == "reach":
|
||||||
|
n = self._lst[row].reach
|
||||||
|
if n is None:
|
||||||
|
return self._trad['not_associated']
|
||||||
|
return next(filter(
|
||||||
|
lambda edge: edge.id == n, self._river.edges()
|
||||||
|
)).name
|
||||||
|
elif self._headers[column] == "rk":
|
||||||
|
n = self._lst[row].start_rk
|
||||||
|
if n is None:
|
||||||
|
return self._trad['not_associated']
|
||||||
|
return self._rk_display_name(row, n)
|
||||||
|
elif self._headers[column] == "temperature":
|
||||||
|
n = self._lst[row].temperature
|
||||||
|
if n is None:
|
||||||
|
return self._trad['not_defined']
|
||||||
|
return n
|
||||||
|
|
||||||
|
return QVariant()
|
||||||
|
|
||||||
|
def _rk_display_name(self, row, rk):
|
||||||
|
reach_id = self._lst[row].reach
|
||||||
|
reach = next(
|
||||||
|
(
|
||||||
|
edge for edge in self._river.edges()
|
||||||
|
if edge.id == reach_id
|
||||||
|
),
|
||||||
|
None
|
||||||
|
)
|
||||||
|
if reach is None:
|
||||||
|
return str(rk)
|
||||||
|
|
||||||
|
profile = next(
|
||||||
|
(
|
||||||
|
profile for profile in reach.reach.profiles
|
||||||
|
if profile.rk == rk
|
||||||
|
),
|
||||||
|
None
|
||||||
|
)
|
||||||
|
return profile.display_name() if profile is not None else str(rk)
|
||||||
|
|
||||||
|
def setData(self, index, value, role=Qt.EditRole):
|
||||||
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
|
return False
|
||||||
|
|
||||||
|
if self.is_same_data(index, value):
|
||||||
|
return False
|
||||||
|
|
||||||
|
row = index.row()
|
||||||
|
column = index.column()
|
||||||
|
column_name = self._headers[column]
|
||||||
|
|
||||||
|
try:
|
||||||
|
new_value = (
|
||||||
|
self._river.edge(value).id
|
||||||
|
if column_name == "reach"
|
||||||
|
else value
|
||||||
|
)
|
||||||
|
if (column_name in ("reach", "rk")
|
||||||
|
and self._overlaps_existing_rk(
|
||||||
|
row, column_name, new_value
|
||||||
|
)):
|
||||||
|
QMessageBox.warning(
|
||||||
|
self._table_view,
|
||||||
|
self._trad["msg_rk_overlap_title"],
|
||||||
|
self._trad["msg_rk_overlap_text"]
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
new_value = value
|
||||||
|
if self._headers[column] == "reach":
|
||||||
|
reach = self._river.edge(value)
|
||||||
|
rks = reach.reach.get_rk()
|
||||||
|
if not rks:
|
||||||
|
return False
|
||||||
|
new_value = (reach.id, min(rks))
|
||||||
|
|
||||||
|
self._undo.push(
|
||||||
|
SetCommandSpec(
|
||||||
|
self._data, self._lst, row,
|
||||||
|
self._headers[column],
|
||||||
|
new_value
|
||||||
|
)
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.info(e)
|
||||||
|
logger.debug(traceback.format_exc())
|
||||||
|
|
||||||
|
if self._headers[column] == "reach":
|
||||||
|
rk_index = self.index(
|
||||||
|
row, self._headers.index("rk")
|
||||||
|
)
|
||||||
|
self.dataChanged.emit(index, rk_index)
|
||||||
|
else:
|
||||||
|
self.dataChanged.emit(index, index)
|
||||||
|
return True
|
||||||
|
|
||||||
|
def _overlaps_existing_rk(self, row, column, value):
|
||||||
|
current = self._lst[row]
|
||||||
|
reach = value if column == "reach" else current.reach
|
||||||
|
rk = value if column == "rk" else current.start_rk
|
||||||
|
if reach in (None, -1) or rk is None:
|
||||||
|
return False
|
||||||
|
|
||||||
|
rk = float(rk)
|
||||||
|
return any(
|
||||||
|
other is not current
|
||||||
|
and not other.is_deleted()
|
||||||
|
and other.reach == reach
|
||||||
|
and other.start_rk is not None
|
||||||
|
and other.end_rk is not None
|
||||||
|
and min(other.start_rk, other.end_rk) <= rk
|
||||||
|
<= max(other.start_rk, other.end_rk)
|
||||||
|
for other in self._data._data
|
||||||
|
)
|
||||||
|
|
||||||
|
def add(self, row, parent=QModelIndex()):
|
||||||
|
self.beginInsertRows(parent, row, row - 1)
|
||||||
|
|
||||||
|
self._undo.push(
|
||||||
|
AddCommand(
|
||||||
|
self._data, self._lst, row
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self._setup_lst()
|
||||||
|
self.endInsertRows()
|
||||||
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
|
def delete(self, rows, parent=QModelIndex()):
|
||||||
|
self.beginRemoveRows(parent, rows[0], rows[-1])
|
||||||
|
|
||||||
|
data_rows = {
|
||||||
|
id(ica): i for i, ica in enumerate(self._data._data)
|
||||||
|
}
|
||||||
|
self._undo.push(
|
||||||
|
DelCommand(
|
||||||
|
self._data,
|
||||||
|
self._data._data,
|
||||||
|
[data_rows[id(self._lst[row])] for row in rows]
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self._setup_lst()
|
||||||
|
self.endRemoveRows()
|
||||||
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
self._undo.undo()
|
||||||
|
self._setup_lst()
|
||||||
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
self._undo.redo()
|
||||||
|
self._setup_lst()
|
||||||
|
self.layoutChanged.emit()
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
# Table.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import traceback
|
||||||
|
from tools import trace, timer
|
||||||
|
|
||||||
|
from PyQt5.QtCore import (
|
||||||
|
Qt, QVariant, QAbstractTableModel,
|
||||||
|
QCoreApplication, QModelIndex, pyqtSlot,
|
||||||
|
QRect,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QDialogButtonBox, QPushButton, QLineEdit,
|
||||||
|
QFileDialog, QTableView, QAbstractItemView,
|
||||||
|
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||||
|
QComboBox,
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.Tools.PamhyrTable import PamhyrTableModel
|
||||||
|
|
||||||
|
from View.InitialConditionsTemperature.UndoCommand import (
|
||||||
|
SetCommand,
|
||||||
|
)
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
|
||||||
|
class InitialConditionTableDefaultModel(PamhyrTableModel):
|
||||||
|
def __init__(self, **kwargs):
|
||||||
|
super(InitialConditionTableDefaultModel, self).__init__(**kwargs)
|
||||||
|
|
||||||
|
def data(self, index, role):
|
||||||
|
if role != Qt.ItemDataRole.DisplayRole:
|
||||||
|
return QVariant()
|
||||||
|
|
||||||
|
row = index.row()
|
||||||
|
column = index.column()
|
||||||
|
if self._headers[column] == "name":
|
||||||
|
return self._data[row].name
|
||||||
|
elif self._headers[column] == "temperature":
|
||||||
|
n = self._data[row].temperature
|
||||||
|
if n is None:
|
||||||
|
return 0
|
||||||
|
return n
|
||||||
|
|
||||||
|
return QVariant()
|
||||||
|
|
||||||
|
def setData(self, index, value, role=Qt.EditRole):
|
||||||
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
|
return False
|
||||||
|
|
||||||
|
row = index.row()
|
||||||
|
column = index.column()
|
||||||
|
|
||||||
|
try:
|
||||||
|
if self._headers[column] is not None:
|
||||||
|
self._undo.push(
|
||||||
|
SetCommand(
|
||||||
|
self._data, row, self._headers[column], value
|
||||||
|
)
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.info(e)
|
||||||
|
logger.debug(traceback.format_exc())
|
||||||
|
|
||||||
|
self.dataChanged.emit(index, index)
|
||||||
|
return True
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
self._undo.undo()
|
||||||
|
self.layoutChanged.emit()
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
self._undo.redo()
|
||||||
|
self.layoutChanged.emit()
|
||||||
@@ -0,0 +1,161 @@
|
|||||||
|
# UndoCommand.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from copy import deepcopy
|
||||||
|
from tools import trace, timer
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QMessageBox, QUndoCommand, QUndoStack,
|
||||||
|
)
|
||||||
|
|
||||||
|
from Model.InitialConditionsTemperature.InitialConditionsTemperature \
|
||||||
|
import InitialConditionsTemperature
|
||||||
|
from Model.InitialConditionsTemperature.InitialConditionsTemperatureList \
|
||||||
|
import InitialConditionsTemperatureList
|
||||||
|
|
||||||
|
|
||||||
|
class SetCommand(QUndoCommand):
|
||||||
|
def __init__(self, data, row, column, new_value):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._row = row
|
||||||
|
self._column = column
|
||||||
|
|
||||||
|
if self._column == "name":
|
||||||
|
self._old = self._data[self._row].name
|
||||||
|
elif self._column == "temperature":
|
||||||
|
self._old = self._data[self._row].temperature
|
||||||
|
|
||||||
|
_type = float
|
||||||
|
if column == "name":
|
||||||
|
_type = str
|
||||||
|
|
||||||
|
self._new = _type(new_value)
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
if self._column == "name":
|
||||||
|
self._data[self._row].name = self._old
|
||||||
|
elif self._column == "temperature":
|
||||||
|
self._data[self._row].temperature = self._old
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
if self._column == "name":
|
||||||
|
self._data[self._row].name = self._new
|
||||||
|
elif self._column == "temperature":
|
||||||
|
self._data[self._row].temperature = self._new
|
||||||
|
|
||||||
|
|
||||||
|
class SetCommandSpec(QUndoCommand):
|
||||||
|
def __init__(self, parent, data, row, column, new_value):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._parent = parent
|
||||||
|
self._value = data[row]
|
||||||
|
self._column = column
|
||||||
|
|
||||||
|
if self._column == "name":
|
||||||
|
self._old = self._value.name
|
||||||
|
elif self._column == "reach":
|
||||||
|
self._old = self._value.reach
|
||||||
|
self._old_start_rk = self._value.start_rk
|
||||||
|
self._old_end_rk = self._value.end_rk
|
||||||
|
elif self._column == "rk":
|
||||||
|
self._old = self._value.start_rk
|
||||||
|
elif self._column == "temperature":
|
||||||
|
self._old = self._value.temperature
|
||||||
|
|
||||||
|
_type = float
|
||||||
|
if column == "name":
|
||||||
|
_type = str
|
||||||
|
elif column == "reach":
|
||||||
|
_type = int
|
||||||
|
|
||||||
|
if column == "reach":
|
||||||
|
self._new = _type(new_value[0])
|
||||||
|
self._new_rk = float(new_value[1])
|
||||||
|
else:
|
||||||
|
self._new = _type(new_value)
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
if self._column == "name":
|
||||||
|
self._value.name = self._old
|
||||||
|
elif self._column == "reach":
|
||||||
|
self._value.reach = self._old
|
||||||
|
self._value.start_rk = self._old_start_rk
|
||||||
|
self._value.end_rk = self._old_end_rk
|
||||||
|
elif self._column == "rk":
|
||||||
|
self._value.start_rk = self._old
|
||||||
|
self._value.end_rk = self._old
|
||||||
|
elif self._column == "temperature":
|
||||||
|
self._value.temperature = self._old
|
||||||
|
self._parent.modified()
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
if self._column == "name":
|
||||||
|
self._value.name = self._new
|
||||||
|
elif self._column == "reach":
|
||||||
|
self._value.reach = self._new
|
||||||
|
self._value.start_rk = self._new_rk
|
||||||
|
self._value.end_rk = self._new_rk
|
||||||
|
elif self._column == "rk":
|
||||||
|
self._value.start_rk = self._new
|
||||||
|
self._value.end_rk = self._new
|
||||||
|
elif self._column == "temperature":
|
||||||
|
self._value.temperature = self._new
|
||||||
|
self._parent.modified()
|
||||||
|
|
||||||
|
|
||||||
|
class AddCommand(QUndoCommand):
|
||||||
|
def __init__(self, data, ics_spec, index):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._ics_spec = ics_spec
|
||||||
|
self._index = index
|
||||||
|
self._new = None
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
self._data.delete_i([self._index])
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
if self._new is None:
|
||||||
|
self._new = self._data.new(self._index)
|
||||||
|
else:
|
||||||
|
self._data.insert(self._index, self._new)
|
||||||
|
|
||||||
|
|
||||||
|
class DelCommand(QUndoCommand):
|
||||||
|
def __init__(self, data, ics_spec, rows):
|
||||||
|
QUndoCommand.__init__(self)
|
||||||
|
|
||||||
|
self._data = data
|
||||||
|
self._ics_spec = ics_spec
|
||||||
|
self._rows = rows
|
||||||
|
|
||||||
|
self._ic = []
|
||||||
|
for row in rows:
|
||||||
|
self._ic.append((row, self._ics_spec[row]))
|
||||||
|
self._ic.sort()
|
||||||
|
|
||||||
|
def undo(self):
|
||||||
|
for row, el in self._ic:
|
||||||
|
self._data.insert(row, el)
|
||||||
|
|
||||||
|
def redo(self):
|
||||||
|
self._data.delete_i(self._rows)
|
||||||
@@ -0,0 +1,318 @@
|
|||||||
|
# Window.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import os
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from tools import trace, timer, logger_exception
|
||||||
|
|
||||||
|
from View.Tools.PamhyrWindow import PamhyrWindow
|
||||||
|
|
||||||
|
from PyQt5.QtGui import (
|
||||||
|
QKeySequence, QIcon,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5.QtCore import (
|
||||||
|
Qt, QVariant, QAbstractTableModel,
|
||||||
|
QCoreApplication, QModelIndex, pyqtSlot,
|
||||||
|
QRect, QItemSelectionModel,
|
||||||
|
)
|
||||||
|
|
||||||
|
from PyQt5.QtWidgets import (
|
||||||
|
QDialogButtonBox, QPushButton, QLineEdit,
|
||||||
|
QFileDialog, QTableView, QAbstractItemView,
|
||||||
|
QUndoStack, QShortcut, QAction, QItemDelegate,
|
||||||
|
QComboBox, QVBoxLayout, QHeaderView, QTabWidget,
|
||||||
|
QVBoxLayout, QToolBar, QAction, QToolButton,
|
||||||
|
)
|
||||||
|
|
||||||
|
from Modules import Modules
|
||||||
|
|
||||||
|
from View.InitialConditionsTemperature.UndoCommand import (
|
||||||
|
SetCommand,
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.InitialConditionsTemperature.TableDefault import (
|
||||||
|
InitialConditionTableDefaultModel,
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.InitialConditionsTemperature.Table import (
|
||||||
|
InitialConditionTableModel, ComboBoxDelegate,
|
||||||
|
)
|
||||||
|
|
||||||
|
from View.InitialConditionsTemperature.translate import IcTemperatureTranslate
|
||||||
|
|
||||||
|
from Solver.Mage import Mage8
|
||||||
|
|
||||||
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
|
class InitialConditionsTemperatureWindow(PamhyrWindow):
|
||||||
|
_pamhyr_ui = "InitialConditionsTemperature"
|
||||||
|
_pamhyr_name = "Initial condition Temperature"
|
||||||
|
|
||||||
|
def __init__(self, data=None, study=None,
|
||||||
|
config=None, parent=None):
|
||||||
|
self._data = []
|
||||||
|
self._data.append(data)
|
||||||
|
trad = IcTemperatureTranslate()
|
||||||
|
|
||||||
|
name = (
|
||||||
|
trad[self._pamhyr_name] +
|
||||||
|
" - " + study.name
|
||||||
|
)
|
||||||
|
|
||||||
|
super(InitialConditionsTemperatureWindow, self).__init__(
|
||||||
|
title=name,
|
||||||
|
study=study,
|
||||||
|
config=config,
|
||||||
|
trad=trad,
|
||||||
|
parent=parent
|
||||||
|
)
|
||||||
|
self._hash_data.append(data)
|
||||||
|
|
||||||
|
# self._ics_Temperature_lst = study.river.ic_Temperature
|
||||||
|
|
||||||
|
self.setup_table()
|
||||||
|
|
||||||
|
def setup_table(self):
|
||||||
|
|
||||||
|
path_icons = os.path.join(self._get_ui_directory(), f"ressources")
|
||||||
|
|
||||||
|
table_default = self.find(QTableView, f"tableView")
|
||||||
|
|
||||||
|
if self._study.is_editable():
|
||||||
|
editable_headers = self._trad.get_dict("table_headers")
|
||||||
|
else:
|
||||||
|
editable_headers = []
|
||||||
|
|
||||||
|
self._table = InitialConditionTableDefaultModel(
|
||||||
|
table_view=table_default,
|
||||||
|
table_headers=self._trad.get_dict("table_headers"),
|
||||||
|
editable_headers=editable_headers,
|
||||||
|
delegates={},
|
||||||
|
data=self._data,
|
||||||
|
undo=self._undo_stack,
|
||||||
|
trad=self._trad
|
||||||
|
)
|
||||||
|
|
||||||
|
table_default.setModel(self._table)
|
||||||
|
table_default.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||||
|
table_default.horizontalHeader().setSectionResizeMode(
|
||||||
|
QHeaderView.Stretch
|
||||||
|
)
|
||||||
|
table_default.setAlternatingRowColors(True)
|
||||||
|
|
||||||
|
layout = self.find(QVBoxLayout, f"verticalLayout_1")
|
||||||
|
toolBar = QToolBar()
|
||||||
|
layout.addWidget(toolBar)
|
||||||
|
|
||||||
|
action_add = QAction(self)
|
||||||
|
action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png")))
|
||||||
|
|
||||||
|
if self._study.is_editable():
|
||||||
|
action_add.triggered.connect(self.add)
|
||||||
|
action_delete = QAction(self)
|
||||||
|
action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png")))
|
||||||
|
|
||||||
|
if self._study.is_editable():
|
||||||
|
action_delete.triggered.connect(self.delete)
|
||||||
|
|
||||||
|
toolBar.addAction(action_add)
|
||||||
|
toolBar.addAction(action_delete)
|
||||||
|
|
||||||
|
self.table_spec = QTableView()
|
||||||
|
layout.addWidget(self.table_spec)
|
||||||
|
|
||||||
|
self._delegate_reach = ComboBoxDelegate(
|
||||||
|
trad=self._trad,
|
||||||
|
data=self._study.river,
|
||||||
|
ic_spec_lst=self._data[0]._data,
|
||||||
|
parent=self,
|
||||||
|
mode="reaches"
|
||||||
|
)
|
||||||
|
self._delegate_rk = ComboBoxDelegate(
|
||||||
|
trad=self._trad,
|
||||||
|
data=self._study.river,
|
||||||
|
ic_spec_lst=self._data[0]._data,
|
||||||
|
parent=self,
|
||||||
|
mode="rk"
|
||||||
|
)
|
||||||
|
|
||||||
|
if self._study.is_editable():
|
||||||
|
editable_headers_spec = self._trad.get_dict("table_headers_spec")
|
||||||
|
else:
|
||||||
|
editable_headers_spec = []
|
||||||
|
|
||||||
|
self._table_spec = InitialConditionTableModel(
|
||||||
|
table_view=self.table_spec,
|
||||||
|
table_headers=self._trad.get_dict("table_headers_spec"),
|
||||||
|
editable_headers=editable_headers_spec,
|
||||||
|
delegates={
|
||||||
|
"reach": self._delegate_reach,
|
||||||
|
"rk": self._delegate_rk
|
||||||
|
},
|
||||||
|
data=self._data[0],
|
||||||
|
undo=self._undo_stack,
|
||||||
|
trad=self._trad,
|
||||||
|
river=self._study.river
|
||||||
|
)
|
||||||
|
|
||||||
|
self.table_spec.setModel(self._table_spec)
|
||||||
|
self.table_spec.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||||
|
self.table_spec.horizontalHeader().setSectionResizeMode(
|
||||||
|
QHeaderView.Stretch
|
||||||
|
)
|
||||||
|
self.table_spec.setAlternatingRowColors(True)
|
||||||
|
|
||||||
|
selectionModel = self.table_spec.selectionModel()
|
||||||
|
index = self.table_spec.model().index(0, 0)
|
||||||
|
|
||||||
|
selectionModel.select(
|
||||||
|
index,
|
||||||
|
QItemSelectionModel.Rows |
|
||||||
|
QItemSelectionModel.ClearAndSelect |
|
||||||
|
QItemSelectionModel.Select
|
||||||
|
)
|
||||||
|
self.table_spec.scrollTo(index)
|
||||||
|
|
||||||
|
def index_selected_row(self):
|
||||||
|
# table = self.find(QTableView, f"tableView")
|
||||||
|
table = self.table_spec
|
||||||
|
rows = table.selectionModel()\
|
||||||
|
.selectedRows()
|
||||||
|
|
||||||
|
if len(rows) == 0:
|
||||||
|
return 0
|
||||||
|
|
||||||
|
return rows[0].row()
|
||||||
|
|
||||||
|
def index_selected_rows(self):
|
||||||
|
# table = self.find(QTableView, f"tableView")
|
||||||
|
table = self.table_spec
|
||||||
|
return list(
|
||||||
|
# Delete duplicate
|
||||||
|
set(
|
||||||
|
map(
|
||||||
|
lambda i: i.row(),
|
||||||
|
table.selectedIndexes()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
def move_up(self):
|
||||||
|
row = self.index_selected_row()
|
||||||
|
self._table.move_up(row)
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
def move_down(self):
|
||||||
|
row = self.index_selected_row()
|
||||||
|
self._table.move_down(row)
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
def _copy(self):
|
||||||
|
rows = list(
|
||||||
|
map(
|
||||||
|
lambda row: row.row(),
|
||||||
|
self.tableView.selectionModel().selectedRows()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
table = list(
|
||||||
|
map(
|
||||||
|
lambda eic: list(
|
||||||
|
map(
|
||||||
|
lambda k: eic[1][k],
|
||||||
|
["rk", "discharge", "elevation"]
|
||||||
|
)
|
||||||
|
),
|
||||||
|
filter(
|
||||||
|
lambda eic: eic[0] in rows,
|
||||||
|
enumerate(self._ics.lst())
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
self.copyTableIntoClipboard(table)
|
||||||
|
|
||||||
|
def _paste(self):
|
||||||
|
header, data = self.parseClipboardTable()
|
||||||
|
|
||||||
|
if len(data) + len(header) == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
"IC: Paste: " +
|
||||||
|
f"header = {header}, " +
|
||||||
|
f"data = {data}"
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
row = self.index_selected_row()
|
||||||
|
# self._table.paste(row, header, data)
|
||||||
|
self._table.paste(row, [], data)
|
||||||
|
except Exception as e:
|
||||||
|
logger_exception(e)
|
||||||
|
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
def _undo(self):
|
||||||
|
undo_stack = self._undo_stack
|
||||||
|
if undo_stack is None or not undo_stack.canUndo():
|
||||||
|
return
|
||||||
|
|
||||||
|
if isinstance(undo_stack.command(undo_stack.index() - 1), SetCommand):
|
||||||
|
self._table.undo()
|
||||||
|
else:
|
||||||
|
self._table_spec.undo()
|
||||||
|
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
def _redo(self):
|
||||||
|
undo_stack = self._undo_stack
|
||||||
|
if undo_stack is None or not undo_stack.canRedo():
|
||||||
|
return
|
||||||
|
|
||||||
|
if isinstance(undo_stack.command(undo_stack.index()), SetCommand):
|
||||||
|
self._table.redo()
|
||||||
|
else:
|
||||||
|
self._table_spec.redo()
|
||||||
|
|
||||||
|
self._update()
|
||||||
|
|
||||||
|
def add(self):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
if len(self._data[0]._data) == 0 or len(rows) == 0:
|
||||||
|
self._table_spec.add(0)
|
||||||
|
else:
|
||||||
|
self._table_spec.add(rows[0])
|
||||||
|
|
||||||
|
def delete(self):
|
||||||
|
rows = self.index_selected_rows()
|
||||||
|
if len(rows) == 0:
|
||||||
|
return
|
||||||
|
self._table_spec.delete(rows)
|
||||||
|
|
||||||
|
def _propagated_update(self, key=Modules(0)):
|
||||||
|
if Modules.NETWORK not in key:
|
||||||
|
return
|
||||||
|
|
||||||
|
self._table_spec.refresh()
|
||||||
|
self.table_spec.clearSelection()
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
# translate.py -- Pamhyr
|
||||||
|
# Copyright (C) 2023-2025 INRAE
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from PyQt5.QtCore import QCoreApplication
|
||||||
|
|
||||||
|
from View.Translate import MainTranslate
|
||||||
|
|
||||||
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
|
||||||
|
class IcTemperatureTranslate(MainTranslate):
|
||||||
|
def __init__(self):
|
||||||
|
super(IcTemperatureTranslate, self).__init__()
|
||||||
|
|
||||||
|
self._dict["Initial condition Temperature"] = _translate(
|
||||||
|
"InitialConditionTemperature", "Initial condition temperature")
|
||||||
|
|
||||||
|
self._dict["rk"] = self._dict["unit_rk"]
|
||||||
|
|
||||||
|
self._dict["msg_rk_overlap_title"] = _translate(
|
||||||
|
"InitialConditionTemperature",
|
||||||
|
"Chainage already used"
|
||||||
|
)
|
||||||
|
self._dict["msg_rk_overlap_text"] = _translate(
|
||||||
|
"InitialConditionTemperature",
|
||||||
|
"An initial temperature condition is already defined at this "
|
||||||
|
"chainage on the selected reach."
|
||||||
|
)
|
||||||
|
|
||||||
|
self._sub_dict["table_headers"] = {
|
||||||
|
"name": self._dict["name"],
|
||||||
|
"temperature": self._dict["unit_temperature"],
|
||||||
|
}
|
||||||
|
|
||||||
|
self._sub_dict["table_headers_spec"] = {
|
||||||
|
"name": self._dict["name"],
|
||||||
|
"reach": self._dict["reach"],
|
||||||
|
"rk": _translate("Unit", "RK (m)"),
|
||||||
|
"temperature": self._dict["unit_temperature"],
|
||||||
|
}
|
||||||
Loaded 100 of 172 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user