mirror of https://gitlab.com/pamhyr/pamhyr2
fix name of window InitCondAdisTS to mention pollutant name
parent
13a44264ac
commit
2a7e322ee5
|
|
@ -62,14 +62,13 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow):
|
||||||
config=None, parent=None):
|
config=None, parent=None):
|
||||||
self._data = data
|
self._data = data
|
||||||
self._pollutant_id = pollutant_id
|
self._pollutant_id = pollutant_id
|
||||||
|
trad = BCAdisTSTranslate()
|
||||||
|
|
||||||
_pollutants_lst = study._river._Pollutants.Pollutants_List
|
|
||||||
self._pollutant_name = next(
|
self._pollutant_name = next(
|
||||||
(x.name for x in _pollutants_lst if x.id == self._pollutant_id),
|
(x.name for x in study._river._Pollutants.Pollutants_List if x.id == self._pollutant_id),
|
||||||
None
|
None
|
||||||
)
|
)
|
||||||
|
|
||||||
trad = BCAdisTSTranslate()
|
|
||||||
name = (
|
name = (
|
||||||
trad[self._pamhyr_name] +
|
trad[self._pamhyr_name] +
|
||||||
" - " + study.name +
|
" - " + study.name +
|
||||||
|
|
|
||||||
|
|
@ -68,15 +68,20 @@ class InitialConditionsAdisTSWindow(PamhyrWindow):
|
||||||
_pamhyr_ui = "InitialConditionsAdisTS"
|
_pamhyr_ui = "InitialConditionsAdisTS"
|
||||||
_pamhyr_name = "Initial condition AdisTS"
|
_pamhyr_name = "Initial condition AdisTS"
|
||||||
|
|
||||||
def __init__(self, data=None, study=None, config=None, parent=None):
|
def __init__(self, data=None, pollutant_id=None, study=None, config=None, parent=None):
|
||||||
self._data = []
|
self._data = []
|
||||||
self._data.append(data)
|
self._data.append(data)
|
||||||
|
self._pollutant_id = pollutant_id
|
||||||
trad = IcAdisTSTranslate()
|
trad = IcAdisTSTranslate()
|
||||||
|
|
||||||
|
self._pollutant_name = next(
|
||||||
|
(x.name for x in study._river._Pollutants.Pollutants_List if x.id == self._pollutant_id),
|
||||||
|
None
|
||||||
|
)
|
||||||
name = (
|
name = (
|
||||||
trad[self._pamhyr_name] +
|
trad[self._pamhyr_name] +
|
||||||
" - " + study.name +
|
" - " + study.name +
|
||||||
" - " + self._data[0].name
|
" - " + self._pollutant_name
|
||||||
)
|
)
|
||||||
|
|
||||||
super(InitialConditionsAdisTSWindow, self).__init__(
|
super(InitialConditionsAdisTSWindow, self).__init__(
|
||||||
|
|
|
||||||
|
|
@ -217,7 +217,8 @@ class PollutantsWindow(PamhyrWindow):
|
||||||
initial = InitialConditionsAdisTSWindow(
|
initial = InitialConditionsAdisTSWindow(
|
||||||
study=self._study,
|
study=self._study,
|
||||||
parent=self,
|
parent=self,
|
||||||
data=ics_adists
|
data=ics_adists,
|
||||||
|
pollutant_id=pollutant_id
|
||||||
)
|
)
|
||||||
initial.show()
|
initial.show()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue