diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py index 34146bc1e51b83d910b2df6396a69200599eaa39..150667886fda0772b9b27f493afe7be187df1619 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 3bc4ebd15c737fe4cccb1e091980b43340270c87..ec2255b269b834976689df168c058b0a8b4ed927 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 8530c15c9e5849053c51ab0166fa9cec5b8fffa2..7ef5f964b341ec5b229ea179f48d441892bf1485 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