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

Friction: Apply new PamhyrPlot features.

setup.py
Pierre-Antoine Rouby 2024-02-16 14:32:18 +01:00
parent 9302d1fabc
commit 7760181baa
4 changed files with 82 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/View/Frictions/PlotStricklers.py
View File

@ -31,7 +31,66 @@ _translate = QCoreApplication.translate
class PlotStricklers(PamhyrPlot):
def draw_frictions(self, frictions, color="r"):
def __init__(self, data=None, canvas=None, trad=None,
toolbar=None, parent=None):
super(PlotStricklers, self).__init__(
canvas=canvas,
trad=trad,
data=data,
toolbar=toolbar,
parent=parent
)
self.label_x = self._trad["kp"]
self.label_y = self._trad["stricklers"]
self.line_kp_elevation = [None, None]
self._isometric_axis = False
self._auto_relim = False
self._auto_relim_update = False
self._autoscale_update = True
@timer
def draw(self, highlight=None):
self.init_axes()
if self.data is None:
return
self.draw_data()
self.idle()
self._init = True
def draw_data(self):
kp = self.data.reach.get_kp()
self.canvas.axes.set_xlim(
left=min(kp), right=max(kp)
)
frictions = self.data.frictions
if len(frictions) != 0:
lst = frictions.frictions
self.draw_frictions(lst, self.color_plot)
# HightLight
kp_min, kp_max = (-1, -1)
if self._highlight_data is not None:
kp_min, kp_max = self._highlight_data
lst = list(
filter(
lambda s: (s.begin_kp == kp_min and
s.end_kp == kp_max),
frictions.frictions
)
)
self.draw_frictions(lst, self.color_plot_highlight)
def draw_frictions(self, frictions, color):
lst = sorted(
filter(
lambda f: f.is_full_defined(),
@ -57,66 +116,16 @@ class PlotStricklers(PamhyrPlot):
coef_minor = list(map(lambda s: s.minor, coef))
coef_medium = list(map(lambda s: s.medium, coef))
self.line_kp_elevation = self.canvas.axes.plot(
self.line_kp_elevation[0] = self.canvas.axes.plot(
kp, coef_minor,
color=color, lw=1.
)
self.line_kp_elevation = self.canvas.axes.plot(
self.line_kp_elevation[1] = self.canvas.axes.plot(
kp, coef_medium,
color=color, lw=1.
)
@timer
def draw(self, highlight=None):
self.canvas.axes.cla()
self.canvas.axes.grid(color='grey', linestyle='--', linewidth=0.5)
if self.data is None:
return
self.canvas.axes.set_ylabel(
_translate("MainWindow_reach", "Stricklers"),
color='black', fontsize=11
)
self.canvas.axes.set_xlabel(
_translate("MainWindow_reach", "Kp (m)"),
color='black', fontsize=11
)
kp = self.data.reach.get_kp()
self.canvas.axes.set_xlim(
left=min(kp), right=max(kp)
)
frictions = self.data.frictions
if len(frictions) != 0:
lst = frictions.frictions
self.draw_frictions(lst)
# HightLight
kp_min, kp_max = (-1, -1)
if highlight is not None:
kp_min, kp_max = highlight
lst = list(
filter(
lambda s: (s.begin_kp == kp_min and
s.end_kp == kp_max),
frictions.frictions
)
)
self.draw_frictions(lst, color="b")
self.canvas.figure.tight_layout()
self.canvas.figure.canvas.draw_idle()
if self.toolbar is not None:
self.toolbar.update()
# self._init = True
@timer
def update(self, ind=None):
if not self._init:
def update(self):
self.draw()
return

11
src/View/Frictions/Window.py
View File

@ -132,8 +132,8 @@ class FrictionsWindow(PamhyrWindow):
self.plot = PlotKPZ(
canvas=self.canvas,
data=self._reach.reach,
trad=self._trad,
toolbar=None,
display_current=False
)
self.plot.draw()
@ -145,6 +145,7 @@ class FrictionsWindow(PamhyrWindow):
self.plot_2 = PlotStricklers(
canvas=self.canvas_2,
data=self._reach,
trad=self._trad,
toolbar=None
)
self.plot_2.draw()
@ -193,16 +194,18 @@ class FrictionsWindow(PamhyrWindow):
canvas=self.canvas,
data=reach,
toolbar=None,
display_current=False
)
self.plot.draw(highlight=highlight)
self.plot.highlight = highlight
self.plot.draw()
self.plot = PlotStricklers(
canvas=self.canvas_2,
data=data,
trad=self._trad,
toolbar=None
)
self.plot.draw(highlight=highlight)
self.plot.highlight = highlight
self.plot.draw()
def add(self):
rows = self.index_selected_rows()

8
src/View/Frictions/translate.py
View File

@ -27,6 +27,14 @@ class FrictionsTranslate(PamhyrTranslate):
def __init__(self):
super(FrictionsTranslate, self).__init__()
self._dict["kp"] = _translate(
"Frictions", "Kp (m)"
)
self._dict["stricklers"] = _translate(
"Frictions", "Stricklers"
)
self._dict["Edit frictions"] = _translate(
"Frictions", "Edit frictions"
)

7
src/View/Geometry/PlotKPZ.py
View File

@ -56,7 +56,7 @@ class PlotKPZ(PamhyrPlot):
self.after_plot_selected = None
@timer
def draw(self, highlight=None):
def draw(self):
self.init_axes()
if self.data is None:
@ -91,8 +91,7 @@ class PlotKPZ(PamhyrPlot):
z_max = self.data.get_z_max()
self.line_kp_zmin_zmax = self.canvas.axes.vlines(
x=kp,
ymin=z_min, ymax=z_max,
x=kp, ymin=z_min, ymax=z_max,
color=self.color_plot,
lw=1.
)
@ -103,7 +102,7 @@ class PlotKPZ(PamhyrPlot):
z_min = self.data.get_z_min()
z_max = self.data.get_z_max()
kp_min, kp_max = highlight
kp_min, kp_max = self._highlight_data
indexes = list(
map(