terraz_dev
Theophile Terraz 2025-02-21 14:42:06 +01:00
parent 8bac416ab5
commit 26d18d26e9
6 changed files with 31 additions and 31 deletions

View File

@ -135,7 +135,7 @@ class Mage(CommandLineSolver):
) )
for line in lines: for line in lines:
rep_file.write(line.line) rep_file.write(line.line+"\n")
def _export_ST(self, study, repertory, qlog, name="0"): def _export_ST(self, study, repertory, qlog, name="0"):
files = [] files = []

View File

@ -130,29 +130,29 @@ class D90TableModel(PamhyrTableModel):
row = index.row() row = index.row()
column = index.column() column = index.column()
if self._headers[column] is "name": if self._headers[column] == "name":
n = self._lst[row].name n = self._lst[row].name
if n is None or n == "": if n is None or n == "":
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "reach": elif self._headers[column] == "reach":
n = self._lst[row].reach n = self._lst[row].reach
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return next(filter( return next(filter(
lambda edge: edge.id == n, self._river.edges() lambda edge: edge.id == n, self._river.edges()
)).name )).name
elif self._headers[column] is "start_rk": elif self._headers[column] == "start_rk":
n = self._lst[row].start_rk n = self._lst[row].start_rk
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "end_rk": elif self._headers[column] == "end_rk":
n = self._lst[row].end_rk n = self._lst[row].end_rk
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "d90": elif self._headers[column] == "d90":
n = self._lst[row].d90 n = self._lst[row].d90
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']

View File

@ -132,39 +132,39 @@ class DIFTableModel(PamhyrTableModel):
row = index.row() row = index.row()
column = index.column() column = index.column()
if self._headers[column] is "method": if self._headers[column] == "method":
n = self._lst[row].method n = self._lst[row].method
if n is None or n == "": if n is None or n == "":
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "reach": elif self._headers[column] == "reach":
n = self._lst[row].reach n = self._lst[row].reach
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return next(filter( return next(filter(
lambda edge: edge.id == n, self._river.edges() lambda edge: edge.id == n, self._river.edges()
)).name )).name
elif self._headers[column] is "start_rk": elif self._headers[column] == "start_rk":
n = self._lst[row].start_rk n = self._lst[row].start_rk
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "end_rk": elif self._headers[column] == "end_rk":
n = self._lst[row].end_rk n = self._lst[row].end_rk
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "dif": elif self._headers[column] == "dif":
n = self._lst[row].dif n = self._lst[row].dif
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "b": elif self._headers[column] == "b":
n = self._lst[row].b n = self._lst[row].b
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "c": elif self._headers[column] == "c":
n = self._lst[row].c n = self._lst[row].c
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']

View File

@ -55,22 +55,22 @@ class DIFTableDefaultModel(PamhyrTableModel):
row = index.row() row = index.row()
column = index.column() column = index.column()
if self._headers[column] is "method": if self._headers[column] == "method":
n = self._data[row].method n = self._data[row].method
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "dif": elif self._headers[column] == "dif":
n = self._data[row].dif n = self._data[row].dif
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "b": elif self._headers[column] == "b":
n = self._data[row].b n = self._data[row].b
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "c": elif self._headers[column] == "c":
n = self._data[row].c n = self._data[row].c
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']

View File

@ -129,49 +129,49 @@ class InitialConditionTableModel(PamhyrTableModel):
row = index.row() row = index.row()
column = index.column() column = index.column()
if self._headers[column] is "name": if self._headers[column] == "name":
n = self._lst[row].name n = self._lst[row].name
if n is None or n == "": if n is None or n == "":
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "reach": elif self._headers[column] == "reach":
n = self._lst[row].reach n = self._lst[row].reach
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return next(filter( return next(filter(
lambda edge: edge.id == n, self._river.edges() lambda edge: edge.id == n, self._river.edges()
)).name )).name
elif self._headers[column] is "start_rk": elif self._headers[column] == "start_rk":
n = self._lst[row].start_rk n = self._lst[row].start_rk
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "end_rk": elif self._headers[column] == "end_rk":
n = self._lst[row].end_rk n = self._lst[row].end_rk
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "concentration": elif self._headers[column] == "concentration":
n = self._lst[row].concentration n = self._lst[row].concentration
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "eg": elif self._headers[column] == "eg":
n = self._lst[row].eg n = self._lst[row].eg
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "em": elif self._headers[column] == "em":
n = self._lst[row].em n = self._lst[row].em
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "ed": elif self._headers[column] == "ed":
n = self._lst[row].ed n = self._lst[row].ed
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "rate": elif self._headers[column] == "rate":
n = self._lst[row].rate n = self._lst[row].rate
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']

View File

@ -55,24 +55,24 @@ class InitialConditionTableDefaultModel(PamhyrTableModel):
row = index.row() row = index.row()
column = index.column() column = index.column()
if self._headers[column] is "name": if self._headers[column] == "name":
return self._data[row].name return self._data[row].name
elif self._headers[column] is "concentration": elif self._headers[column] == "concentration":
n = self._data[row].concentration n = self._data[row].concentration
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "eg": elif self._headers[column] == "eg":
n = self._data[row].eg n = self._data[row].eg
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "em": elif self._headers[column] == "em":
n = self._data[row].em n = self._data[row].em
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']
return n return n
elif self._headers[column] is "ed": elif self._headers[column] == "ed":
n = self._data[row].ed n = self._data[row].ed
if n is None: if n is None:
return self._trad['not_associated'] return self._trad['not_associated']