From 6a0f66c24438e41fe173788bb9910f97f6b6cb39 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Mon, 29 Jan 2024 16:51:28 +0100 Subject: [PATCH] Geometry: Revert previous plot display fix. --- src/View/Geometry/PlotAC.py | 50 +++++++-------- src/View/Geometry/PlotKPZ.py | 118 +++++++++++++++++------------------ src/View/Geometry/PlotXY.py | 12 ++-- src/View/Geometry/Window.py | 18 +++--- 4 files changed, 99 insertions(+), 99 deletions(-) diff --git a/src/View/Geometry/PlotAC.py b/src/View/Geometry/PlotAC.py index e2960792..80b6270d 100644 --- a/src/View/Geometry/PlotAC.py +++ b/src/View/Geometry/PlotAC.py @@ -340,36 +340,36 @@ class PlotAC(PamhyrPlot): self.color_complete_gl = self.get_line_gl_colors(line_2d) self.color_incomplete_gl = 2 * ["#000000"] - # if ind is not None: - # before = ind - 1 - # after = ind + 1 + if ind is not None: + before = ind - 1 + after = ind + 1 - # self.before_plot_selected.set_data([], []) - # self.plot_selected.set_data([], []) - # self.after_plot_selected.set_data([], []) + self.before_plot_selected.set_data([], []) + self.plot_selected.set_data([], []) + self.after_plot_selected.set_data([], []) - # if 0 <= before < self.data.number_profiles: - # self.before_plot_selected.set_data( - # self.data.profile(before).get_station(), - # self.data.profile(before).z() - # ) + if 0 <= before < self.data.number_profiles: + self.before_plot_selected.set_data( + self.data.profile(before).get_station(), + self.data.profile(before).z() + ) - # if 0 <= ind < self.data.number_profiles: - # self.plot_selected.set_data( - # self.data.profile(ind).get_station(), - # self.data.profile(ind).z() - # ) + if 0 <= ind < self.data.number_profiles: + self.plot_selected.set_data( + self.data.profile(ind).get_station(), + self.data.profile(ind).z() + ) - # if 0 <= after < self.data.number_profiles: - # self.after_plot_selected.set_data( - # self.data.profile(after).get_station(), - # self.data.profile(after).z() - # ) + if 0 <= after < self.data.number_profiles: + self.after_plot_selected.set_data( + self.data.profile(after).get_station(), + self.data.profile(after).z() + ) - # self.update_annotate_full(ind) - # else: - self.update_full() - self.update_annotate_full(0) + self.update_annotate_full(ind) + else: + self.update_full() + self.update_annotate_full(0) self.canvas.axes.relim() self.canvas.axes.autoscale() diff --git a/src/View/Geometry/PlotKPZ.py b/src/View/Geometry/PlotKPZ.py index 928141e2..bd17f2da 100644 --- a/src/View/Geometry/PlotKPZ.py +++ b/src/View/Geometry/PlotKPZ.py @@ -185,76 +185,76 @@ class PlotKPZ(PamhyrPlot): self.draw() return - # if ind is not None: - # before = ind - 1 - # after = ind + 1 + if ind is not None: + before = ind - 1 + after = ind + 1 - # self.before_plot_selected.set_visible(False) - # self.plot_selected.set_visible(False) - # self.after_plot_selected.set_visible(False) + self.before_plot_selected.set_visible(False) + self.plot_selected.set_visible(False) + self.after_plot_selected.set_visible(False) - # if 0 <= before < self.data.number_profiles: - # profile = self.data.profile(before) - # if len(profile) > 0: - # kp_i = profile.kp - # z_min_i = profile.z_min() - # z_max_i = profile.z_max() + if 0 <= before < self.data.number_profiles: + profile = self.data.profile(before) + if len(profile) > 0: + kp_i = profile.kp + z_min_i = profile.z_min() + z_max_i = profile.z_max() - # self.before_plot_selected.set_data( - # (kp_i, kp_i), - # (z_min_i, z_max_i) - # ) - # self.before_plot_selected.set_visible(True) + self.before_plot_selected.set_data( + (kp_i, kp_i), + (z_min_i, z_max_i) + ) + self.before_plot_selected.set_visible(True) - # if 0 <= ind < self.data.number_profiles: - # profile = self.data.profile(ind) - # if len(profile) > 0: - # kp_i = profile.kp - # z_min_i = profile.z_min() - # z_max_i = profile.z_max() + if 0 <= ind < self.data.number_profiles: + profile = self.data.profile(ind) + if len(profile) > 0: + kp_i = profile.kp + z_min_i = profile.z_min() + z_max_i = profile.z_max() - # self.plot_selected.set_data( - # (kp_i, kp_i), - # (z_min_i, z_max_i) - # ) - # self.plot_selected.set_visible(True) + self.plot_selected.set_data( + (kp_i, kp_i), + (z_min_i, z_max_i) + ) + self.plot_selected.set_visible(True) - # if 0 <= after < self.data.number_profiles: - # profile = self.data.profile(after) - # if len(profile) > 0: - # kp_i = profile.kp - # z_min_i = profile.z_min() - # z_max_i = profile.z_max() + if 0 <= after < self.data.number_profiles: + profile = self.data.profile(after) + if len(profile) > 0: + kp_i = profile.kp + z_min_i = profile.z_min() + z_max_i = profile.z_max() - # self.after_plot_selected.set_data( - # (kp_i, kp_i), - # (z_min_i, z_max_i) - # ) - # self.after_plot_selected.set_visible(True) + self.after_plot_selected.set_data( + (kp_i, kp_i), + (z_min_i, z_max_i) + ) + self.after_plot_selected.set_visible(True) - # self.canvas.figure.canvas.draw_idle() - # else: - kp = self.data.get_kp_complete_profiles() - z_min = self.data.get_z_min() - z_max = self.data.get_z_max() + self.canvas.figure.canvas.draw_idle() + else: + kp = self.data.get_kp_complete_profiles() + z_min = self.data.get_z_min() + z_max = self.data.get_z_max() - self.line_kp_zmin.set_data(kp, z_min) + self.line_kp_zmin.set_data(kp, z_min) - self.line_kp_zmin_zmax.remove() - self.line_kp_zmin_zmax = self.canvas.axes.vlines( - x=kp, - ymin=z_min, ymax=z_max, - color='r', lw=1. - ) + self.line_kp_zmin_zmax.remove() + self.line_kp_zmin_zmax = self.canvas.axes.vlines( + x=kp, + ymin=z_min, ymax=z_max, + color='r', lw=1. + ) - z_complete = self.data.get_guidelines_z() - try: - for i in range(len(self.line_kp_zgl)): - self.line_kp_zgl[i][0].set_data( - kp, z_complete[i] - ) - except Exception as e: - logger.warning(f"Failed to update graphic KPZ: {e}") + z_complete = self.data.get_guidelines_z() + try: + for i in range(len(self.line_kp_zgl)): + self.line_kp_zgl[i][0].set_data( + kp, z_complete[i] + ) + except Exception as e: + logger.warning(f"Failed to update graphic KPZ: {e}") self.canvas.axes.autoscale_view(True, True, True) self.canvas.figure.canvas.draw_idle() diff --git a/src/View/Geometry/PlotXY.py b/src/View/Geometry/PlotXY.py index 6941686d..6e6dc528 100644 --- a/src/View/Geometry/PlotXY.py +++ b/src/View/Geometry/PlotXY.py @@ -152,12 +152,12 @@ class PlotXY(PamhyrPlot): x_complete = list(self.data.get_guidelines_x()) y_complete = list(self.data.get_guidelines_y()) - self.line_gl = [ - self.canvas.axes.plot( - x, y, - ) - for x, y in zip(x_complete, y_complete) - ] + # self.line_gl = [ + # self.canvas.axes.plot( + # x, y, + # ) + # for x, y in zip(x_complete, y_complete) + # ] for i in range(self.data.number_profiles): if i < len(self.line_xy): diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py index d45df412..f746c9c4 100644 --- a/src/View/Geometry/Window.py +++ b/src/View/Geometry/Window.py @@ -200,9 +200,9 @@ class GeometryWindow(PamhyrWindow): def update(self): self.update_profile_windows() - # self.plot_xy() - # self.plot_kpc() - # self.plot_ac() + self.plot_xy() + self.plot_kpc() + self.plot_ac() self.select_current_profile() self.changed_slider_value() @@ -530,16 +530,16 @@ class GeometryWindow(PamhyrWindow): def _undo(self): self._table.undo() self.select_current_profile() - # self.update_plot_ac() - # self.update_plot_xy() - # self.update_plot_kpc() + self.update_plot_ac() + self.update_plot_xy() + self.update_plot_kpc() def _redo(self): self._table.redo() self.select_current_profile() - # self.update_plot_ac() - # self.update_plot_xy() - # self.update_plot_kpc() + self.update_plot_ac() + self.update_plot_xy() + self.update_plot_kpc() def export_to_file(self): settings = QSettings(