parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: parouby:7ef41ad886dd0d8efa5ff9acfae926232b9ef740
Branches Tags
parouby:master
parouby:scenarios
parouby:ci-test
parouby:scenario-dev-pa
parouby:test_sound
parouby:terraz_dev
parouby:compare_results
parouby:adists_release
parouby:adists_new
parouby:adists_num
parouby:InitialConditions
parouby:0.0.9
parouby:setup.py
parouby:mesh
parouby:results
parouby:v1.2.5
parouby:v1.2.5rc3
parouby:v1.2.5rc2
parouby:v1.2.5cr1
parouby:Test_scenarios5
parouby:Test_scenarios4
parouby:v1.2.4
parouby:v1.2.3
parouby:Test_scenarios3
parouby:Test_scenarios2
parouby:v1.2.2
parouby:v1.2.1
parouby:Test_scenarios
parouby:v1.2.0
parouby:v1.2.0rc2
parouby:v1.2.0rc1
parouby:v1.2.0rc0
parouby:v1.1.1rc0
parouby:v1.1.0
parouby:v1.1.0-rc2
parouby:v1.1.0-rc1
parouby:v1.1.0-rc0
parouby:v1.0.3
parouby:v1.0.1
parouby:v1.0.0
parouby:v0.0.8-patch-2
parouby:v0.0.8-patch-1
parouby:v0.0.8
parouby:v0.0.7
parouby:v0.0.6
parouby:v0.0.5
parouby:journees-modelisation-2024-5
parouby:journees-modelisation-2024-4
parouby:journees-modelisation-2024-3
parouby:journees-modelisation-2024-2
parouby:journees-modelisation-2024-1
parouby:journees-modelisation-2024
parouby:v0.0.4
parouby:v0.0.3
parouby:v0.0.2
parouby:v0.0.1
parouby:v0.0.0
..
compare: parouby:674247db091c1635e6c487be85a5a901d8c4ef9a
Branches Tags
parouby:master
parouby:scenarios
parouby:ci-test
parouby:scenario-dev-pa
parouby:test_sound
parouby:terraz_dev
parouby:compare_results
parouby:adists_release
parouby:adists_new
parouby:adists_num
parouby:InitialConditions
parouby:0.0.9
parouby:setup.py
parouby:mesh
parouby:results
parouby:v1.2.5
parouby:v1.2.5rc3
parouby:v1.2.5rc2
parouby:v1.2.5cr1
parouby:Test_scenarios5
parouby:Test_scenarios4
parouby:v1.2.4
parouby:v1.2.3
parouby:Test_scenarios3
parouby:Test_scenarios2
parouby:v1.2.2
parouby:v1.2.1
parouby:Test_scenarios
parouby:v1.2.0
parouby:v1.2.0rc2
parouby:v1.2.0rc1
parouby:v1.2.0rc0
parouby:v1.1.1rc0
parouby:v1.1.0
parouby:v1.1.0-rc2
parouby:v1.1.0-rc1
parouby:v1.1.0-rc0
parouby:v1.0.3
parouby:v1.0.1
parouby:v1.0.0
parouby:v0.0.8-patch-2
parouby:v0.0.8-patch-1
parouby:v0.0.8
parouby:v0.0.7
parouby:v0.0.6
parouby:v0.0.5
parouby:journees-modelisation-2024-5
parouby:journees-modelisation-2024-4
parouby:journees-modelisation-2024-3
parouby:journees-modelisation-2024-2
parouby:journees-modelisation-2024-1
parouby:journees-modelisation-2024
parouby:v0.0.4
parouby:v0.0.3
parouby:v0.0.2
parouby:v0.0.1
parouby:v0.0.0

No commits in common. "7ef41ad886dd0d8efa5ff9acfae926232b9ef740" and "674247db091c1635e6c487be85a5a901d8c4ef9a" have entirely different histories.
7ef41ad886 ... 674247db09

7 changed files with 130 additions and 206 deletions
Show Stats Expand all files Collapse all files

2
src/View/MainWindow.py
View File

