From df9e1ec42d73b5bdb5e69fb5615d1ca612e73711 Mon Sep 17 00:00:00 2001 From: Dylan Jeannin Date: Mon, 27 Apr 2026 15:43:32 +0200 Subject: [PATCH] fix delete for pollutants D90 --- src/Model/D90AdisTS/D90AdisTSSpec.py | 2 +- src/View/D90AdisTS/Table.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Model/D90AdisTS/D90AdisTSSpec.py b/src/Model/D90AdisTS/D90AdisTSSpec.py index 2b6277d1..5af1c4bb 100644 --- a/src/Model/D90AdisTS/D90AdisTSSpec.py +++ b/src/Model/D90AdisTS/D90AdisTSSpec.py @@ -167,7 +167,7 @@ class D90AdisTSSpec(SQLSubModel): owner_scenario=owner_scenario ) if deleted: - new_spec.is_deleted() + new_spec.set_as_deleted() new_spec.reach = reach new_spec.start_rk = start_rk diff --git a/src/View/D90AdisTS/Table.py b/src/View/D90AdisTS/Table.py index 47390a71..769c79b3 100644 --- a/src/View/D90AdisTS/Table.py +++ b/src/View/D90AdisTS/Table.py @@ -118,7 +118,12 @@ class D90TableModel(PamhyrTableModel): self._data = data def _setup_lst(self): - self._lst = self._data._data + self._lst = list( + filter( + lambda d90: d90._deleted == False, + self._data._data + ) + ) def rowCount(self, parent): return len(self._lst) @@ -203,12 +208,18 @@ class D90TableModel(PamhyrTableModel): def delete(self, rows, parent=QModelIndex()): self.beginRemoveRows(parent, rows[0], rows[-1]) + data_rows = { + id(d90): i for i, d90 in enumerate(self._data._data) + } self._undo.push( DelCommand( - self._data, self._lst, rows + self._data, + self._data._data, + [data_rows[id(self._lst[row])] for row in rows] ) ) + self._setup_lst() self.endRemoveRows() self.layoutChanged.emit()