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

Results: PlotAC: Use Z table.

opt-result
Pierre-Antoine 2026-06-26 14:23:00 +02:00
parent d0a8f369ef
commit 21d2e6ad20
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import numpy as np
from tools import timer from tools import timer
from View.Tools.PamhyrPlot import PamhyrPlot from View.Tools.PamhyrPlot import PamhyrPlot
from matplotlib import pyplot as plt from matplotlib import pyplot as plt
@ -103,11 +105,20 @@ class PlotAC(PamhyrPlot):
color=self.color_plot_river_bottom, color=self.color_plot_river_bottom,
) )
@timer
def draw_water_elevation(self, reach, profile): def draw_water_elevation(self, reach, profile):
result = self.results[self._current_res_id]
x = profile.geometry.get_station() x = profile.geometry.get_station()
z = profile.geometry.z() z = profile.geometry.z()
rk = reach.geometry.get_rk() rk = reach.geometry.get_rk()
water_z = profile.get_ts_key(self._current_timestamp, "Z") water_z = result.get("table")["Z"][
result.get_timestamp_id(
self._current_timestamp
),
profile.global_index
]
# water_z = profile.get_ts_key(self._current_timestamp, "Z")
self.water, = self.canvas.axes.plot( self.water, = self.canvas.axes.plot(
[min(x), max(x)], [water_z, water_z], [min(x), max(x)], [water_z, water_z],
@ -123,11 +134,18 @@ class PlotAC(PamhyrPlot):
) )
self.liste_chemins = self.collection.get_paths() self.liste_chemins = self.collection.get_paths()
@timer
def draw_water_elevation_max(self, reach, profile): def draw_water_elevation_max(self, reach, profile):
result = self.results[self._current_res_id]
x = profile.geometry.get_station() x = profile.geometry.get_station()
z = profile.geometry.z() z = profile.geometry.z()
rk = reach.geometry.get_rk() rk = reach.geometry.get_rk()
water_z = max(profile.get_key("Z"))
water_z = np.max(
result.get("table")["Z"][:, profile.global_index]
)
# water_z = max(profile.get_key("Z"))
self.water_max, = self.canvas.axes.plot( self.water_max, = self.canvas.axes.plot(
[min(x), max(x)], [water_z, water_z], [min(x), max(x)], [water_z, water_z],
@ -262,7 +280,15 @@ class PlotAC(PamhyrPlot):
self.line_rk.set_data(x, z) self.line_rk.set_data(x, z)
def update_water(self, reach, profile, x, z): def update_water(self, reach, profile, x, z):
water_z = profile.get_ts_key(self._current_timestamp, "Z") result = self.results[self._current_res_id]
water_z = result.get("table")["Z"][
result.get_timestamp_id(
self._current_timestamp
),
profile.global_index
]
# water_z = profile.get_ts_key(self._current_timestamp, "Z")
self.water.set_data( self.water.set_data(
[min(x), max(x)], [min(x), max(x)],
[water_z, water_z] [water_z, water_z]
@ -277,7 +303,12 @@ class PlotAC(PamhyrPlot):
) )
def update_water_max(self, reach, profile, x, z): def update_water_max(self, reach, profile, x, z):
water_z = max(profile.get_key("Z")) result = self.results[self._current_res_id]
water_z = np.max(
result.get("table")["Z"][:, profile.global_index]
)
# water_z = max(profile.get_key("Z"))
self.water_max.set_data( self.water_max.set_data(
[min(x), max(x)], [min(x), max(x)],
[water_z, water_z] [water_z, water_z]