src/View/Frictions/Table.py

@@ -278,6 +278,7 @@ class FrictionTableModel(PamhyrTableModel):
                     if int(line[1]) == reach_id:
                         data.append(line[1:])
 
+        print(data)
         new_data = []
         for d in data:
             new = None

src/View/Frictions/UndoCommand.py

@@ -151,32 +151,31 @@ class ReplaceDataCommand(QUndoCommand):
         self._new_data = new_data
         self._old_rows = list(range(len(frictions)))
         self._new_rows = list(range(len(new_data)))
-        self._new = []
 
         self._old_friction = []
         for row in self._old_rows:
             self._old_friction.append((row, self._frictions.lst[row]))
 
+        self._new_friction = []
+        for row in self._new_rows:
+            new = Friction(status=self._frictions._status)
+            d = new_data[row]
+            new.edge = d[0]
+            new.begin_rk = d[1]
+            new.end_rk = d[2]
+            new.begin_strickler = d[3]
+            new.end_strickler = d[4]
+            self._new_friction.append((row, new))
+
     def undo(self):
         self._frictions.delete_i(self._new_rows)
         for row, el in self._old_friction:
             self._frictions.insert(row, el)
 
     def redo(self):
-        if len(self._new) == 0:
+        self._frictions.delete_i(self._old_rows)
-            self._frictions.delete_i(self._old_rows)
+        for row, el in self._new_friction:
-            for row in self._new_rows:
+            self._frictions.insert(row, el)
-                new = self._frictions.new(row)
-                d = self._new_data[row]
-                new.edge = d[0]
-                new.begin_rk = d[1]
-                new.end_rk = d[2]
-                new.begin_strickler = d[3]
-                new.end_strickler = d[4]
-                self._new.append((row, new))
-        else:
-            for row, el in self._new:
-                self._frictions.insert(row, el)
 
 
 class DelCommand(QUndoCommand):

src/View/LateralContribution/Table.py

@@ -116,7 +116,7 @@ class ComboBoxDelegate(QItemDelegate):
     def setModelData(self, editor, model, index):
         text = str(editor.currentText())
 
-        if self._mode == "rk" and self._data.reach is not None:
+        if self._mode == "rk":
             profiles = list(
                 filter(
                     lambda p: p.display_name() == text,

src/View/LateralContribution/UndoCommand.py

@@ -143,13 +143,13 @@ class DelCommand(QUndoCommand):
         self._tab = tab
         self._rows = rows
 
-        self._lc = []
+        self._bc = []
         for row in rows:
-            self._lc.append((row, self._lcs.get(self._tab, row)))
+            self._bc.append((row, self._lcs.get(self._tab, row)))
-        self._lc.sort()
+        self._bc.sort()
 
     def undo(self):
-        for row, el in self._lc:
+        for row, el in self._bc:
             self._lcs.insert(self._tab, row, el)
 
     def redo(self):
@@ -219,14 +219,14 @@ class PasteCommand(QUndoCommand):
         self._lcs = lcs
         self._tab = tab
         self._row = row
-        self._lc = deepcopy(bc)
+        self._bc = deepcopy(bc)
-        self._lc.reverse()
+        self._bc.reverse()
 
     def undo(self):
-        self._lcs.delete(self._tab, self._lc)
+        self._lcs.delete(self._tab, self._bc)
 
     def redo(self):
-        for bc in self._lc:
+        for bc in self._bc:
             self._lcs.insert(self._tab, self._row, bc)
 
 
@@ -237,11 +237,11 @@ class DuplicateCommand(QUndoCommand):
         self._lcs = lcs
         self._tab = tab
         self._rows = rows
-        self._lc = deepcopy(bc)
+        self._bc = deepcopy(bc)
-        self._lc.reverse()
+        self._bc.reverse()
 
     def undo(self):
-        self._lcs.delete(self._tab, self._lc)
+        self._lcs.delete(self._tab, self._bc)
 
     def redo(self):
         for bc in self._lcs: