From 13a44264acfd38d36286d1c847bcfd867405ab33 Mon Sep 17 00:00:00 2001 From: Dylan Jeannin Date: Tue, 28 Apr 2026 16:05:40 +0200 Subject: [PATCH] fix pep8 rules --- src/Model/BoundaryCondition/BoundaryCondition.py | 14 +++++++++----- .../BoundaryConditionAdisTS.py | 3 ++- src/Model/Pollutants/Pollutants.py | 13 +++++++++---- src/Model/Tools/PamhyrDB.py | 3 ++- src/View/BoundaryConditionsAdisTS/Table.py | 3 ++- src/View/BoundaryConditionsAdisTS/Window.py | 3 ++- src/View/D90AdisTS/Table.py | 2 +- src/View/Geometry/ShiftDialog.py | 3 ++- src/View/Geometry/Window.py | 2 +- src/View/InitialConditionsAdisTS/Table.py | 2 +- src/View/Pollutants/Window.py | 3 ++- src/View/Tools/FlexibleDoubleSpinBox.py | 4 ++-- 12 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py index d1da739b..fdc9c0a5 100644 --- a/src/Model/BoundaryCondition/BoundaryCondition.py +++ b/src/Model/BoundaryCondition/BoundaryCondition.py @@ -329,7 +329,8 @@ class BoundaryCondition(SQLSubModel): return new table = execute( - "SELECT pamhyr_id, deleted, name, type, node, d50, sigma, scenario " + + "SELECT pamhyr_id, deleted, name, type, node, d50, sigma, " + + "scenario " + "FROM boundary_condition " + f"WHERE tab = '{tab}' " + f"AND scenario = {scenario.id} " + @@ -355,11 +356,14 @@ class BoundaryCondition(SQLSubModel): status=data['status'], owner_scenario=owner_scenario ) + if deleted: bc.set_as_deleted() - if t=="SL": + + if t == "SL": bc.d50 = d50 bc.sigma = sigma + bc.node = None if node != -1: bc.node = next(filter(lambda n: n.id == node, nodes), None) @@ -391,13 +395,13 @@ class BoundaryCondition(SQLSubModel): node = -1 if self._node is not None: node = self._node.id - + d50 = 0.002 sigma = 1 if self._type == "SL": d50 = self._d50 sigma = self._sigma - + execute( "INSERT INTO " + "boundary_condition(" + @@ -491,7 +495,7 @@ class BoundaryCondition(SQLSubModel): def has_node(self): return self._node is not None - + @property def d50(self): return self._d50 diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index fe047c5a..6dc3e836 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py @@ -302,7 +302,8 @@ class BoundaryConditionAdisTS(SQLSubModel): if pol_id not in pid_pol: # ⚠️ cas important : probablement déjà migré - print(f"[WARN] pol_id {pol_id} not in pid_pol → probably already migrated") + print(f"[WARN] pol_id {pol_id} not in pid_pol " + + f"→ probably already migrated") continue execute( diff --git a/src/Model/Pollutants/Pollutants.py b/src/Model/Pollutants/Pollutants.py index 047ceb43..72681f40 100644 --- a/src/Model/Pollutants/Pollutants.py +++ b/src/Model/Pollutants/Pollutants.py @@ -28,7 +28,9 @@ from tools import ( from Model.Tools.PamhyrDB import SQLSubModel from Model.Except import NotImplementedMethodeError from Model.Scenario import Scenario -from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import BoundaryConditionAdisTS +from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import ( + BoundaryConditionAdisTS, +) logger = logging.getLogger() @@ -422,9 +424,12 @@ class Pollutants(SQLSubModel): new_pollutant._data = PollutantCharacteristics._db_load( execute, data=data ) - - new_pollutant._boundary_conditions_adists = BoundaryConditionAdisTS._db_load( - execute, data=data + + new_pollutant._boundary_conditions_adists = ( + BoundaryConditionAdisTS._db_load( + execute, + data=data + ) ) loaded.add(pid) diff --git a/src/Model/Tools/PamhyrDB.py b/src/Model/Tools/PamhyrDB.py index 265876f9..9ca7257c 100644 --- a/src/Model/Tools/PamhyrDB.py +++ b/src/Model/Tools/PamhyrDB.py @@ -313,7 +313,8 @@ class SQLSubModel(PamhyrID): if node_id not in nodes: # ⚠️ cas important : probablement déjà migré - print(f"[WARN] node_id {node_id} not in nodes → probably already migrated") + print(f"[WARN] node_id {node_id} not in nodes " + + f"→ probably already migrated") continue execute( diff --git a/src/View/BoundaryConditionsAdisTS/Table.py b/src/View/BoundaryConditionsAdisTS/Table.py index 706edbc2..adde9683 100644 --- a/src/View/BoundaryConditionsAdisTS/Table.py +++ b/src/View/BoundaryConditionsAdisTS/Table.py @@ -112,7 +112,8 @@ class ComboBoxDelegate(QItemDelegate): class TableModel(PamhyrTableModel): - def __init__(self, bc_list=None, pollutant_bc_list=None, trad=None, **kwargs): + def __init__(self, bc_list=None, pollutant_bc_list=None, + trad=None, **kwargs): self._trad = trad self._bc_list = bc_list self._pollutant = pollutant_bc_list.id diff --git a/src/View/BoundaryConditionsAdisTS/Window.py b/src/View/BoundaryConditionsAdisTS/Window.py index 4c95befe..c35c9c60 100644 --- a/src/View/BoundaryConditionsAdisTS/Window.py +++ b/src/View/BoundaryConditionsAdisTS/Window.py @@ -58,7 +58,8 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow): _pamhyr_ui = "BoundaryConditionsAdisTS" _pamhyr_name = "Boundary conditions AdisTS" - def __init__(self, data=None, pollutant_id=None, study=None, config=None, parent=None): + def __init__(self, data=None, pollutant_id=None, study=None, + config=None, parent=None): self._data = data self._pollutant_id = pollutant_id diff --git a/src/View/D90AdisTS/Table.py b/src/View/D90AdisTS/Table.py index 69f76157..090a5a8b 100644 --- a/src/View/D90AdisTS/Table.py +++ b/src/View/D90AdisTS/Table.py @@ -120,7 +120,7 @@ class D90TableModel(PamhyrTableModel): def _setup_lst(self): self._lst = list( filter( - lambda d90: d90._deleted == False, + lambda d90: d90._deleted is False, self._data._data ) ) diff --git a/src/View/Geometry/ShiftDialog.py b/src/View/Geometry/ShiftDialog.py index 85ff029b..9368cd99 100644 --- a/src/View/Geometry/ShiftDialog.py +++ b/src/View/Geometry/ShiftDialog.py @@ -20,6 +20,7 @@ from View.Tools.PamhyrWindow import PamhyrDialog from PyQt5.QtWidgets import QDoubleSpinBox from View.Tools.FlexibleDoubleSpinBox import FlexibleDoubleSpinBox + class ShiftDialog(PamhyrDialog): _pamhyr_ui = "GeometryReachShift" _pamhyr_name = "Shift" @@ -31,7 +32,7 @@ class ShiftDialog(PamhyrDialog): options=[], parent=parent ) - + self._replace_spinboxes() self._init_default_values() diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py index 89631518..ce4bc954 100644 --- a/src/View/Geometry/Window.py +++ b/src/View/Geometry/Window.py @@ -697,7 +697,7 @@ class GeometryWindow(PamhyrWindow): win.setWindowTitle(self._trad["warning"]) win.setText(self._trad["format_not_exportable"]) win.exec() - + pass else: self._export_to_file_st(filename) diff --git a/src/View/InitialConditionsAdisTS/Table.py b/src/View/InitialConditionsAdisTS/Table.py index 39ebe1c8..b84beed1 100644 --- a/src/View/InitialConditionsAdisTS/Table.py +++ b/src/View/InitialConditionsAdisTS/Table.py @@ -119,7 +119,7 @@ class InitialConditionTableModel(PamhyrTableModel): def _setup_lst(self): self._lst = list( filter( - lambda ica: ica._deleted == False, + lambda ica: ica._deleted is False, self._data._data ) ) diff --git a/src/View/Pollutants/Window.py b/src/View/Pollutants/Window.py index 09cbdd87..870f2fb5 100644 --- a/src/View/Pollutants/Window.py +++ b/src/View/Pollutants/Window.py @@ -229,7 +229,8 @@ class PollutantsWindow(PamhyrWindow): for row in rows: pollutant_id = self._pollutants_lst.get(row).id - bclist = self._study.river.boundary_conditions_adists.BCs_AdisTS_List + river = self._study.river + bclist = river.boundary_conditions_adists.BCs_AdisTS_List bcs_adists = [ x for x in bclist if x.pollutant == pollutant_id diff --git a/src/View/Tools/FlexibleDoubleSpinBox.py b/src/View/Tools/FlexibleDoubleSpinBox.py index 34332bef..74a1fbb6 100644 --- a/src/View/Tools/FlexibleDoubleSpinBox.py +++ b/src/View/Tools/FlexibleDoubleSpinBox.py @@ -23,7 +23,7 @@ from PyQt5.QtWidgets import QDoubleSpinBox class FlexibleDoubleSpinBox(QDoubleSpinBox): - + def keyPressEvent(self, event): if event.text() == ".": # Simule une virgule à la place du point @@ -34,4 +34,4 @@ class FlexibleDoubleSpinBox(QDoubleSpinBox): "," ) - super().keyPressEvent(event) \ No newline at end of file + super().keyPressEvent(event)