src/Model/BoundaryCondition/BoundaryCondition.py

@@ -582,9 +582,6 @@ class BoundaryCondition(SQLSubModel):
         self._data.index(bc)
 
     def get_i(self, index):
-        if len(self.data) == 0:
-            return None
-
         return self.data[index]
 
     def get_range(self, _range):

src/View/BoundaryCondition/Edit/Table.py

@@ -57,19 +57,6 @@ logger = logging.getLogger()
 
 
 class TableModel(PamhyrTableModel):
-    def get_true_data_row(self, row):
-        bc = self._data.get_i(row)
-
-        return next(
-            map(
-                lambda e: e[0],
-                filter(
-                    lambda e: e[1] == bc,
-                    enumerate(self._data._data)
-                )
-            ), 0
-        )
-
     def data(self, index, role):
         if role == Qt.TextAlignmentRole:
             return Qt.AlignHCenter | Qt.AlignVCenter
@@ -121,7 +108,6 @@ class TableModel(PamhyrTableModel):
     def add(self, row, parent=QModelIndex()):
         self.beginInsertRows(parent, row, row - 1)
 
-        row = self.get_true_data_row(row)
         self._undo.push(
             AddCommand(
                 self._data, row
@@ -134,9 +120,6 @@ class TableModel(PamhyrTableModel):
     def delete(self, rows, parent=QModelIndex()):
         self.beginRemoveRows(parent, rows[0], rows[-1])
 
-        rows = list(map(
-            lambda r: self.get_true_data_row(r), rows))
-
         self._undo.push(
             DelCommand(
                 self._data, rows
@@ -162,11 +145,10 @@ class TableModel(PamhyrTableModel):
         if row <= 0:
             return
 
-        target = row + 1
+        target = row + 2
 
         self.beginMoveRows(parent, row - 1, row - 1, parent, target)
 
-        row = self.get_true_data_row(row)
         self._undo_stack.push(
             MoveCommand(
                 self._data, "up", row
@@ -184,7 +166,6 @@ class TableModel(PamhyrTableModel):
 
         self.beginMoveRows(parent, row + 1, row + 1, parent, target)
 
-        row = self.get_true_data_row(row)
         self._undo_stack.push(
             MoveCommand(
                 self._data, "down", row

src/View/BoundaryCondition/Table.py

@@ -115,19 +115,6 @@ class ComboBoxDelegate(QItemDelegate):
 
 
 class TableModel(PamhyrTableModel):
-    def get_true_data_row(self, row):
-        bc = self._lst.get(self._tab, row)
-
-        return next(
-            map(
-                lambda e: e[0],
-                filter(
-                    lambda e: e[1] == bc,
-                    enumerate(self._lst.get_tab(self._tab))
-                )
-            ), 0
-        )
-
     def __init__(self, trad=None, **kwargs):
         self._trad = trad
         self._long_types = {}
@@ -201,8 +188,6 @@ class TableModel(PamhyrTableModel):
     def add(self, row, parent=QModelIndex()):
         self.beginInsertRows(parent, row, row - 1)
 
-        # row = self.get_true_data_row(row)
-
         self._undo.push(
             AddCommand(
                 self._lst, self._tab, row
@@ -215,9 +200,6 @@ class TableModel(PamhyrTableModel):
     def delete(self, rows, parent=QModelIndex()):
         self.beginRemoveRows(parent, rows[0], rows[-1])
 
-        rows = list(map(
-            lambda r: self.get_true_data_row(r), rows))
-
         self._undo.push(
             DelCommand(
                 self._lst, self._tab, rows
@@ -243,11 +225,10 @@ class TableModel(PamhyrTableModel):
         if row <= 0:
             return
 
-        target = row + 1
+        target = row + 2
 
         self.beginMoveRows(parent, row - 1, row - 1, parent, target)
 
-        row = self.get_true_data_row(row)
         self._undo_stack.push(
             MoveCommand(
                 self._lst, self._tab, "up", row
@@ -265,7 +246,6 @@ class TableModel(PamhyrTableModel):
 
         self.beginMoveRows(parent, row + 1, row + 1, parent, target)
 
-        row = self.get_true_data_row(row)
         self._undo_stack.push(
             MoveCommand(
                 self._lst, self._tab, "down", row

src/View/BoundaryCondition/UndoCommand.py

@@ -94,10 +94,13 @@ class AddCommand(QUndoCommand):
         self._bcs = bcs
         self._tab = tab
         self._index = index
+        self._old = None
+        if len(self._bcs.get_tab(self._tab)) > self._index:
+            self._bcs.get(self._tab, self._index)
         self._new = None
 
     def undo(self):
-        self._bcs.delete(self._tab, [self._new])
+        self._bcs.delete(self._tab, self._old)
 
     def redo(self):
         if self._new is None:

src/View/Scenarios/ContextMenu.py

@@ -71,9 +71,7 @@ class ScenarioMenu(AbstractMenu):
                 )
 
         action = self._exec()
-        if action == None:
+        if action == select:
-            return
-        elif action == select:
             self._parent.select_scenario(item)
         elif action == delete:
             self._parent.delete_scenario(item)