Commit f083b7f6 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Geometry: Fix copy/paste command.

Showing with 7 additions and 3 deletions
+7 -3
...@@ -185,10 +185,10 @@ class ProfileXYZ(Profile, SQLSubModel): ...@@ -185,10 +185,10 @@ class ProfileXYZ(Profile, SQLSubModel):
try: try:
if len(header) == 0: if len(header) == 0:
profile = cls( profile = cls(
*data *data[:-1], status=data[-1]
) )
else: else:
valid_header = {'name', 'reach', 'kp'} valid_header = {'name', 'reach', 'kp', 'status'}
d = {} d = {}
for i, v in enumerate(data): for i, v in enumerate(data):
h = header[i].strip().lower().split(' ')[0] h = header[i].strip().lower().split(' ')[0]
...@@ -197,6 +197,7 @@ class ProfileXYZ(Profile, SQLSubModel): ...@@ -197,6 +197,7 @@ class ProfileXYZ(Profile, SQLSubModel):
profile = cls(**d) profile = cls(**d)
except Exception as e: except Exception as e:
logger.error(e)
raise ClipboardFormatError(header, data) raise ClipboardFormatError(header, data)
return profile return profile
......
...@@ -473,8 +473,11 @@ class GeometryWindow(PamhyrWindow): ...@@ -473,8 +473,11 @@ class GeometryWindow(PamhyrWindow):
if len(header) != 0: if len(header) != 0:
header.append("reach") header.append("reach")
header.append("status")
for row in data: for row in data:
row.append(self._reach) row.append(self._reach)
row.append(self._study.river._status)
row = self.index_selected_row() row = self.index_selected_row()
self._tablemodel.paste(row, header, data) self._tablemodel.paste(row, header, data)
......
...@@ -81,7 +81,7 @@ class WindowToolKit(object): ...@@ -81,7 +81,7 @@ class WindowToolKit(object):
header = row.copy() header = row.copy()
continue continue
values.append(list(filter(lambda s: s != '', row))) values.append(row)
return header, values return header, values
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment