From f083b7f6eff8268d8478aaaf8c422213b84c1b6f Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 18 Dec 2023 10:44:11 +0100
Subject: [PATCH] Geometry: Fix copy/paste command.
---
src/Model/Geometry/ProfileXYZ.py | 5 +++--
src/View/Geometry/Window.py | 3 +++
src/View/Tools/ASubWindow.py | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py
index 34146bc1..15066788 100644
--- a/src/Model/Geometry/ProfileXYZ.py
+++ b/src/Model/Geometry/ProfileXYZ.py
@@ -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
diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py
index 3bc4ebd1..ec2255b2 100644
--- a/src/View/Geometry/Window.py
+++ b/src/View/Geometry/Window.py
@@ -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)
diff --git a/src/View/Tools/ASubWindow.py b/src/View/Tools/ASubWindow.py
index 8530c15c..7ef5f964 100644
--- a/src/View/Tools/ASubWindow.py
+++ b/src/View/Tools/ASubWindow.py
@@ -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
--
GitLab