parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pep8: Fixes code style.

setup.py
Pierre-Antoine Rouby 2023-12-13 14:53:58 +01:00
parent 2736d2f399
commit c3cae35de4
4 changed files with 56 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/HydraulicStructures/Basic/Types.py
View File

@ -181,7 +181,6 @@ class VanneRectangulaireSimplifiee(BasicHS):
] ]
class Borda(BasicHS): class Borda(BasicHS):
def __init__(self, id: int = -1, name: str = "", def __init__(self, id: int = -1, name: str = "",
status=None): status=None):
@ -198,7 +197,6 @@ class Borda(BasicHS):
] ]
class UserDefined(BasicHS): class UserDefined(BasicHS):
def __init__(self, id: int = -1, name: str = "", def __init__(self, id: int = -1, name: str = "",
status=None): status=None):

9
src/Solver/Mage.py
View File

@ -467,16 +467,21 @@ class Mage(CommandLineSolver):
for hs in hydraulic_structures: for hs in hydraulic_structures:
if hs.input_reach.is_enable: if hs.input_reach.is_enable:
f.write('* ouvrage au pk ' +f"{hs.input_kp:>12.1f}"+ ' ' + hs.name + '\n') f.write(
'* ouvrage au pk ' +
f"{hs.input_kp:>12.1f}" + ' ' +
hs.name + '\n'
)
for bhs in hs.basic_structures: for bhs in hs.basic_structures:
reach_id = study.river.get_edge_id(hs.input_reach) + 1 reach_id = study.river.get_edge_id(hs.input_reach) + 1
param_str = ' '.join( param_str = ' '.join(
[ [
f'{p.value:>10.3f}' f'{p.value:>10.3f}'
for p in bhs._data for p in bhs._data
] ]
) )
f.write( f.write(
f"{sin_dict[bhs.type]} " + f"{sin_dict[bhs.type]} " +
f"{reach_id} {hs.input_kp:>12.3f} {param_str} " + f"{reach_id} {hs.input_kp:>12.3f} {param_str} " +

44
src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
View File

@ -39,17 +39,39 @@ hydraulic structure values?"
) )
self._sub_dict["long_types"] = { self._sub_dict["long_types"] = {
"ND": _translate("BasicHydraulicStructures", "Not defined"), "ND": _translate(
"S1": _translate("BasicHydraulicStructures", "Seuil déversoir"), "BasicHydraulicStructures", "Not defined"
"S2": _translate("BasicHydraulicStructures", "Seuil trapezoidal"), ),
"S3": _translate("BasicHydraulicStructures", "Seuil triangulaire"), "S1": _translate(
"OR": _translate("BasicHydraulicStructures", "Orifice rectangulaire"), "BasicHydraulicStructures", "Seuil déversoir"
"OC": _translate("BasicHydraulicStructures", "Orifice circulaire"), ),
"OV": _translate("BasicHydraulicStructures", "Orifice voute"), "S2": _translate(
"V1": _translate("BasicHydraulicStructures", "Vanne rectangulaire"), "BasicHydraulicStructures", "Seuil trapezoidal"
"V2": _translate("BasicHydraulicStructures", "Vanne rectangulaire simplifiée"), ),
"BO": _translate("BasicHydraulicStructures", "Perte de charge à la Borda"), "S3": _translate(
"UD": _translate("BasicHydraulicStructures", "User defined"), "BasicHydraulicStructures", "Seuil triangulaire"
),
"OR": _translate(
"BasicHydraulicStructures", "Orifice rectangulaire"
),
"OC": _translate(
"BasicHydraulicStructures", "Orifice circulaire"
),
"OV": _translate(
"BasicHydraulicStructures", "Orifice voute"
),
"V1": _translate(
"BasicHydraulicStructures", "Vanne rectangulaire"
),
"V2": _translate(
"BasicHydraulicStructures", "Vanne rectangulaire simplifiée"
),
"BO": _translate(
"BasicHydraulicStructures", "Perte de charge à la Borda"
),
"UD": _translate(
"BasicHydraulicStructures", "User defined"
),
} }
self._sub_dict["table_headers"] = { self._sub_dict["table_headers"] = {

4
src/config.py
View File

@ -120,7 +120,9 @@ class Config(SQL):
f"INSERT INTO data VALUES ('close_correctly', 'True')") f"INSERT INTO data VALUES ('close_correctly', 'True')")
if int(release) < 4: if int(release) < 4:
self.execute(f"INSERT INTO data VALUES ('last_solver_name', '')") self.execute(
f"INSERT INTO data VALUES ('last_solver_name', '')"
)
self.commit() self.commit()