diff --git a/src/View/Geometry/GeometryWindow.py b/src/View/Geometry/GeometryWindow.py index 57677ccef5bb2b177d536d563feb9baa217725a4..5e7b19fd84225ffd7f8584fe009db8e3467ba4bf 100644 --- a/src/View/Geometry/GeometryWindow.py +++ b/src/View/Geometry/GeometryWindow.py @@ -416,7 +416,7 @@ class GeometryWindow(QMainWindow, WindowToolKit): station_plus_1 = self._reach.profile(selected_profile + 1).get_station() elevation = self._reach.profile(selected_profile).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.grid(color='grey', linestyle='--', linewidth=0.5) @@ -453,6 +453,8 @@ class GeometryWindow(QMainWindow, WindowToolKit): ) self.annotation_3 = [] 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] self.color_complete_gl = self.get_line_gl_colors(line_2d) @@ -465,15 +467,15 @@ class GeometryWindow(QMainWindow, WindowToolKit): y_gl_incomplete = [] color_scat_incomplete_gl = [] - for i, txt in enumerate(list(gl)): + for i, txt in enumerate(gl): if txt.strip() in self.complete_gl: annotation_3 = self.ui.canvas_3.axes.annotate( txt, (station[i], elevation[i]), horizontalalignment='left', verticalalignment='top', annotation_clip=True, - fontsize=10, + fontsize=11, 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]) 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: annotate = self.ui.canvas_3.axes.annotate( txt, (station[i], elevation[i]), horizontalalignment='left', verticalalignment='top', annotation_clip=True, fontsize=11, color=self.color_incomplete_gl[ - self.incomplete_gl.index(txt) + lincomplete.index(txt) ], - size=10 ) self.annotation_3.append(annotate) @@ -498,7 +499,7 @@ class GeometryWindow(QMainWindow, WindowToolKit): x_gl_incomplete.append(station[i]) y_gl_incomplete.append(elevation[i]) 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) @@ -520,48 +521,49 @@ class GeometryWindow(QMainWindow, WindowToolKit): x = self._reach.profile(ind).get_station() y = self._reach.profile(ind).z() - gl = self._reach.profile(ind).name + gl = self._reach.profile(ind).names() complete, incomplete = self._reach.compute_guidelines() + lcomplete = list(complete) + lincomplete = list(incomplete) + self.x_complete = [] color_scat_complete = [] self.x_incomplete = [] color_scat_incomplete = [] try: - for i, txt in enumerate(list(gl)): + for i, txt in enumerate(gl): if txt in complete: annotate = self.ui.canvas_3.axes.annotate( txt, (x[i], y[i]), horizontalalignment='left', verticalalignment='top', annotation_clip=True, fontsize=11, - color=self.color_complete[ - complete.index(txt) + color=self.color_complete_gl[ + lcomplete.index(txt) ], - size=10 ) self.annotation_3.append(annotate) self.x_complete.append([x[i], y[i]]) color_scat_complete.append( - self.color_complete[self.complete.index(txt)] + self.color_complete_gl[lcomplete.index(txt)] ) elif txt in incomplete: annotate = self.ui.canvas_3.axes.annotate( txt, (x[i], y[i]), horizontalalignment='left', verticalalignment='top', annotation_clip=True, fontsize=11, - color=self.color_incomplete[ - incomplete.index(txt) + color=self.color_incomplete_gl[ + lincomplete.index(txt) ], - size=10 ) self.annotation_3.append(annotate) self.x_incomplete.append([x[i], y[i]]) color_scat_incomplete.append( - self.color_incomplete[incomplete.index(txt)] + self.color_incomplete_gl[lincomplete.index(txt)] ) - except: - print("FIXME") + except Exception as e: + print(f"{e}") self.tableView.model().blockSignals(False) self.ui.canvas_3.figure.canvas.draw_idle()