fix bug when add button didnt refresh the tab list in Initial conditions AdisTS and d90

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -455,7 +455,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @node.setter
     def node(self, node):
         self._node = node
-        self._status.modified()
+        self.modified()
 
     @property
     def header(self):
@@ -464,7 +464,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @header.setter
     def header(self, header):
         self._header = header
-        self._status.modified()
+        self.modified()
 
     @property
     def pollutant(self):
@@ -473,7 +473,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @pollutant.setter
     def pollutant(self, pollutant):
         self._pollutant = pollutant
-        self._status.modified()
+        self.modified()
 
     @property
     def type(self):
@@ -482,7 +482,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
     @type.setter
     def type(self, type):
         self._type = type
-        self._status.modified()
+        self.modified()
 
     @property
     def data(self):
@@ -520,12 +520,12 @@ class BoundaryConditionAdisTS(SQLSubModel):
             status=self._status
         )
         self._data.insert(index, value)
-        self._status.modified()
+        self.modified()
         return value
 
     def insert(self, index: int, value):
         self._data.insert(index, value)
-        self._status.modified()
+        self.modified()
 
     def delete_i(self, indexes):
         self._data = list(
@@ -537,14 +537,14 @@ class BoundaryConditionAdisTS(SQLSubModel):
                 )
             )
         )
-        self._status.modified()
+        self.modified()
 
     def sort(self, _reverse=False, key=None):
         if key is None:
             self._data.sort(reverse=_reverse)
         else:
             self._data.sort(reverse=_reverse, key=key)
-        self._status.modified()
+        self.modified()
 
     def index(self, bc):
         self._data.index(bc)
@@ -562,7 +562,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
         v = self._data[index]
         v[column] = self._types[column](value)
         self._data[index] = v
-        self._status.modified()
+        self.modified()
 
     def set_i_0(self, index: int, value):
         self._set_i_c_v(index, 0, value)

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
@@ -196,12 +196,12 @@ class D90AdisTSSpec(SQLSubModel):
             "d90_default, name, reach, " +
             "start_rk, end_rk, d90, enabled, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}" +
+            f"{self.id}, {self._db_format(self.is_deleted())}, " +
             f"{d90_default}, " +
             f"'{self._db_format(self._name_section)}', " +
             f"{self._reach}, " +
             f"{self._start_rk}, {self._end_rk}, " +
-            f"{self._d90}, {self._enabled}" +
+            f"{self._d90}, {self._enabled}, " +
             f"{self._status.scenario_id}" +
             ")"
         )

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -267,7 +267,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @name.setter
     def name(self, name):
         self._name = name
-        self._status.modified()
+        self.modified()
 
     @property
     def pollutant(self):
@@ -276,7 +276,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @pollutant.setter
     def pollutant(self, pollutant):
         self._pollutant = pollutant
-        self._status.modified()
+        self.modified()
 
     @property
     def concentration(self):
@@ -285,7 +285,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @concentration.setter
     def concentration(self, concentration):
         self._concentration = concentration
-        self._status.modified()
+        self.modified()
 
     @property
     def eg(self):
@@ -294,7 +294,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @eg.setter
     def eg(self, eg):
         self._eg = eg
-        self._status.modified()
+        self.modified()
 
     @property
     def em(self):
@@ -303,7 +303,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @em.setter
     def em(self, em):
         self._em = em
-        self._status.modified()
+        self.modified()
 
     @property
     def ed(self):
@@ -312,7 +312,7 @@ class InitialConditionsAdisTS(SQLSubModel):
     @ed.setter
     def ed(self, ed):
         self._ed = ed
-        self._status.modified()
+        self.modified()
 
     @property
     def enabled(self):
@@ -321,28 +321,45 @@ class InitialConditionsAdisTS(SQLSubModel):
     @enabled.setter
     def enabled(self, enabled):
         self._enabled = enabled
-        self._status.modified()
+        self.modified()
 
     def new(self, index):
         n = ICAdisTSSpec(status=self._status)
         self._data.insert(index, n)
-        self._status.modified()
+        self.modified()
         return n
 
     def delete(self, data):
-        self._data = list(
+        list(
-            filter(
+            map(
-                lambda x: x not in data,
+                lambda x: x.set_as_deleted(),
-                self._data
+                data
             )
         )
-        self._status.modified()
+        self.modified()
 
     def delete_i(self, indexes):
-        for ind in indexes:
+        list(
-            del self._data[ind]
+            map(
-        self._status.modified()
+                lambda e: e[1].set_as_deleted(),
+                filter(
+                    lambda e: e[0] in indexes,
+                    enumerate(self._data)
+                )
+            )
+        )
+        self.modified()
 
     def insert(self, index, data):
-        self._data.insert(index, data)
+        if data in self._data:
-        self._status.modified()
+            self.undelete([data])
+        else:
+            self._data.insert(index, data)
+
+        self.modified()
+
+    def undelete(self, lst):
+        for x in lst:
+            x.set_as_not_deleted()
+
+        self.modified()

src/View/BoundaryConditionsAdisTS/Table.py

@@ -116,7 +116,6 @@ class TableModel(PamhyrTableModel):
         self._trad = trad
         self._bc_list = bc_list
         self._pollutant = pollutant_bc_list.id
-        self._pollutant_bc_list = pollutant_bc_list
 
         super(TableModel, self).__init__(trad=trad, **kwargs)
 

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)
@@ -197,18 +202,25 @@ class D90TableModel(PamhyrTableModel):
             )
         )
 
+        self._setup_lst()
         self.endInsertRows()
         self.layoutChanged.emit()
 
     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()
 

src/View/InitialConditionsAdisTS/Table.py

@@ -117,7 +117,12 @@ class InitialConditionTableModel(PamhyrTableModel):
         self._data = data
 
     def _setup_lst(self):
-        self._lst = self._data._data
+        self._lst = list(
+            filter(
+                lambda ica: ica._deleted == False,
+                self._data._data
+            )
+        )
 
     def rowCount(self, parent):
         return len(self._lst)
@@ -216,18 +221,25 @@ class InitialConditionTableModel(PamhyrTableModel):
             )
         )
 
+        self._setup_lst()
         self.endInsertRows()
         self.layoutChanged.emit()
 
     def delete(self, rows, parent=QModelIndex()):
         self.beginRemoveRows(parent, rows[0], rows[-1])
 
+        data_rows = {
+            id(ica): i for i, ica 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()
 

src/View/InitialConditionsAdisTS/UndoCommand.py

@@ -181,7 +181,6 @@ class DelCommand(QUndoCommand):
         self._data = data
         self._ics_spec = ics_spec
         self._rows = rows
-        # self._data = data
 
         self._ic = []
         for row in rows:

src/View/Results/Window.py

@@ -701,7 +701,8 @@ class ResultsWindow(PamhyrWindow):
         logger.info("TODO: paste")
 
     def _undo(self):
-        self._table.undo()
+        logger.info("TODO: undo")
+        # self._table.undo()
 
     def _redo(self):
         self._table.redo()