Skip to content
GitLab
Commit 32aa5bec authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Results: CustomPlot: Add legend and change axes label fontsize for each plot.

parent cdfb8670
master 0.0.9 InitialConditions adists_new adists_num adists_release mesh scenarios setup.py terraz_dev v1.2.0rc2 v1.0.2 v1.0.1 v1.0.0 v0.0.8 v0.0.8-patch-2 v0.0.8-patch-1 v0.0.7 v0.0.6 v0.0.5 v0.0.4 v0.0.3 journees-modelisation-2024 journees-modelisation-2024-5 journees-modelisation-2024-4 journees-modelisation-2024-3 journees-modelisation-2024-2 journees-modelisation-2024-1
No related merge requests found
Pipeline #50995 passed with stages
in 1 minute and 2 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 32 deletions
+60 -32
src/View/Geometry/PlotAC.py
+ 4
− 4
View file @ 32aa5bec
......@@ -72,11 +72,11 @@ class PlotAC(PamhyrPlot):
self.canvas.axes.set_xlabel(
_translate("MainWindow_reach", "Transverse abscissa (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("MainWindow_reach", "Height (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.figure.tight_layout()
......@@ -176,11 +176,11 @@ class PlotAC(PamhyrPlot):
self.canvas.axes.grid(color='grey', linestyle='--', linewidth=0.5)
self.canvas.axes.set_xlabel(
_translate("MainWindow_reach", "Abscisse en travers (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("MainWindow_reach", "Cote (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.figure.tight_layout()
......
src/View/Geometry/PlotKPZ.py
+ 2
− 2
View file @ 32aa5bec
......@@ -64,11 +64,11 @@ class PlotKPZ(PamhyrPlot):
self.canvas.axes.set_xlabel(
_translate("MainWindow_reach", "Kp (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("MainWindow_reach", "Height (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
kp = self.data.get_kp()
......
src/View/Geometry/PlotXY.py
+ 2
− 2
View file @ 32aa5bec
......@@ -65,11 +65,11 @@ class PlotXY(PamhyrPlot):
# Axes
self.canvas.axes.set_xlabel(
_translate("Geometry", "X (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("Geometry", "Y (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.axis("equal")
......
src/View/Results/CustomPlot/Plot.py
+ 39
− 11
View file @ 32aa5bec
......@@ -86,16 +86,19 @@ class CustomPlot(PamhyrPlot):
if "0-meter" in self._y_axes and "1-m3s" in self._y_axes:
m3s_axes = self._axes["1-m3s"]
lines = {}
if "elevation" in self._y:
meter_axes.set_ylim(
bottom=min(0, min(z_min)),
top=max(z_min) + 1
)
meter_axes.plot(
line = meter_axes.plot(
kp, z_min,
color='grey', lw=1.
color='grey', lw=1.,
)
lines["elevation"] = line
if "water_elevation" in self._y:
# Water elevation
......@@ -111,10 +114,11 @@ class CustomPlot(PamhyrPlot):
top=max(water_z) + 1
)
meter_axes.plot(
line = meter_axes.plot(
kp, water_z, lw=1.,
color='b',
color='blue',
)
lines["water_elevation"] = line
if "elevation" in self._y:
meter_axes.fill_between(
......@@ -135,10 +139,20 @@ class CustomPlot(PamhyrPlot):
top=max(q) + 1
)
m3s_axes.plot(
line = m3s_axes.plot(
kp, q, lw=1.,
color='r',
)
lines["discharge"] = line
# Legend
lns = reduce(
lambda acc, l: acc + l,
map(lambda l: lines[l], lines),
[]
)
labs = list(map(lambda l: self._trad[l], lines))
self.canvas.axes.legend(lns, labs, loc="lower left")
def _customize_x_axes_time(self, ts, mode="time"):
# Custom time display
......@@ -198,6 +212,7 @@ class CustomPlot(PamhyrPlot):
)
x = ts
lines = {}
if "elevation" in self._y:
# Z min is constant in time
z_min = profile.geometry.z_min()
......@@ -208,10 +223,11 @@ class CustomPlot(PamhyrPlot):
)
)
meter_axes.plot(
line = meter_axes.plot(
ts, ts_z_min,
color='grey', lw=1.
)
lines["elevation"] = line
if "water_elevation" in self._y:
# Water elevation
......@@ -222,10 +238,11 @@ class CustomPlot(PamhyrPlot):
top=max(z) + 1
)
meter_axes.plot(
line = meter_axes.plot(
ts, z, lw=1.,
color='b',
)
lines["water_elevation"] = line
if "elevation" in self._y:
z_min = profile.geometry.z_min()
......@@ -249,13 +266,24 @@ class CustomPlot(PamhyrPlot):
top=max(q) + 1
)
m3s_axes.plot(
line = m3s_axes.plot(
ts, q, lw=1.,
color='r',
)
lines["discharge"] = line
self._customize_x_axes_time(ts)
# Legend
lns = reduce(
lambda acc, l: acc + l,
map(lambda l: lines[l], lines),
[]
)
labs = list(map(lambda l: self._trad[l], lines))
self.canvas.axes.legend(lns, labs, loc="lower left")
@timer
def draw(self):
self.canvas.axes.cla()
......@@ -266,12 +294,12 @@ class CustomPlot(PamhyrPlot):
self.canvas.axes.set_xlabel(
self._trad[self._x],
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
self._trad[self._y_axes[0]],
color='green', fontsize=12
color='green', fontsize=10
)
for axes in self._y_axes[1:]:
......@@ -281,7 +309,7 @@ class CustomPlot(PamhyrPlot):
ax_new = self.canvas.axes.twinx()
ax_new.set_ylabel(
self._trad[axes],
color='green', fontsize=12
color='green', fontsize=10
)
self._axes[axes] = ax_new
......
src/View/Results/PlotH.py
+ 2
− 2
View file @ 32aa5bec
......@@ -77,11 +77,11 @@ class PlotH(PamhyrPlot):
# Axes
self.canvas.axes.set_xlabel(
_translate("Results", "Time (s)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("Results", "Discharge (m³/s)"),
color='green', fontsize=12
color='green', fontsize=10
)
ts = list(self.results.get("timestamps"))
......
src/View/Results/PlotSedProfile.py
+ 2
− 2
View file @ 32aa5bec
......@@ -122,11 +122,11 @@ class PlotSedProfile(PamhyrPlot):
self.canvas.axes.set_xlabel(
_translate("MainWindow_reach", "X (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("MainWindow_reach", "Height (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
x = profile.geometry.get_station()
......
src/View/Results/PlotSedReach.py
+ 2
− 2
View file @ 32aa5bec
......@@ -203,11 +203,11 @@ class PlotSedReach(PamhyrPlot):
self.canvas.axes.set_xlabel(
_translate("MainWindow_reach", "Kp (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("MainWindow_reach", "Height (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
kp = reach.geometry.get_kp()
......
src/View/Results/PlotXY.py
+ 2
− 2
View file @ 32aa5bec
......@@ -78,11 +78,11 @@ class PlotXY(PamhyrPlot):
# Axes
self.canvas.axes.set_xlabel(
_translate("Results", "X (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("Results", "Y (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.axis("equal")
......
src/View/SedimentLayers/Edit/Plot.py
+ 1
− 1
View file @ 32aa5bec
......@@ -35,7 +35,7 @@ class Plot(PamhyrPlot):
self.canvas.axes.axes.get_xaxis().set_visible(False)
self.canvas.axes.set_ylabel(
self._trad["height"],
color='green', fontsize=12
color='green', fontsize=10
)
if self.data is None:
......
src/View/SedimentLayers/Reach/Plot.py
+ 2
− 2
View file @ 32aa5bec
......@@ -46,11 +46,11 @@ class Plot(PamhyrPlot):
self.canvas.axes.set_xlabel(
self._trad["kp"],
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
self._trad["height"],
color='green', fontsize=12
color='green', fontsize=10
)
kp = self.data.get_kp()
......
src/View/SedimentLayers/Reach/Profile/Plot.py
+ 2
− 2
View file @ 32aa5bec
......@@ -46,11 +46,11 @@ class Plot(PamhyrPlot):
self.canvas.axes.set_xlabel(
_translate("MainWindow_reach", "X (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
self.canvas.axes.set_ylabel(
_translate("MainWindow_reach", "Height (m)"),
color='green', fontsize=12
color='green', fontsize=10
)
x = self.data.get_station()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment