From f1dca727c6bf081cb29a4c8706c13ae48d61a02f Mon Sep 17 00:00:00 2001 From: Dylan Jeannin Date: Mon, 4 May 2026 11:11:23 +0200 Subject: [PATCH] rename edition BCadisTS and LCadisTS windows --- .../BoundaryConditionsAdisTS/Edit/Window.py | 20 ++++---- .../LateralContributionsAdisTS/Edit/Window.py | 46 +++++++++++-------- src/View/LateralContributionsAdisTS/Window.py | 5 +- 3 files changed, 42 insertions(+), 29 deletions(-) diff --git a/src/View/BoundaryConditionsAdisTS/Edit/Window.py b/src/View/BoundaryConditionsAdisTS/Edit/Window.py index ca5e1eea..837f9f56 100644 --- a/src/View/BoundaryConditionsAdisTS/Edit/Window.py +++ b/src/View/BoundaryConditionsAdisTS/Edit/Window.py @@ -63,6 +63,16 @@ class EditBoundaryConditionWindow(PamhyrWindow): name = trad[self._pamhyr_name] + if self._data is not None: + n = self._data.node + node_name = next(filter( + lambda x: x.id == n, study.river._nodes + )).name + name += ( + f" - {study.name} " + + f"({node_name})" + ) + super(EditBoundaryConditionWindow, self).__init__( title=name, study=study, @@ -71,16 +81,6 @@ class EditBoundaryConditionWindow(PamhyrWindow): parent=parent ) - if self._data is not None: - n = self._data.node - node_name = next(filter( - lambda x: x.id == n, self._study.river._nodes - )).name - name += ( - f" - {study.name} " + - f"({node_name})" - ) - self._hash_data.append(data) self.setup_table() diff --git a/src/View/LateralContributionsAdisTS/Edit/Window.py b/src/View/LateralContributionsAdisTS/Edit/Window.py index ded461bb..01aa64fb 100644 --- a/src/View/LateralContributionsAdisTS/Edit/Window.py +++ b/src/View/LateralContributionsAdisTS/Edit/Window.py @@ -50,14 +50,38 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow): _pamhyr_ui = "EditLateralContributionAdisTS" _pamhyr_name = "Edit lateral contribution AdisTS" - def __init__(self, data=None, - study=None, config=None, - parent=None): + def __init__(self, data=None, study=None, config=None, parent=None): self._data = data - trad = LCETranslate() + name = trad[self._pamhyr_name] + if self._data is not None: + if self._data.reach is not None: + reach_name = next(filter( + lambda reach: reach.id == self._data.reach, + study.river.reachs() + )).name + else: + reach_name = trad['not_associated'] + + if self._data.begin_rk is not None: + begin_rk = self._data.begin_rk + else: + begin_rk = trad['not_associated'] + + if self._data.end_rk is not None: + end_rk = self._data.end_rk + else: + end_rk = trad['not_associated'] + + name += ( + f" - {study.name} - " + + f"{reach_name} - " + + f"({begin_rk} - " + + f"{end_rk})" + ) + super(EditLateralContributionAdisTSWindow, self).__init__( title=name, study=study, @@ -66,20 +90,6 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow): parent=parent ) - if self._data is not None: - if self._data.edge is not None: - edge_name = next(filter( - lambda edge: edge.id == self._data.edge, - self._study.river.edges() - )).name - else: - edge_name = trad['not_associated'] - - name += ( - f"{study.name} - " + - f"{edge_name})" - ) - self._hash_data.append(data) self.setup_table() diff --git a/src/View/LateralContributionsAdisTS/Window.py b/src/View/LateralContributionsAdisTS/Window.py index 14926501..d70b7254 100644 --- a/src/View/LateralContributionsAdisTS/Window.py +++ b/src/View/LateralContributionsAdisTS/Window.py @@ -250,8 +250,11 @@ class LateralContributionAdisTSWindow(PamhyrWindow): def edit(self): rows = self.index_selected_rows() + if not rows: + return + for row in rows: - data = self._lcs.lst[row] + data = self._table.get(row) if self.sub_window_exists( EditLateralContributionAdisTSWindow,