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

HydraulicStructure: Minor change and fixes.

setup.py
Pierre-Antoine Rouby 2023-12-05 11:56:14 +01:00
parent fb2b1f680f
commit 0a780e5f78
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Model/HydraulicStructures/HydraulicStructures.py
View File

@ -113,23 +113,14 @@ class HydraulicStructure(SQLSubModel):
hs.input_kp = input_kp hs.input_kp = input_kp
hs.output_kp = output_kp hs.output_kp = output_kp
hs.input_reach = None hs.input_reach, hs.output_reach = reduce(
if input_reach_id != -1: lambda acc, n: (
hs.input_reach = next( n if n.id == input_reach_id else acc[0],
filter( n if n.id == output_reach_id else acc[1]
lambda n: n.id == input_reach_id, ),
data["reachs"] data["reachs"],
) [None, None]
) )
hs.output_reach = None
if output_reach_id != -1:
hs.output_reach = next(
filter(
lambda n: n.id == output_reach_id,
data["reachs"]
)
)
data['hs_id'] = hs_id data['hs_id'] = hs_id
hs._data = BasicHS._db_load(execute, data) hs._data = BasicHS._db_load(execute, data)
@ -143,11 +134,11 @@ class HydraulicStructure(SQLSubModel):
input_reach_id = -1 input_reach_id = -1
if self._input_reach is not None: if self._input_reach is not None:
reach_id = self._input_reach.id input_reach_id = self._input_reach.id
output_reach_id = -1 output_reach_id = -1
if self._output_reach is not None: if self._output_reach is not None:
reach_id = self._output_reach.id output_reach_id = self._output_reach.id
sql = ( sql = (
"INSERT INTO " + "INSERT INTO " +
@ -232,7 +223,7 @@ class HydraulicStructure(SQLSubModel):
return self._data.copy() return self._data.copy()
def add(self, index: int): def add(self, index: int):
value = BasicHS() value = BasicHS(status=self._status)
self._data.insert(index, value) self._data.insert(index, value)
self._status.modified() self._status.modified()
return value return value

4
src/Model/HydraulicStructures/HydraulicStructuresList.py
View File

@ -20,8 +20,6 @@ from copy import copy
from tools import trace, timer from tools import trace, timer
from Model.Tools.PamhyrList import PamhyrModelList from Model.Tools.PamhyrList import PamhyrModelList
from Model.Except import NotImplementedMethodeError
from Model.HydraulicStructures.HydraulicStructures import HydraulicStructure from Model.HydraulicStructures.HydraulicStructures import HydraulicStructure
class HydraulicStructureList(PamhyrModelList): class HydraulicStructureList(PamhyrModelList):
@ -54,7 +52,7 @@ class HydraulicStructureList(PamhyrModelList):
return True return True
def new(self, lst, index): def new(self, lst, index):
n = NotDefined(status=self._status) n = HydraulicStructure(status=self._status)
self._lst.insert(index, n) self._lst.insert(index, n)
self._status.modified() self._status.modified()
return n return n