From e99037223bfe94c6f7edfeff21ba21f77fa8d7ad Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 11 Oct 2023 11:56:48 +0200
Subject: [PATCH] pep8: Fix some View code format.
---
src/View/MainWindow.py | 17 ++--
src/View/Network/GraphWidget.py | 23 +++---
src/View/Network/Table.py | 5 +-
src/View/Results/PlotSedProfile.py | 2 +-
src/View/Results/PlotSedReach.py | 2 +-
src/View/SolverParameters/translate.py | 108 ++++++++++++++++++-------
src/View/Study/Window.py | 2 +-
7 files changed, 109 insertions(+), 50 deletions(-)
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index 18c4837e..2c77ed71 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -195,14 +195,19 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
"action_menu_edit_lateral_contribution": self.open_lateral_contrib,
"action_menu_run_solver": self.run_solver,
"action_menu_sediment_layers": self.open_sediment_layers,
- "action_menu_edit_reach_sediment_layers": self.open_reach_sediment_layers,
+ "action_menu_edit_reach_sediment_layers":
+ self.open_reach_sediment_layers,
"action_menu_close": self.close_model,
"action_menu_results_last": self.open_last_results,
# Help
- "action_menu_pamhyr_users_pdf": lambda: self.open_doc_user(ext="pdf"),
- "action_menu_pamhyr_developers_pdf": lambda: self.open_doc_dev(ext="pdf"),
- "action_menu_pamhyr_users_html": lambda: self.open_doc_user(ext="html"),
- "action_menu_pamhyr_developers_html": lambda: self.open_doc_dev(ext="html"),
+ "action_menu_pamhyr_users_pdf":
+ lambda: self.open_doc_user(ext="pdf"),
+ "action_menu_pamhyr_developers_pdf":
+ lambda: self.open_doc_dev(ext="pdf"),
+ "action_menu_pamhyr_users_html":
+ lambda: self.open_doc_user(ext="html"),
+ "action_menu_pamhyr_developers_html":
+ lambda: self.open_doc_dev(ext="html"),
"action_menu_mage": self.open_doc_mage,
"action_menu_about": self.open_about,
# ToolBar action
@@ -531,7 +536,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
Returns:
Nothing
"""
- if not self._study is None:
+ if self._study is not None:
self.new_study = NewStudyWindow(study=self._study, parent=self)
self.new_study.show()
diff --git a/src/View/Network/GraphWidget.py b/src/View/Network/GraphWidget.py
index 5253c37f..9c24b4f0 100644
--- a/src/View/Network/GraphWidget.py
+++ b/src/View/Network/GraphWidget.py
@@ -442,7 +442,7 @@ class GraphWidget(QGraphicsView):
Nothing
"""
for i in self.texts:
- if type(i) == NodeItem:
+ if i is NodeItem:
self.texts[i].rename()
def enable_edge(self, edge, prev):
@@ -699,11 +699,11 @@ class GraphWidget(QGraphicsView):
self._selected_new_edge_src_node = None
items = self.items(event.pos())
- if items and type(items[0]) == EdgeItem:
+ if items and items[0] is EdgeItem:
edge = items[0]
if edge:
self.set_current_edge(edge)
- elif items and type(items[0]) == NodeItem:
+ elif items and items[0] is NodeItem:
self._mouse_origin_x = pos.x()
self._mouse_origin_y = pos.y()
self._current_moved_node = items[0]
@@ -711,7 +711,7 @@ class GraphWidget(QGraphicsView):
# Add nodes and edges
elif self._state == "add":
items = self.items(event.pos())
- nodes = list(filter(lambda i: type(i) == NodeItem, items))
+ nodes = list(filter(lambda i: i is NodeItem, items))
if not nodes:
self.add_node(pos)
else:
@@ -725,15 +725,15 @@ class GraphWidget(QGraphicsView):
self._selected_new_edge_src_node = None
items = list(
filter(
- lambda i: type(i) == NodeItem or type(i) == EdgeItem,
+ lambda i: i is NodeItem or i is EdgeItem,
self.items(event.pos())
)
)
if len(items) > 0:
item = items[0]
- if type(item) == NodeItem:
+ if item is NodeItem:
self.del_node(item)
- elif type(item) == EdgeItem:
+ elif item is EdgeItem:
self.del_edge(item)
self.update()
@@ -767,15 +767,14 @@ class GraphWidget(QGraphicsView):
items = self.items(event.pos())
selectable_items = list(
filter(
- lambda i: (type(i) == NodeItem or
- type(i) == EdgeItem),
+ lambda i: (i is NodeItem or i is EdgeItem),
items
)
)
if selectable_items:
self.set_selected_item(selectable_items[0])
- elif self.clicked == False:
+ elif not self.clicked:
self.set_selected_item(None)
# Update temporary line
@@ -859,7 +858,7 @@ class GraphWidget(QGraphicsView):
menu = QMenu(self)
if len(items) == 0:
self._menu_default(event, pos, items, menu)
- elif type(items[0]) == NodeItem:
+ elif items[0] is NodeItem:
self._menu_node(event, pos, items, menu)
- elif type(items[0]) == EdgeItem:
+ elif items[0] is EdgeItem:
self._menu_edge(event, pos, items, menu)
diff --git a/src/View/Network/Table.py b/src/View/Network/Table.py
index 8a94c8b8..9a4ce3d4 100644
--- a/src/View/Network/Table.py
+++ b/src/View/Network/Table.py
@@ -61,8 +61,9 @@ class ComboBoxDelegate(QItemDelegate):
def updateEditorGeometry(self, editor, option, index):
r = QRect(option.rect)
- if self.editor.windowFlags() & Qt.Popup and editor.parent() is not None:
- r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
+ if self.editor.windowFlags() & Qt.Popup:
+ if editor.parent() is not None:
+ r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
editor.setGeometry(r)
@pyqtSlot()
diff --git a/src/View/Results/PlotSedProfile.py b/src/View/Results/PlotSedProfile.py
index 406863e2..d16fb0b8 100644
--- a/src/View/Results/PlotSedProfile.py
+++ b/src/View/Results/PlotSedProfile.py
@@ -157,7 +157,7 @@ class PlotSedProfile(PamhyrPlot):
@timer
def update(self, ind=None):
- if self._init == False:
+ if not self._init:
self.draw()
return
diff --git a/src/View/Results/PlotSedReach.py b/src/View/Results/PlotSedReach.py
index f9e774d8..5cdc4ad7 100644
--- a/src/View/Results/PlotSedReach.py
+++ b/src/View/Results/PlotSedReach.py
@@ -236,7 +236,7 @@ class PlotSedReach(PamhyrPlot):
@timer
def update(self, ind=None):
- if self._init == False:
+ if not self._init:
self.draw()
return
diff --git a/src/View/SolverParameters/translate.py b/src/View/SolverParameters/translate.py
index 16816308..642fdc57 100644
--- a/src/View/SolverParameters/translate.py
+++ b/src/View/SolverParameters/translate.py
@@ -47,32 +47,86 @@ class ParamTranslate(PamhyrTranslate):
}
self._sub_dict["names"] = {
- "all_init_time": _translate("SolverParameters", "Initial time (jj:hh:mm:ss)"),
- "all_final_time": _translate("SolverParameters", "Final time (jj:hh:mm:ss)"),
- "all_timestep": _translate("SolverParameters", "Timestep (second)"),
- "all_command_line_arguments": _translate("SolverParameters", "Command line arguments"),
+ "all_init_time":
+ _translate("SolverParameters",
+ "Initial time (jj:hh:mm:ss)"),
+ "all_final_time":
+ _translate("SolverParameters",
+ "Final time (jj:hh:mm:ss)"),
+ "all_timestep":
+ _translate("SolverParameters",
+ "Timestep (second)"),
+ "all_command_line_arguments":
+ _translate("SolverParameters",
+ "Command line arguments"),
# Mage specific parameters
- "mage_min_timestep": _translate("SolverParameters", "Minimum timestep (second)"),
- "mage_timestep_tra": _translate("SolverParameters", "Time step of writing on .TRA"),
- "mage_timestep_bin": _translate("SolverParameters", "Time step of writing on .BIN"),
- "mage_implicitation": _translate("SolverParameters", "Implicitation parameter"),
- "mage_continuity_discretization": _translate("SolverParameters", "Continuity discretization type (S/L)"),
- "mage_qsj_discretization": _translate("SolverParameters", "QSJ discretization (A/B)"),
- "mage_stop_criterion_iterations": _translate("SolverParameters", "Stop criterion iterations (G/A/R)"),
- "mage_iteration_type": _translate("SolverParameters", "Iteration type"),
- "mage_smooth_coef": _translate("SolverParameters", "Smoothing coefficient"),
- "mage_cfl_max": _translate("SolverParameters", "Maximun accepted number of CFL"),
- "mage_min_height": _translate("SolverParameters", "Minimum water height (meter)"),
- "mage_max_niter": _translate("SolverParameters", "Maximun number of iterations (< 100)"),
- "mage_timestep_reduction_factor": _translate("SolverParameters", "Timestep reduction factor"),
- "mage_precision_reduction_factor_Z": _translate("SolverParameters", "Reduction precision factor of Z"),
- "mage_precision_reduction_factor_Q": _translate("SolverParameters", "Reduction precision factor of Q"),
- "mage_precision_reduction_factor_r": _translate("SolverParameters", "Reduction precision factor of residue"),
- "mage_niter_max_precision": _translate("SolverParameters", "Number of iteration at maximum precision"),
- "mage_niter_before_switch": _translate("SolverParameters", "Number of iteration before switch"),
- "mage_max_froude": _translate("SolverParameters", "Maximum accepted Froude number"),
- "mage_diffluence_node_height_balance": _translate("SolverParameters", "Diffluence node height balance"),
- "mage_compute_reach_volume_balance": _translate("SolverParameters", "Compute reach volume balance (Y/N)"),
- "mage_max_reach_volume_balance": _translate("SolverParameters", "Maximum reach volume balance"),
- "mage_min_reach_volume_to_check": _translate("SolverParameters", "Minimum reach volume to check"),
+ "mage_min_timestep":
+ _translate("SolverParameters",
+ "Minimum timestep (second)"),
+ "mage_timestep_tra":
+ _translate("SolverParameters",
+ "Time step of writing on .TRA"),
+ "mage_timestep_bin":
+ _translate("SolverParameters",
+ "Time step of writing on .BIN"),
+ "mage_implicitation":
+ _translate("SolverParameters",
+ "Implicitation parameter"),
+ "mage_continuity_discretization":
+ _translate("SolverParameters",
+ "Continuity discretization type (S/L)"),
+ "mage_qsj_discretization":
+ _translate("SolverParameters",
+ "QSJ discretization (A/B)"),
+ "mage_stop_criterion_iterations":
+ _translate("SolverParameters",
+ "Stop criterion iterations (G/A/R)"),
+ "mage_iteration_type":
+ _translate("SolverParameters",
+ "Iteration type"),
+ "mage_smooth_coef":
+ _translate("SolverParameters",
+ "Smoothing coefficient"),
+ "mage_cfl_max":
+ _translate("SolverParameters",
+ "Maximun accepted number of CFL"),
+ "mage_min_height":
+ _translate("SolverParameters",
+ "Minimum water height (meter)"),
+ "mage_max_niter":
+ _translate("SolverParameters",
+ "Maximun number of iterations (< 100)"),
+ "mage_timestep_reduction_factor":
+ _translate("SolverParameters",
+ "Timestep reduction factor"),
+ "mage_precision_reduction_factor_Z":
+ _translate("SolverParameters",
+ "Reduction precision factor of Z"),
+ "mage_precision_reduction_factor_Q":
+ _translate("SolverParameters",
+ "Reduction precision factor of Q"),
+ "mage_precision_reduction_factor_r":
+ _translate("SolverParameters",
+ "Reduction precision factor of residue"),
+ "mage_niter_max_precision":
+ _translate("SolverParameters",
+ "Number of iteration at maximum precision"),
+ "mage_niter_before_switch":
+ _translate("SolverParameters",
+ "Number of iteration before switch"),
+ "mage_max_froude":
+ _translate("SolverParameters",
+ "Maximum accepted Froude number"),
+ "mage_diffluence_node_height_balance":
+ _translate("SolverParameters",
+ "Diffluence node height balance"),
+ "mage_compute_reach_volume_balance":
+ _translate("SolverParameters",
+ "Compute reach volume balance (Y/N)"),
+ "mage_max_reach_volume_balance":
+ _translate("SolverParameters",
+ "Maximum reach volume balance"),
+ "mage_min_reach_volume_to_check":
+ _translate("SolverParameters",
+ "Minimum reach volume to check"),
}
diff --git a/src/View/Study/Window.py b/src/View/Study/Window.py
index 35bbe1d9..e8b9c7f8 100644
--- a/src/View/Study/Window.py
+++ b/src/View/Study/Window.py
@@ -46,7 +46,7 @@ class NewStudyWindow(PamhyrDialog):
parent=parent
)
- if not self._study is None:
+ if self._study is not None:
self.set_line_edit_text("lineEdit_name", self._study.name)
self.set_text_edit_text(
"textEdit_description", self._study.description)
--
GitLab