Scenarios: Fix scenarios table list after delete action.

scenarios
Pierre-Antoine 2025-08-25 11:32:22 +02:00
parent d62e703439
commit e6d3564d9b
2 changed files with 22 additions and 7 deletions

View File

@ -60,6 +60,9 @@ class Scenarios(PamhyrModelDict):
self.set(new._id, new) self.set(new._id, new)
return new return new
def __len__(self):
return len(self.lst)
@property @property
def lst(self): def lst(self):
return list( return list(
@ -70,8 +73,8 @@ class Scenarios(PamhyrModelDict):
) )
def delete(self, key): def delete(self, key):
el = self._dict.get(key) if key not in self._dict:
if el is None:
return return
el.set_as_deleted() self._dict[key].set_as_deleted()
self._status.modified()

View File

@ -27,7 +27,7 @@ from View.Tools.PamhyrTable import PamhyrTableModel
from PyQt5.QtCore import ( from PyQt5.QtCore import (
Qt, QRect, QVariant, QAbstractTableModel, pyqtSlot, pyqtSignal, Qt, QRect, QVariant, QAbstractTableModel, pyqtSlot, pyqtSignal,
QEvent, QEvent, QModelIndex,
) )
from PyQt5.QtWidgets import ( from PyQt5.QtWidgets import (
@ -41,20 +41,32 @@ logger = logging.getLogger()
class ScenariosTableModel(PamhyrTableModel): class ScenariosTableModel(PamhyrTableModel):
def _setup_lst(self): def _setup_lst(self):
self._lst = self._data.scenarios.lst self._lst = list(
filter(
lambda x: not x.is_deleted(),
self._data.scenarios.lst
)
)
def rowCount(self, parent=QModelIndex()):
self._setup_lst()
return len(self._lst)
def data(self, index, role): def data(self, index, role):
if role != Qt.ItemDataRole.DisplayRole: if role != Qt.ItemDataRole.DisplayRole:
return QVariant() return QVariant()
value = self._lst[index.row()]
if self._headers[index.column()] == "parent": if self._headers[index.column()] == "parent":
parent = self._lst[index.row()][self._headers[index.column()]] parent = value["parent"]
if parent is None: if parent is None:
return "" return ""
return parent.name return parent.name
return self._lst[index.row()][self._headers[index.column()]] return value[self._headers[index.column()]]
@pyqtSlot() @pyqtSlot()
def setData(self, index, value, role=Qt.EditRole): def setData(self, index, value, role=Qt.EditRole):