mirror of https://gitlab.com/pamhyr/pamhyr2
cleaning
parent
31fe765e51
commit
fce034419d
|
|
@ -278,7 +278,6 @@ class FrictionTableModel(PamhyrTableModel):
|
||||||
if int(line[1]) == reach_id:
|
if int(line[1]) == reach_id:
|
||||||
data.append(line[1:])
|
data.append(line[1:])
|
||||||
|
|
||||||
print(data)
|
|
||||||
new_data = []
|
new_data = []
|
||||||
for d in data:
|
for d in data:
|
||||||
new = None
|
new = None
|
||||||
|
|
|
||||||
|
|
@ -156,17 +156,6 @@ class ReplaceDataCommand(QUndoCommand):
|
||||||
for row in self._old_rows:
|
for row in self._old_rows:
|
||||||
self._old_friction.append((row, self._frictions.lst[row]))
|
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):
|
def undo(self):
|
||||||
self._frictions.delete_i(self._new_rows)
|
self._frictions.delete_i(self._new_rows)
|
||||||
for row, el in self._old_friction:
|
for row, el in self._old_friction:
|
||||||
|
|
@ -174,8 +163,14 @@ class ReplaceDataCommand(QUndoCommand):
|
||||||
|
|
||||||
def redo(self):
|
def redo(self):
|
||||||
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]
|
||||||
|
|
||||||
|
|
||||||
class DelCommand(QUndoCommand):
|
class DelCommand(QUndoCommand):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue