mirror of https://gitlab.com/pamhyr/pamhyr2
Geometry: Fix copy/paste command.
parent
25de73812b
commit
f083b7f6ef
|
|
@ -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):
|
||||||
|
|
||||||
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):
|
||||||
|
|
||||||
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):
|
||||||
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
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue