fix pep8 rules

dev_dylan
Dylan Jeannin 2026-04-28 16:05:40 +02:00
parent 6165719829
commit 13a44264ac
12 changed files with 35 additions and 20 deletions

View File

@ -329,7 +329,8 @@ class BoundaryCondition(SQLSubModel):
return new return new
table = execute( 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 " + "FROM boundary_condition " +
f"WHERE tab = '{tab}' " + f"WHERE tab = '{tab}' " +
f"AND scenario = {scenario.id} " + f"AND scenario = {scenario.id} " +
@ -355,11 +356,14 @@ class BoundaryCondition(SQLSubModel):
status=data['status'], status=data['status'],
owner_scenario=owner_scenario owner_scenario=owner_scenario
) )
if deleted: if deleted:
bc.set_as_deleted() bc.set_as_deleted()
if t == "SL": if t == "SL":
bc.d50 = d50 bc.d50 = d50
bc.sigma = sigma bc.sigma = sigma
bc.node = None bc.node = None
if node != -1: if node != -1:
bc.node = next(filter(lambda n: n.id == node, nodes), None) bc.node = next(filter(lambda n: n.id == node, nodes), None)

View File

@ -302,7 +302,8 @@ class BoundaryConditionAdisTS(SQLSubModel):
if pol_id not in pid_pol: if pol_id not in pid_pol:
# ⚠️ cas important : probablement déjà migré # ⚠️ 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 continue
execute( execute(

View File

@ -28,7 +28,9 @@ from tools import (
from Model.Tools.PamhyrDB import SQLSubModel from Model.Tools.PamhyrDB import SQLSubModel
from Model.Except import NotImplementedMethodeError from Model.Except import NotImplementedMethodeError
from Model.Scenario import Scenario from Model.Scenario import Scenario
from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import BoundaryConditionAdisTS from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import (
BoundaryConditionAdisTS,
)
logger = logging.getLogger() logger = logging.getLogger()
@ -423,8 +425,11 @@ class Pollutants(SQLSubModel):
execute, data=data execute, data=data
) )
new_pollutant._boundary_conditions_adists = BoundaryConditionAdisTS._db_load( new_pollutant._boundary_conditions_adists = (
execute, data=data BoundaryConditionAdisTS._db_load(
execute,
data=data
)
) )
loaded.add(pid) loaded.add(pid)

View File

@ -313,7 +313,8 @@ class SQLSubModel(PamhyrID):
if node_id not in nodes: if node_id not in nodes:
# ⚠️ cas important : probablement déjà migré # ⚠️ 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 continue
execute( execute(

View File

@ -112,7 +112,8 @@ class ComboBoxDelegate(QItemDelegate):
class TableModel(PamhyrTableModel): 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._trad = trad
self._bc_list = bc_list self._bc_list = bc_list
self._pollutant = pollutant_bc_list.id self._pollutant = pollutant_bc_list.id

View File

@ -58,7 +58,8 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow):
_pamhyr_ui = "BoundaryConditionsAdisTS" _pamhyr_ui = "BoundaryConditionsAdisTS"
_pamhyr_name = "Boundary conditions AdisTS" _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._data = data
self._pollutant_id = pollutant_id self._pollutant_id = pollutant_id

View File

@ -120,7 +120,7 @@ class D90TableModel(PamhyrTableModel):
def _setup_lst(self): def _setup_lst(self):
self._lst = list( self._lst = list(
filter( filter(
lambda d90: d90._deleted == False, lambda d90: d90._deleted is False,
self._data._data self._data._data
) )
) )

View File

@ -20,6 +20,7 @@ from View.Tools.PamhyrWindow import PamhyrDialog
from PyQt5.QtWidgets import QDoubleSpinBox from PyQt5.QtWidgets import QDoubleSpinBox
from View.Tools.FlexibleDoubleSpinBox import FlexibleDoubleSpinBox from View.Tools.FlexibleDoubleSpinBox import FlexibleDoubleSpinBox
class ShiftDialog(PamhyrDialog): class ShiftDialog(PamhyrDialog):
_pamhyr_ui = "GeometryReachShift" _pamhyr_ui = "GeometryReachShift"
_pamhyr_name = "Shift" _pamhyr_name = "Shift"

View File

@ -119,7 +119,7 @@ class InitialConditionTableModel(PamhyrTableModel):
def _setup_lst(self): def _setup_lst(self):
self._lst = list( self._lst = list(
filter( filter(
lambda ica: ica._deleted == False, lambda ica: ica._deleted is False,
self._data._data self._data._data
) )
) )

View File

@ -229,7 +229,8 @@ class PollutantsWindow(PamhyrWindow):
for row in rows: for row in rows:
pollutant_id = self._pollutants_lst.get(row).id 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 = [ bcs_adists = [
x for x in bclist x for x in bclist
if x.pollutant == pollutant_id if x.pollutant == pollutant_id