@ -1741,7 +1741,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
path = os.path.normpath(dir_path) path = os.path.normpath(dir_path)
solver_name = path.split(os.sep)[-2] solver_name = path.split(os.sep)[-2]
solver_results = next(filter(lambda x: x.name == solver_name, solver_results = next(filter(lambda x: x.name == solver_name,
self.conf.solvers), None) self.conf.solvers))
solver_results_adists = solver_results.results( solver_results_adists = solver_results.results(
self._study, self._study,
repertory=dir_path, qlog=None) # self._output) repertory=dir_path, qlog=None) # self._output)

205
src/View/Results/CustomPlot/Plot.py
View File

@ -62,9 +62,9 @@ class CustomPlot(PamhyrPlot):
self._x = x self._x = x
self._y = y self._y = y
self._envelop = envelop self._envelop = envelop
self._current_reach = reach self._reach = reach
self._current_profile_id = profile self._profile = profile
self._current_timestamp = timestamp self._timestamp = timestamp
self._current_res_id = res_id[0] self._current_res_id = res_id[0]
self._parent = parent self._parent = parent
@ -133,7 +133,7 @@ class CustomPlot(PamhyrPlot):
""" """
Get SL list for profile p at initial time (initial data) Get SL list for profile p at initial time (initial data)
""" """
t0 = min(list(self.data[self._current_res_id].get("timestamps"))) t0 = min(list(self.data[self._current_res_id[0]].get("timestamps")))
return map( return map(
lambda p: p.get_ts_key(t0, "sl")[0], lambda p: p.get_ts_key(t0, "sl")[0],
reach.profiles reach.profiles
@ -144,14 +144,14 @@ class CustomPlot(PamhyrPlot):
Get SL list for profile p at current time Get SL list for profile p at current time
""" """
return map( return map(
lambda p: p.get_ts_key(self._current_timestamp, "sl")[0], lambda p: p.get_ts_key(self._timestamp, "sl")[0],
reach.profiles reach.profiles
) )
def get_ts_zmin(self, profile, res_id): def get_ts_zmin(self, profile, res_id):
results = self.data[res_id] results = self.data[res_id]
nt = len(list(results.get("timestamps"))) nt = len(list(results.get("timestamps")))
reach = results.river.reach(self._current_reach) reach = results.river.reach(self._reach)
berdrock = self.sl_compute_bedrock(reach) berdrock = self.sl_compute_bedrock(reach)
sl = reach.profile(profile).get_key("sl") sl = reach.profile(profile).get_key("sl")
@ -171,10 +171,10 @@ class CustomPlot(PamhyrPlot):
def _draw_rk(self): def _draw_rk(self):
results = self.data[self._current_res_id] results = self.data[self._current_res_id]
reach = results.river.reach(self._current_reach) reach = results.river.reach(self._reach)
if self._current_res_id == 2: # compare results if self._current_res_id == 2: # compare results
reach1 = self.data[0].river.reach(self._current_reach) reach1 = self.data[0].river.reach(self._reach)
reach2 = self.data[1].river.reach(self._current_reach) reach2 = self.data[1].river.reach(self._reach)
rk = reach.geometry.get_rk() rk = reach.geometry.get_rk()
if reach.has_sediment(): if reach.has_sediment():
z_min = self.draw_bottom_with_bedload(reach) z_min = self.draw_bottom_with_bedload(reach)
@ -183,19 +183,19 @@ class CustomPlot(PamhyrPlot):
q = list( q = list(
map( map(
lambda p: p.get_ts_key(self._current_timestamp, "Q"), lambda p: p.get_ts_key(self._timestamp, "Q"),
reach.profiles reach.profiles
) )
) )
z = list( z = list(
map( map(
lambda p: p.get_ts_key(self._current_timestamp, "Z"), lambda p: p.get_ts_key(self._timestamp, "Z"),
reach.profiles reach.profiles
) )
) )
v = list( v = list(
map( map(
lambda p: p.get_ts_key(self._current_timestamp, "V"), lambda p: p.get_ts_key(self._timestamp, "V"),
reach.profiles reach.profiles
) )
) )
@ -248,8 +248,7 @@ class CustomPlot(PamhyrPlot):
e = list( e = list(
map( map(
lambda p: max(self.get_ts_zmin( lambda p: max(self.get_ts_zmin(p, res_id)),
p, self._current_res_id)),
range(len(reach)) range(len(reach))
) )
) )
@ -262,8 +261,7 @@ class CustomPlot(PamhyrPlot):
e = list( e = list(
map( map(
lambda p: min(self.get_ts_zmin( lambda p: min(self.get_ts_zmin(p, res_id)),
p, self._current_res_id)),
range(len(reach)) range(len(reach))
) )
) )
@ -404,7 +402,7 @@ class CustomPlot(PamhyrPlot):
d = list( d = list(
map( map(
lambda p: p.geometry.max_water_depth( lambda p: p.geometry.max_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach.profiles reach.profiles
) )
) )
@ -412,14 +410,14 @@ class CustomPlot(PamhyrPlot):
d1 = list( d1 = list(
map( map(
lambda p: p.geometry.max_water_depth( lambda p: p.geometry.max_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach1.profiles reach1.profiles
) )
) )
d2 = list( d2 = list(
map( map(
lambda p: p.geometry.max_water_depth( lambda p: p.geometry.max_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach2.profiles reach2.profiles
) )
) )
@ -473,7 +471,7 @@ class CustomPlot(PamhyrPlot):
d = list( d = list(
map( map(
lambda p: p.geometry.mean_water_depth( lambda p: p.geometry.mean_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach.profiles reach.profiles
) )
) )
@ -481,14 +479,14 @@ class CustomPlot(PamhyrPlot):
d1 = list( d1 = list(
map( map(
lambda p: p.geometry.mean_water_depth( lambda p: p.geometry.mean_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach1.profiles reach1.profiles
) )
) )
d2 = list( d2 = list(
map( map(
lambda p: p.geometry.mean_water_depth( lambda p: p.geometry.mean_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach2.profiles reach2.profiles
) )
) )
@ -512,12 +510,12 @@ class CustomPlot(PamhyrPlot):
fr = list( fr = list(
map( map(
lambda p: lambda p:
p.get_ts_key(self._current_timestamp, "V") / p.get_ts_key(self._timestamp, "V") /
sqrt(9.81 * ( sqrt(9.81 * (
p.geometry.wet_area(p.get_ts_key( p.geometry.wet_area(
self._current_timestamp, "Z")) / p.get_ts_key(self._timestamp, "Z")) /
p.geometry.wet_width(p.get_ts_key( p.geometry.wet_width(
self._current_timestamp, "Z")) p.get_ts_key(self._timestamp, "Z"))
)), )),
reach.profiles reach.profiles
) )
@ -526,12 +524,12 @@ class CustomPlot(PamhyrPlot):
fr1 = list( fr1 = list(
map( map(
lambda p: lambda p:
p.get_ts_key(self._current_timestamp, "V") / p.get_ts_key(self._timestamp, "V") /
sqrt(9.81 * ( sqrt(9.81 * (
p.geometry.wet_area(p.get_ts_key( p.geometry.wet_area(
self._current_timestamp, "Z")) / p.get_ts_key(self._timestamp, "Z")) /
p.geometry.wet_width(p.get_ts_key( p.geometry.wet_width(
self._current_timestamp, "Z")) p.get_ts_key(self._timestamp, "Z"))
)), )),
reach1.profiles reach1.profiles
) )
@ -539,12 +537,12 @@ class CustomPlot(PamhyrPlot):
fr2 = list( fr2 = list(
map( map(
lambda p: lambda p:
p.get_ts_key(self._current_timestamp, "V") / p.get_ts_key(self._timestamp, "V") /
sqrt(9.81 * ( sqrt(9.81 * (
p.geometry.wet_area(p.get_ts_key( p.geometry.wet_area(
self._current_timestamp, "Z")) / p.get_ts_key(self._timestamp, "Z")) /
p.geometry.wet_width(p.get_ts_key( p.geometry.wet_width(
self._current_timestamp, "Z")) p.get_ts_key(self._timestamp, "Z"))
)), )),
reach2.profiles reach2.profiles
) )
@ -568,7 +566,7 @@ class CustomPlot(PamhyrPlot):
d = list( d = list(
map( map(
lambda p: p.geometry.wet_area( lambda p: p.geometry.wet_area(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach.profiles reach.profiles
) )
) )
@ -576,14 +574,14 @@ class CustomPlot(PamhyrPlot):
d1 = list( d1 = list(
map( map(
lambda p: p.geometry.wet_area( lambda p: p.geometry.wet_area(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach1.profiles reach1.profiles
) )
) )
d2 = list( d2 = list(
map( map(
lambda p: p.geometry.wet_area( lambda p: p.geometry.wet_area(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach2.profiles reach2.profiles
) )
) )
@ -611,10 +609,10 @@ class CustomPlot(PamhyrPlot):
def _redraw_rk(self): def _redraw_rk(self):
results = self.data[self._current_res_id] results = self.data[self._current_res_id]
reach = results.river.reach(self._current_reach) reach = results.river.reach(self._reach)
if self._current_res_id == 2: # compare results if self._current_res_id == 2: # compare results
reach1 = self.data[0].river.reach(self._current_reach) reach1 = self.data[0].river.reach(self._reach)
reach2 = self.data[1].river.reach(self._current_reach) reach2 = self.data[1].river.reach(self._reach)
rk = reach.geometry.get_rk() rk = reach.geometry.get_rk()
z_min = reach.geometry.get_z_min() z_min = reach.geometry.get_z_min()
@ -625,19 +623,19 @@ class CustomPlot(PamhyrPlot):
q = list( q = list(
map( map(
lambda p: p.get_ts_key(self._current_timestamp, "Q"), lambda p: p.get_ts_key(self._timestamp, "Q"),
reach.profiles reach.profiles
) )
) )
z = list( z = list(
map( map(
lambda p: p.get_ts_key(self._current_timestamp, "Z"), lambda p: p.get_ts_key(self._timestamp, "Z"),
reach.profiles reach.profiles
) )
) )
v = list( v = list(
map( map(
lambda p: p.get_ts_key(self._current_timestamp, "V"), lambda p: p.get_ts_key(self._timestamp, "V"),
reach.profiles reach.profiles
) )
) )
@ -681,7 +679,7 @@ class CustomPlot(PamhyrPlot):
d = list( d = list(
map( map(
lambda p: p.geometry.max_water_depth( lambda p: p.geometry.max_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach.profiles reach.profiles
) )
) )
@ -689,14 +687,14 @@ class CustomPlot(PamhyrPlot):
d1 = list( d1 = list(
map( map(
lambda p: p.geometry.max_water_depth( lambda p: p.geometry.max_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach1.profiles reach1.profiles
) )
) )
d2 = list( d2 = list(
map( map(
lambda p: p.geometry.max_water_depth( lambda p: p.geometry.max_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach2.profiles reach2.profiles
) )
) )
@ -714,7 +712,7 @@ class CustomPlot(PamhyrPlot):
d = list( d = list(
map( map(
lambda p: p.geometry.mean_water_depth( lambda p: p.geometry.mean_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach.profiles reach.profiles
) )
) )
@ -722,14 +720,14 @@ class CustomPlot(PamhyrPlot):
d1 = list( d1 = list(
map( map(
lambda p: p.geometry.mean_water_depth( lambda p: p.geometry.mean_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach1.profiles reach1.profiles
) )
) )
d2 = list( d2 = list(
map( map(
lambda p: p.geometry.mean_water_depth( lambda p: p.geometry.mean_water_depth(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach2.profiles reach2.profiles
) )
) )
@ -747,12 +745,12 @@ class CustomPlot(PamhyrPlot):
fr = list( fr = list(
map( map(
lambda p: lambda p:
p.get_ts_key(self._current_timestamp, "V") / p.get_ts_key(self._timestamp, "V") /
sqrt(9.81 * ( sqrt(9.81 * (
p.geometry.wet_area(p.get_ts_key( p.geometry.wet_area(
self._current_timestamp, "Z")) / p.get_ts_key(self._timestamp, "Z")) /
p.geometry.wet_width(p.get_ts_key( p.geometry.wet_width(
self._current_timestamp, "Z")) p.get_ts_key(self._timestamp, "Z"))
)), )),
reach.profiles reach.profiles
) )
@ -761,12 +759,12 @@ class CustomPlot(PamhyrPlot):
fr1 = list( fr1 = list(
map( map(
lambda p: lambda p:
p.get_ts_key(self._current_timestamp, "V") / p.get_ts_key(self._timestamp, "V") /
sqrt(9.81 * ( sqrt(9.81 * (
p.geometry.wet_area(p.get_ts_key( p.geometry.wet_area(
self._current_timestamp, "Z")) / p.get_ts_key(self._timestamp, "Z")) /
p.geometry.wet_width(p.get_ts_key( p.geometry.wet_width(
self._current_timestamp, "Z")) p.get_ts_key(self._timestamp, "Z"))
)), )),
reach1.profiles reach1.profiles
) )
@ -774,12 +772,12 @@ class CustomPlot(PamhyrPlot):
fr2 = list( fr2 = list(
map( map(
lambda p: lambda p:
p.get_ts_key(self._current_timestamp, "V") / p.get_ts_key(self._timestamp, "V") /
sqrt(9.81 * ( sqrt(9.81 * (
p.geometry.wet_area(p.get_ts_key( p.geometry.wet_area(
self._current_timestamp, "Z")) / p.get_ts_key(self._timestamp, "Z")) /
p.geometry.wet_width(p.get_ts_key( p.geometry.wet_width(
self._current_timestamp, "Z")) p.get_ts_key(self._timestamp, "Z"))
)), )),
reach2.profiles reach2.profiles
) )
@ -798,7 +796,7 @@ class CustomPlot(PamhyrPlot):
d = list( d = list(
map( map(
lambda p: p.geometry.wet_area( lambda p: p.geometry.wet_area(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach.profiles reach.profiles
) )
) )
@ -806,14 +804,14 @@ class CustomPlot(PamhyrPlot):
d1 = list( d1 = list(
map( map(
lambda p: p.geometry.wet_area( lambda p: p.geometry.wet_area(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach1.profiles reach1.profiles
) )
) )
d2 = list( d2 = list(
map( map(
lambda p: p.geometry.wet_area( lambda p: p.geometry.wet_area(
p.get_ts_key(self._current_timestamp, "Z")), p.get_ts_key(self._timestamp, "Z")),
reach2.profiles reach2.profiles
) )
) )
@ -870,8 +868,8 @@ class CustomPlot(PamhyrPlot):
def _draw_time(self): def _draw_time(self):
results = self.data[self._current_res_id] results = self.data[self._current_res_id]
reach = results.river.reach(self._current_reach) reach = results.river.reach(self._reach)
profile = reach.profile(self._current_profile_id) profile = reach.profile(self._profile)
shift = 0 shift = 0
compt = 0 compt = 0
@ -886,10 +884,10 @@ class CustomPlot(PamhyrPlot):
ts = self._parent._timestamps ts = self._parent._timestamps
if self._current_res_id == 2: # compare results if self._current_res_id == 2: # compare results
reach1 = self.data[0].river.reach(self._current_reach) reach1 = self.data[0].river.reach(self._reach)
reach2 = self.data[1].river.reach(self._current_reach) reach2 = self.data[1].river.reach(self._reach)
profile1 = reach1.profile(self._current_profile_id) profile1 = reach1.profile(self._profile)
profile2 = reach2.profile(self._current_profile_id) profile2 = reach2.profile(self._profile)
q1 = profile1.get_key("Q") q1 = profile1.get_key("Q")
z1 = profile1.get_key("Z") z1 = profile1.get_key("Z")
@ -905,8 +903,7 @@ class CustomPlot(PamhyrPlot):
z_min = profile.geometry.z_min() z_min = profile.geometry.z_min()
if self._current_res_id < 2: if self._current_res_id < 2:
if reach.has_sediment(): if reach.has_sediment():
ts_z_min = self.get_ts_zmin( ts_z_min = self.get_ts_zmin(self._profile, res_id)
self._current_profile_id, self._current_res_id)
else: else:
ts_z_min = list( ts_z_min = list(
map( map(
@ -923,8 +920,8 @@ class CustomPlot(PamhyrPlot):
if self._current_res_id == 2: if self._current_res_id == 2:
if reach.has_sediment(): if reach.has_sediment():
ts_z_min1 = self.get_ts_zmin(self._current_profile_id1, 0) ts_z_min1 = self.get_ts_zmin(self._profile1, 0)
ts_z_min2 = self.get_ts_zmin(self._current_profile_id2, 1) ts_z_min2 = self.get_ts_zmin(self._profile2, 1)
ts_z_min = list( ts_z_min = list(
map( map(
lambda x, y: x - y, lambda x, y: x - y,
@ -1117,16 +1114,16 @@ class CustomPlot(PamhyrPlot):
def _redraw_time(self): def _redraw_time(self):
results = self.data[self._current_res_id] results = self.data[self._current_res_id]
reach = results.river.reach(self._current_reach) reach = results.river.reach(self._reach)
profile = reach.profile(self._current_profile_id) profile = reach.profile(self._profile)
ts = list(results.get("timestamps")) ts = list(results.get("timestamps"))
ts.sort() ts.sort()
if self._current_res_id == 2: # compare results if self._current_res_id == 2: # compare results
reach1 = self.data[0].river.reach(self._current_reach) reach1 = self.data[0].river.reach(self._reach)
reach2 = self.data[1].river.reach(self._current_reach) reach2 = self.data[1].river.reach(self._reach)
profile1 = reach1.profile(self._current_profile_id) profile1 = reach1.profile(self._profile)
profile2 = reach2.profile(self._current_profile_id) profile2 = reach2.profile(self._profile)
q1 = profile1.get_key("Q") q1 = profile1.get_key("Q")
z1 = profile1.get_key("Z") z1 = profile1.get_key("Z")
@ -1141,8 +1138,7 @@ class CustomPlot(PamhyrPlot):
v = profile.get_key("V") v = profile.get_key("V")
if self._current_res_id < 2: if self._current_res_id < 2:
if reach.has_sediment(): if reach.has_sediment():
ts_z_min = self.get_ts_zmin( ts_z_min = self.get_ts_zmin(self._profile)
self._current_profile_id, self._current_res_id)
else: else:
z_min = profile.geometry.z_min() z_min = profile.geometry.z_min()
ts_z_min = list( ts_z_min = list(
@ -1154,8 +1150,8 @@ class CustomPlot(PamhyrPlot):
if "bed_elevation" in self._y: if "bed_elevation" in self._y:
if self._current_res_id == 2: if self._current_res_id == 2:
if reach.has_sediment(): if reach.has_sediment():
ts_z_min1 = self.get_ts_zmin(self._current_profile_id1, 0) ts_z_min1 = self.get_ts_zmin(self._profile1, 0)
ts_z_min2 = self.get_ts_zmin(self._current_profile_id2, 1) ts_z_min2 = self.get_ts_zmin(self._profile2, 1)
ts_z_min = list( ts_z_min = list(
map( map(
lambda x, y: x - y, lambda x, y: x - y,
@ -1362,12 +1358,11 @@ class CustomPlot(PamhyrPlot):
elif self._x == "time": elif self._x == "time":
self._draw_time() self._draw_time()
if self._x == "rk": if self._x == "rk":
reach = self.data[self._current_res_id].river.reach( reach = self.data[self._current_res_id].river.reach(self._reach)
self._current_reach) profile = reach.profile(self._profile)
profile = reach.profile(self._current_profile_id)
x = profile.rk x = profile.rk
elif self._x == "time": elif self._x == "time":
x = self._current_timestamp x = self._timestamp
self._current, = self.canvas.axes.plot( self._current, = self.canvas.axes.plot(
[x, x], [x, x],
@ -1390,13 +1385,13 @@ class CustomPlot(PamhyrPlot):
return return
def set_reach(self, reach_id): def set_reach(self, reach_id):
self._current_reach = reach_id self._reach = reach_id
self._current_profile_id = 0 self._profile = 0
self.draw() self.draw()
def set_profile(self, profile_id): def set_profile(self, profile_id):
self._current_profile_id = profile_id self._profile = profile_id
if self._x != "rk": if self._x != "rk":
self.update() self.update()
@ -1408,27 +1403,19 @@ class CustomPlot(PamhyrPlot):
self.draw() self.draw()
def set_timestamp(self, timestamp): def set_timestamp(self, timestamp):
self._current_timestamp = timestamp self._timestamp = timestamp
if self._x != "time": if self._x != "time":
self.update() self.update()
else: else:
self.draw_current() self.draw_current()
def update_all(self):
self._current_reach_id = self._parent._get_current_reach()
self._current_profile_id = self._parent._get_current_profile()
self._current_res_id = self._parent._get_current_results()[0]
self._current_timestamp = self._parent._get_current_timestamp()
self.draw()
def draw_current(self): def draw_current(self):
if self._x == "rk": if self._x == "rk":
reach = self.data[self._current_res_id].river.reach( reach = self.data[self._current_res_id].river.reach(self._reach)
self._current_reach) profile = reach.profile(self._profile)
profile = reach.profile(self._current_profile_id)
x = profile.rk x = profile.rk
elif self._x == "time": elif self._x == "time":
x = self._current_timestamp x = self._timestamp
self._current.set_data([x, x], self.canvas.axes.get_ylim()) self._current.set_data([x, x], self.canvas.axes.get_ylim())
self.canvas.draw_idle() self.canvas.draw_idle()

9
src/View/Results/PlotAC.py
View File

@ -39,7 +39,6 @@ class PlotAC(PamhyrPlot):
parent=parent parent=parent
) )
self._parent = parent
self._current_reach_id = reach_id self._current_reach_id = reach_id
self._current_profile_id = profile_id self._current_profile_id = profile_id
self._current_res_id = res_id[0] self._current_res_id = res_id[0]
@ -244,14 +243,6 @@ class PlotAC(PamhyrPlot):
self.update_idle() self.update_idle()
def update_all(self):
self._current_reach_id = self._parent._get_current_reach()
self._current_profile_id = self._parent._get_current_profile()
self._current_res_id = self._parent._get_current_results()[0]
self._current_timestamp = self._parent._get_current_timestamp()
self._init = False
self.update()
def update_gl(self): def update_gl(self):
for a in self.annotation: for a in self.annotation:
a.remove() a.remove()

19
src/View/Results/PlotH.py
View File

@ -47,7 +47,6 @@ class PlotH(PamhyrPlot):
self._mode = "time" self._mode = "time"
self._parent = parent
self._current_reach_id = reach_id self._current_reach_id = reach_id
self._current_profile_id = profile_id self._current_profile_id = profile_id
self._current_res_id = res_id self._current_res_id = res_id
@ -217,16 +216,20 @@ class PlotH(PamhyrPlot):
if not self._init: if not self._init:
self.draw() self.draw()
self.update_data()
self.update_current() self.update_current()
self.update_idle() self.update_idle()
def update_all(self): def update_data(self):
self._current_reach_id = self._parent._get_current_reach() for res, res_id in enumerate(self._current_res_id):
self._current_profile_id = self._parent._get_current_profiles_list() results = self.results[res_id]
self._current_res_id = self._parent._get_current_results() reach = results.river.reach(self._current_reach_id)
self._current_timestamp = self._parent._get_current_timestamp() profile = reach.profile(self._current_profile_id)
self._init = False
self.update() x = self._timestamps
y = profile.get_key("Q")
self._line[res].set_data(x, y)
def update_current(self): def update_current(self):
y = self._current.get_ydata() y = self._current.get_ydata()

9
src/View/Results/PlotRKC.py
View File

@ -42,7 +42,6 @@ class PlotRKC(PamhyrPlot):
parent=parent parent=parent
) )
self._parent = parent
self._current_reach_id = reach_id self._current_reach_id = reach_id
self._current_profile_id = profile_id self._current_profile_id = profile_id
self._current_res_id = res_id[0] self._current_res_id = res_id[0]
@ -344,14 +343,6 @@ class PlotRKC(PamhyrPlot):
self.update_idle() self.update_idle()
def update_all(self):
self._current_reach_id = self._parent._get_current_reach()
self._current_profile_id = self._parent._get_current_profile()
self._current_res_id = self._parent._get_current_results()[0]
self._current_timestamp = self._parent._get_current_timestamp()
self._init = False
self.update()
def update_water_elevation(self): def update_water_elevation(self):
results = self.results[self._current_res_id] results = self.results[self._current_res_id]
reach = results.river.reach(self._current_reach_id) reach = results.river.reach(self._current_reach_id)

9
src/View/Results/PlotXY.py
View File

@ -52,7 +52,6 @@ class PlotXY(PamhyrPlot):
self.line_gl = [] self.line_gl = []
self.overflow = [] self.overflow = []
self._parent = parent
self._timestamps = parent._timestamps self._timestamps = parent._timestamps
self._current_timestamp = max(self._timestamps) self._current_timestamp = max(self._timestamps)
self._current_reach_id = reach_id self._current_reach_id = reach_id
@ -333,14 +332,6 @@ class PlotXY(PamhyrPlot):
self.update_idle() self.update_idle()
def update_all(self):
self._current_reach_id = self._parent._get_current_reach()
self._current_profile_id = self._parent._get_current_profile()
self._current_res_id = self._parent._get_current_results()[0]
self._current_timestamp = self._parent._get_current_timestamp()
self._init = False
self.update()
def update_profile(self): def update_profile(self):
results = self.results[self._current_res_id] results = self.results[self._current_res_id]
reach = results.river.reach(self._current_reach_id) reach = results.river.reach(self._current_reach_id)

55
src/View/Results/Window.py
View File

@ -445,69 +445,49 @@ class ResultsWindow(PamhyrWindow):
solver_id=None, solver_id=None,
timestamp=None): timestamp=None):
tab_widget = self.find(QTabWidget, f"tabWidget")
tab_index = tab_widget.currentIndex()
name = tab_widget.tabText(tab_index)
if reach_id is not None: if reach_id is not None:
if tab_index == 1:
self.plot_xy.set_reach(reach_id) self.plot_xy.set_reach(reach_id)
self.plot_ac.set_reach(reach_id) self.plot_ac.set_reach(reach_id)
self.plot_rkc.set_reach(reach_id) self.plot_rkc.set_reach(reach_id)
elif tab_index == 2:
self.plot_h.set_reach(reach_id) self.plot_h.set_reach(reach_id)
elif tab_index > 2:
self._additional_plot[name].set_reach(reach_id)
# for plot in self._additional_plot: for plot in self._additional_plot:
# self._additional_plot[plot].set_reach(reach_id) self._additional_plot[plot].set_reach(reach_id)
self.update_table_selection_reach(reach_id) self.update_table_selection_reach(reach_id)
self.update_table_selection_profile(0) self.update_table_selection_profile(0)
if profile_id is not None: if profile_id is not None:
if tab_index == 1:
self.plot_xy.set_profile(profile_id[0]) self.plot_xy.set_profile(profile_id[0])
self.plot_ac.set_profile(profile_id[0]) self.plot_ac.set_profile(profile_id[0])
self.plot_rkc.set_profile(profile_id[0]) self.plot_rkc.set_profile(profile_id[0])
elif tab_index == 2:
self.plot_h.set_profile(profile_id) self.plot_h.set_profile(profile_id)
elif tab_widget.currentIndex() > 2:
self._additional_plot[name].set_profile(profile_id[0])
# for plot in self._additional_plot: for plot in self._additional_plot:
# self._additional_plot[plot].set_profile(profile_id[0]) self._additional_plot[plot].set_profile(profile_id[0])
tab_widget = self.find(QTabWidget, f"tabWidget") tab_widget = self.find(QTabWidget, f"tabWidget")
if tab_widget.currentIndex() != 2: if tab_widget.currentIndex() != 2:
self.update_table_selection_profile(profile_id[0]) self.update_table_selection_profile(profile_id[0])
if solver_id is not None: if solver_id is not None:
if tab_index == 1:
self._current_results = solver_id self._current_results = solver_id
self.plot_xy.set_result(solver_id) self.plot_xy.set_result(solver_id)
self.plot_ac.set_result(solver_id) self.plot_ac.set_result(solver_id)
self.plot_rkc.set_result(solver_id) self.plot_rkc.set_result(solver_id)
elif tab_index == 2:
self.plot_h.set_result(solver_id) self.plot_h.set_result(solver_id)
elif tab_widget.currentIndex() > 2:
self._additional_plot[name].set_result(solver_id)
# for plot in self._additional_plot: for plot in self._additional_plot:
# self._additional_plot[plot].set_result(solver_id) self._additional_plot[plot].set_result(solver_id)
if timestamp is not None: if timestamp is not None:
self.plot_xy.set_timestamp(timestamp) self.plot_xy.set_timestamp(timestamp)
self.plot_ac.set_timestamp(timestamp) self.plot_ac.set_timestamp(timestamp)
self.plot_rkc.set_timestamp(timestamp) self.plot_rkc.set_timestamp(timestamp)
if tab_index == 2:
self.plot_h.set_timestamp(timestamp) self.plot_h.set_timestamp(timestamp)
if tab_widget.currentIndex() > 2: for plot in self._additional_plot:
self._additional_plot[name].set_timestamp(timestamp) self._additional_plot[plot].set_timestamp(timestamp)
# for plot in self._additional_plot:
# self._additional_plot[plot].set_timestamp(timestamp)
self._table["raw_data"].timestamp = timestamp self._table["raw_data"].timestamp = timestamp
@ -542,14 +522,6 @@ class ResultsWindow(PamhyrWindow):
self._slider_time.value() self._slider_time.value()
] ]
def _get_current_results(self):
table = self.find(QTableView, f"tableView_solver")
indexes = table.selectedIndexes()
if len(indexes) == 0:
return
return [i.row() for i in indexes]
def _set_current_reach(self): def _set_current_reach(self):
table = self.find(QTableView, f"tableView_reach") table = self.find(QTableView, f"tableView_reach")
indexes = table.selectedIndexes() indexes = table.selectedIndexes()
@ -1228,17 +1200,6 @@ class ResultsWindow(PamhyrWindow):
# unselect all profiles but the first one # unselect all profiles but the first one
profile_id = self._get_current_profile() profile_id = self._get_current_profile()
self.update_table_selection_profile(profile_id) self.update_table_selection_profile(profile_id)
tab_widget = self.find(QTabWidget, f"tabWidget")
tab_index = tab_widget.currentIndex()
name = tab_widget.tabText(tab_index)
if tab_index == 1:
self.plot_xy.update_all()
self.plot_ac.update_all()
self.plot_rkc.update_all()
elif tab_index == 2:
self.plot_h.update_all()
elif tab_index > 2:
self._additional_plot[name].update_all()
def import_geotiff(self): def import_geotiff(self):
return return