mirror of https://gitlab.com/pamhyr/pamhyr2
debug Adis-TS
parent
2e2f054a4f
commit
230712c3ea
|
|
@ -128,7 +128,7 @@ class Pollutants(SQLSubModel):
|
||||||
|
|
||||||
if table is not None:
|
if table is not None:
|
||||||
for t in table:
|
for t in table:
|
||||||
new_data = t[1:]
|
new_data = t[1:-1]
|
||||||
|
|
||||||
new_pollutant._data.append(new_data)
|
new_pollutant._data.append(new_data)
|
||||||
|
|
||||||
|
|
@ -182,7 +182,7 @@ class Pollutants(SQLSubModel):
|
||||||
print("from_data before : ", data)
|
print("from_data before : ", data)
|
||||||
try:
|
try:
|
||||||
new = [int(data[0])]
|
new = [int(data[0])]
|
||||||
new += [float(d) for d in data[1:-1]]
|
new += [float(d) for d in data[1:]]
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(e)
|
logger.error(e)
|
||||||
new = None
|
new = None
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,7 @@ class Results(object):
|
||||||
el.split("/")[-1][0:-4]
|
el.split("/")[-1][0:-4]
|
||||||
for el in glob.glob(repertory_results + "/*.bin")
|
for el in glob.glob(repertory_results + "/*.bin")
|
||||||
]
|
]
|
||||||
mylist.insert(0, mylist.pop(mylist.index("total_sediment")))
|
self._pollutants_list.insert(0, self._pollutants_list.pop(self._pollutants_list.index("total_sediment")))
|
||||||
|
|
||||||
self._phys_var_list = ["C", "G", "M", "D", "L", "N", "R"]
|
self._phys_var_list = ["C", "G", "M", "D", "L", "N", "R"]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -429,7 +429,10 @@ class AdisTSwc(AdisTS):
|
||||||
list_characteristics = ["type", "diametre", "rho", "porosity",
|
list_characteristics = ["type", "diametre", "rho", "porosity",
|
||||||
"cdc_riv", "cdc_cas", "apd", "ac", "bc"]
|
"cdc_riv", "cdc_cas", "apd", "ac", "bc"]
|
||||||
|
|
||||||
if len(list_characteristics) == (len(pol_data[0])-1):
|
print("pol_data:")
|
||||||
|
print(pol_data[0])
|
||||||
|
|
||||||
|
if len(list_characteristics) <= (len(pol_data[0])):
|
||||||
for i in range(len(list_characteristics)):
|
for i in range(len(list_characteristics)):
|
||||||
f.write(f"{list_characteristics[i]} = {pol_data[0][i]}\n")
|
f.write(f"{list_characteristics[i]} = {pol_data[0][i]}\n")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -207,7 +207,7 @@ class TableModel(PamhyrTableModel):
|
||||||
|
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
AddCommand(
|
AddCommand(
|
||||||
self._pollutant, self._bc_list, self._lst, row
|
self._pollutant, self._bc_list, row, self._lst
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue