mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Geometry: Fix copy/paste command.
This commit is contained in:
1 parent
25de73812b
commit
f083b7f6ef
3 files changed
+7
-3
No files matched your search
@@ -185,10 +185,10 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||
try:
|
||||
if len(header) == 0:
|
||||
profile = cls(
|
||||
*data
|
||||
*data[:-1], status=data[-1]
|
||||
)
|
||||
else:
|
||||
valid_header = {'name', 'reach', 'kp'}
|
||||
valid_header = {'name', 'reach', 'kp', 'status'}
|
||||
d = {}
|
||||
for i, v in enumerate(data):
|
||||
h = header[i].strip().lower().split(' ')[0]
|
||||
@@ -197,6 +197,7 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||
|
||||
profile = cls(**d)
|
||||
except Exception as e:
|
||||
logger.error(e)
|
||||
raise ClipboardFormatError(header, data)
|
||||
|
||||
return profile
|
||||
|
||||
@@ -473,8 +473,11 @@ class GeometryWindow(PamhyrWindow):
|
||||
|
||||
if len(header) != 0:
|
||||
header.append("reach")
|
||||
header.append("status")
|
||||
|
||||
for row in data:
|
||||
row.append(self._reach)
|
||||
row.append(self._study.river._status)
|
||||
|
||||
row = self.index_selected_row()
|
||||
self._tablemodel.paste(row, header, data)
|
||||
|
||||
@@ -81,7 +81,7 @@ class WindowToolKit(object):
|
||||
header = row.copy()
|
||||
continue
|
||||
|
||||
values.append(list(filter(lambda s: s != '', row)))
|
||||
values.append(row)
|
||||
|
||||
return header, values
|
||||
|
||||
|
||||
Reference in new issue
Block a user