From 2a7e322ee5dcbdbb8a95fa2d1f9b6c25164326c3 Mon Sep 17 00:00:00 2001 From: Dylan Jeannin Date: Tue, 28 Apr 2026 16:44:33 +0200 Subject: [PATCH] fix name of window InitCondAdisTS to mention pollutant name --- src/View/BoundaryConditionsAdisTS/Window.py | 7 +++---- src/View/InitialConditionsAdisTS/Window.py | 9 +++++++-- src/View/Pollutants/Window.py | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/View/BoundaryConditionsAdisTS/Window.py b/src/View/BoundaryConditionsAdisTS/Window.py index c35c9c60..03d73cfd 100644 --- a/src/View/BoundaryConditionsAdisTS/Window.py +++ b/src/View/BoundaryConditionsAdisTS/Window.py @@ -62,14 +62,13 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow): config=None, parent=None): self._data = data self._pollutant_id = pollutant_id - - _pollutants_lst = study._river._Pollutants.Pollutants_List + trad = BCAdisTSTranslate() + 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 ) - trad = BCAdisTSTranslate() name = ( trad[self._pamhyr_name] + " - " + study.name + diff --git a/src/View/InitialConditionsAdisTS/Window.py b/src/View/InitialConditionsAdisTS/Window.py index dce32696..34b99175 100644 --- a/src/View/InitialConditionsAdisTS/Window.py +++ b/src/View/InitialConditionsAdisTS/Window.py @@ -68,15 +68,20 @@ class InitialConditionsAdisTSWindow(PamhyrWindow): _pamhyr_ui = "InitialConditionsAdisTS" _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.append(data) + self._pollutant_id = pollutant_id trad = IcAdisTSTranslate() + self._pollutant_name = next( + (x.name for x in study._river._Pollutants.Pollutants_List if x.id == self._pollutant_id), + None + ) name = ( trad[self._pamhyr_name] + " - " + study.name + - " - " + self._data[0].name + " - " + self._pollutant_name ) super(InitialConditionsAdisTSWindow, self).__init__( diff --git a/src/View/Pollutants/Window.py b/src/View/Pollutants/Window.py index 870f2fb5..53ed96e4 100644 --- a/src/View/Pollutants/Window.py +++ b/src/View/Pollutants/Window.py @@ -217,7 +217,8 @@ class PollutantsWindow(PamhyrWindow): initial = InitialConditionsAdisTSWindow( study=self._study, parent=self, - data=ics_adists + data=ics_adists, + pollutant_id=pollutant_id ) initial.show()