From cb41520a203efc8ee98a82a093908a060833e4c4 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Fri, 17 May 2024 12:29:20 +0200
Subject: [PATCH] pamhyr: Fix Pep8.
---
src/View/Geometry/PlotAC.py | 12 +++++-------
src/View/Geometry/Window.py | 16 +++++++++++-----
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/View/Geometry/PlotAC.py b/src/View/Geometry/PlotAC.py
index a8892814..ad43fdf3 100644
--- a/src/View/Geometry/PlotAC.py
+++ b/src/View/Geometry/PlotAC.py
@@ -82,14 +82,12 @@ class PlotAC(PamhyrPlot):
label=self.label_previous_plot_selected,
lw=1.5, linestyle='--', color=self.color_plot_previous
)
- #self.previous_plot_selected.set_visible(False)
self.plot_selected, = self.canvas.axes.plot(
station, elevation,
label=self.label_plot_selected,
color=self.color_plot_current, lw=1.5
)
- #self.plot_selected.set_visible(False)
next_id = profile_id + 1
station_next = self.data.profile(next_id).get_station()
@@ -100,7 +98,6 @@ class PlotAC(PamhyrPlot):
label=self.label_next_plot_selected,
color=self.color_plot_next, lw=1.6, linestyle='--'
)
- #self.next_plot_selected.set_visible(False)
self.canvas.axes.set_visible(False)
def draw_gl(self):
@@ -110,13 +107,16 @@ class PlotAC(PamhyrPlot):
profile_id = 0
profile = self.data.profile(profile_id)
- if profile == None: return
+ if profile is None:
+ return
+
station = profile.get_station()
elevation = profile.z()
gl = profile.names()
self.annotation = []
self.complete_gl, self.incomplete_gl = self.data.compute_guidelines()
+
lcomplete = list(self.complete_gl)
lincomplete = list(self.incomplete_gl)
@@ -193,7 +193,6 @@ class PlotAC(PamhyrPlot):
self.data.profile(previous_id).z()
)
self.previous_plot_selected.set_visible(True)
- #self.canvas.axes.legend()
if 0 <= profile_id < self.data.number_profiles:
self.plot_selected.set_data(
@@ -201,7 +200,6 @@ class PlotAC(PamhyrPlot):
self.data.profile(profile_id).z()
)
self.plot_selected.set_visible(True)
- #self.canvas.axes.legend()
if 0 <= next_id < self.data.number_profiles:
self.next_plot_selected.set_data(
@@ -209,7 +207,7 @@ class PlotAC(PamhyrPlot):
self.data.profile(next_id).z()
)
self.next_plot_selected.set_visible(True)
- #self.canvas.axes.legend()
+
self.canvas.axes.set_visible(True)
def update_full(self):
diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py
index 3e972349..b92ae373 100644
--- a/src/View/Geometry/Window.py
+++ b/src/View/Geometry/Window.py
@@ -157,7 +157,9 @@ class GeometryWindow(PamhyrWindow):
def _compute_status_label(self):
row = self.index_selected_row()
- if row == None: return
+ if row is None:
+ return
+
profile = self._reach.profile(row)
name = profile.name + " " + str(profile.kp)
@@ -404,7 +406,6 @@ class GeometryWindow(PamhyrWindow):
def update_plot_ac(self, ind: int):
self.tableView.model().blockSignals(True)
- #self._plot_ac.current = ind
self._plot_ac.update()
self.tableView.model().blockSignals(False)
@@ -449,7 +450,8 @@ class GeometryWindow(PamhyrWindow):
def select_current_profile(self):
self.tableView.model().blockSignals(True)
row = self.index_selected_row()
- if row != None:
+
+ if row is not None:
self.find(QSlider, "verticalSlider").setValue(row)
self.select_plot_xy(row)
self.select_plot_kpc(row)
@@ -530,13 +532,17 @@ class GeometryWindow(PamhyrWindow):
def move_up(self):
row = self.index_selected_row()
- if row == None: return
+ if row is None:
+ return
+
self._table.move_up(row)
self.select_current_profile()
def move_down(self):
row = self.index_selected_row()
- if row == None: return
+ if row is None:
+ return
+
self._table.move_down(row)
self.select_current_profile()
--
GitLab