From 770ecdfa992b1ac70b4656c0b13e5cdcc5062bc0 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 21 Aug 2024 14:12:48 +0200 Subject: [PATCH] Pamhyr2: Pep8. --- src/Model/HydraulicStructures/HydraulicStructures.py | 3 ++- src/Model/InitialConditions/InitialConditions.py | 3 ++- src/View/InitialConditions/UndoCommand.py | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Model/HydraulicStructures/HydraulicStructures.py b/src/Model/HydraulicStructures/HydraulicStructures.py index 0b9be72b..0b36c408 100644 --- a/src/Model/HydraulicStructures/HydraulicStructures.py +++ b/src/Model/HydraulicStructures/HydraulicStructures.py @@ -126,7 +126,8 @@ class HydraulicStructure(SQLSubModel): f"INSERT INTO {table}_tmp " + "(pamhyr_id, name, enabled, input_section, output_section, " + "input_reach, output_reach, scenario) " + - "SELECT pamhyr_id, name, enabled, input_section, output_section, " + + "SELECT pamhyr_id, name, enabled, " + + "input_section, output_section, " + "input_reach, output_reach, scenario " + f"FROM {table}" ) diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py index 8dd644a4..ce969516 100644 --- a/src/Model/InitialConditions/InitialConditions.py +++ b/src/Model/InitialConditions/InitialConditions.py @@ -141,7 +141,8 @@ class Data(SQLSubModel): reach = data["reach"] id = reach.pamhyr_id table = execute( - "SELECT pamhyr_id, ind, name, comment, section, discharge, height " + + "SELECT pamhyr_id, ind, name, comment, " + + "section, discharge, height " + "FROM initial_conditions " + f"WHERE reach = {id} " + "ORDER BY ind ASC" diff --git a/src/View/InitialConditions/UndoCommand.py b/src/View/InitialConditions/UndoCommand.py index 298902ed..bcc1d8a5 100644 --- a/src/View/InitialConditions/UndoCommand.py +++ b/src/View/InitialConditions/UndoCommand.py @@ -27,6 +27,10 @@ from Model.InitialConditions.InitialConditions import InitialConditions from Model.InitialConditions.InitialConditionsDict import InitialConditionsDict +def unit_fn(x): + return x + + class SetCommand(QUndoCommand): def __init__(self, ics, row, column, new_value): QUndoCommand.__init__(self) @@ -41,7 +45,7 @@ class SetCommand(QUndoCommand): _type = str if column == "rk": - _type = lambda x: x + _type = unit_fn self._new = _type(new_value)