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

geomerty: Fix guidelines display on plot 3.

mesh
Pierre-Antoine Rouby 2023-04-18 16:55:51 +02:00
parent 4e5bf178dc
commit b56110d76b
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/View/Geometry/GeometryWindow.py
View File

@ -416,7 +416,7 @@ class GeometryWindow(QMainWindow, WindowToolKit):
station_plus_1 = self._reach.profile(selected_profile + 1).get_station() station_plus_1 = self._reach.profile(selected_profile + 1).get_station()
elevation = self._reach.profile(selected_profile).z() elevation = self._reach.profile(selected_profile).z()
elevation_i_plus_1 = self._reach.profile(selected_profile + 1).z() elevation_i_plus_1 = self._reach.profile(selected_profile + 1).z()
gl = self._reach.profile(selected_profile).name gl = self._reach.profile(selected_profile).names()
self.ui.canvas_3.axes.cla() self.ui.canvas_3.axes.cla()
self.ui.canvas_3.axes.grid(color='grey', linestyle='--', linewidth=0.5) self.ui.canvas_3.axes.grid(color='grey', linestyle='--', linewidth=0.5)
@ -453,6 +453,8 @@ class GeometryWindow(QMainWindow, WindowToolKit):
) )
self.annotation_3 = [] self.annotation_3 = []
self.complete_gl, self.incomplete_gl = self._reach.compute_guidelines() self.complete_gl, self.incomplete_gl = self._reach.compute_guidelines()
lcomplete = list(self.complete_gl)
lincomplete = list(self.incomplete_gl)
line_2d = [line_2D for line_2D in self.line_gl_1] line_2d = [line_2D for line_2D in self.line_gl_1]
self.color_complete_gl = self.get_line_gl_colors(line_2d) self.color_complete_gl = self.get_line_gl_colors(line_2d)
@ -465,15 +467,15 @@ class GeometryWindow(QMainWindow, WindowToolKit):
y_gl_incomplete = [] y_gl_incomplete = []
color_scat_incomplete_gl = [] color_scat_incomplete_gl = []
for i, txt in enumerate(list(gl)): for i, txt in enumerate(gl):
if txt.strip() in self.complete_gl: if txt.strip() in self.complete_gl:
annotation_3 = self.ui.canvas_3.axes.annotate( annotation_3 = self.ui.canvas_3.axes.annotate(
txt, (station[i], elevation[i]), txt, (station[i], elevation[i]),
horizontalalignment='left', horizontalalignment='left',
verticalalignment='top', annotation_clip=True, verticalalignment='top', annotation_clip=True,
fontsize=10, fontsize=11,
color=self.color_complete_gl[ color=self.color_complete_gl[
self.complete_gl.index(txt) lcomplete.index(txt)
] ]
) )
@ -482,15 +484,14 @@ class GeometryWindow(QMainWindow, WindowToolKit):
x_gl_complete.append(station[i]) x_gl_complete.append(station[i])
y_gl_complete.append(elevation[i]) y_gl_complete.append(elevation[i])
color_scat_complete_gl.append(self.color_complete_gl[self.complete_gl.index(txt)]) color_scat_complete_gl.append(self.color_complete_gl[lcomplete.index(txt)])
elif txt.strip() in self.incomplete_gl: elif txt.strip() in self.incomplete_gl:
annotate = self.ui.canvas_3.axes.annotate( annotate = self.ui.canvas_3.axes.annotate(
txt, (station[i], elevation[i]), horizontalalignment='left', txt, (station[i], elevation[i]), horizontalalignment='left',
verticalalignment='top', annotation_clip=True, fontsize=11, verticalalignment='top', annotation_clip=True, fontsize=11,
color=self.color_incomplete_gl[ color=self.color_incomplete_gl[
self.incomplete_gl.index(txt) lincomplete.index(txt)
], ],
size=10
) )
self.annotation_3.append(annotate) self.annotation_3.append(annotate)
@ -498,7 +499,7 @@ class GeometryWindow(QMainWindow, WindowToolKit):
x_gl_incomplete.append(station[i]) x_gl_incomplete.append(station[i])
y_gl_incomplete.append(elevation[i]) y_gl_incomplete.append(elevation[i])
color_scat_incomplete_gl.append( color_scat_incomplete_gl.append(
self.color_incomplete_gl[self.incomplete_gl.index(txt)] self.color_incomplete_gl[lincomplete.index(txt)]
) )
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
@ -520,48 +521,49 @@ class GeometryWindow(QMainWindow, WindowToolKit):
x = self._reach.profile(ind).get_station() x = self._reach.profile(ind).get_station()
y = self._reach.profile(ind).z() y = self._reach.profile(ind).z()
gl = self._reach.profile(ind).name gl = self._reach.profile(ind).names()
complete, incomplete = self._reach.compute_guidelines() complete, incomplete = self._reach.compute_guidelines()
lcomplete = list(complete)
lincomplete = list(incomplete)
self.x_complete = [] self.x_complete = []
color_scat_complete = [] color_scat_complete = []
self.x_incomplete = [] self.x_incomplete = []
color_scat_incomplete = [] color_scat_incomplete = []
try: try:
for i, txt in enumerate(list(gl)): for i, txt in enumerate(gl):
if txt in complete: if txt in complete:
annotate = self.ui.canvas_3.axes.annotate( annotate = self.ui.canvas_3.axes.annotate(
txt, (x[i], y[i]), horizontalalignment='left', txt, (x[i], y[i]), horizontalalignment='left',
verticalalignment='top', annotation_clip=True, verticalalignment='top', annotation_clip=True,
fontsize=11, fontsize=11,
color=self.color_complete[ color=self.color_complete_gl[
complete.index(txt) lcomplete.index(txt)
], ],
size=10
) )
self.annotation_3.append(annotate) self.annotation_3.append(annotate)
self.x_complete.append([x[i], y[i]]) self.x_complete.append([x[i], y[i]])
color_scat_complete.append( color_scat_complete.append(
self.color_complete[self.complete.index(txt)] self.color_complete_gl[lcomplete.index(txt)]
) )
elif txt in incomplete: elif txt in incomplete:
annotate = self.ui.canvas_3.axes.annotate( annotate = self.ui.canvas_3.axes.annotate(
txt, (x[i], y[i]), horizontalalignment='left', txt, (x[i], y[i]), horizontalalignment='left',
verticalalignment='top', annotation_clip=True, verticalalignment='top', annotation_clip=True,
fontsize=11, fontsize=11,
color=self.color_incomplete[ color=self.color_incomplete_gl[
incomplete.index(txt) lincomplete.index(txt)
], ],
size=10
) )
self.annotation_3.append(annotate) self.annotation_3.append(annotate)
self.x_incomplete.append([x[i], y[i]]) self.x_incomplete.append([x[i], y[i]])
color_scat_incomplete.append( color_scat_incomplete.append(
self.color_incomplete[incomplete.index(txt)] self.color_incomplete_gl[lincomplete.index(txt)]
) )
except: except Exception as e:
print("FIXME") print(f"{e}")
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
self.ui.canvas_3.figure.canvas.draw_idle() self.ui.canvas_3.figure.canvas.draw_idle()