Move coloring alongside row_deletion, column_deleton and copy/paste (#66)

* Move coloring alongside row_deletion, column_deleton and copy/paste

* Added some catches for adding values

Author: PaulJonasJost

src/petab_gui/controllers/table_controllers.py

@@ -199,6 +199,7 @@ def delete_row(self):
         selected_rows = get_selected(table_view)
         if not selected_rows:
             return
+        self.model.update_invalid_cells(selected_rows, mode="rows")
         for row in sorted(selected_rows, reverse=True):
             if row >= self.model.rowCount() - 1:
                 continue
@@ -232,6 +233,7 @@ def delete_column(self):
         selected_columns = get_selected(table_view, mode=COLUMN)
         if not selected_columns:
             return
+        self.model.update_invalid_cells(selected_columns, mode="columns")
         for column in sorted(selected_columns, reverse=True):
             # safely delete potential item delegates
             column_name = self.model.get_df().columns[column]

src/petab_gui/models/pandas_table_model.py

@@ -229,11 +229,49 @@ def get_df(self):
 
     def add_invalid_cell(self, row, column):
         """Add an invalid cell to the set."""
+        # check that the index is valid
+        if not self.index(row, column).isValid():
+            return
+        # return if it is the last row
+        if row == self._data_frame.shape[0]:
+            return
+        # return if it is already invalid
+        if (row, column) in self._invalid_cells:
+            return
         self._invalid_cells.add((row, column))
+        self.dataChanged.emit(
+            self.index(row, column),
+            self.index(row, column),
+            [Qt.BackgroundRole]
+        )
 
     def discard_invalid_cell(self, row, column):
         """Discard an invalid cell from the set."""
         self._invalid_cells.discard((row, column))
+        self.dataChanged.emit(
+            self.index(row, column),
+            self.index(row, column),
+            [Qt.BackgroundRole]
+        )
+
+    def update_invalid_cells(self, selected, mode: str = "rows"):
+        """Edits the invalid cells when values are deleted."""
+        old_invalid_cells = self._invalid_cells.copy()
+        new_invalid_cells = set()
+        sorted_to_del = sorted(selected)
+        for a, b in old_invalid_cells:
+            if mode == "rows":
+                to_be_change = a
+                not_changed = b
+            elif mode == "columns":
+                to_be_change = b
+                not_changed = a
+            if to_be_change in selected:
+                continue
+            smaller_count = sum(1 for x in sorted_to_del if x < to_be_change)
+            new_val = to_be_change - smaller_count
+            new_invalid_cells.add((new_val, not_changed))
+        self._invalid_cells = new_invalid_cells
 
     def notify_data_color_change(self, row, column):
         """Notify the view to change the color of some cells"""

src/petab_gui/views/table_view.py

@@ -39,13 +39,34 @@ def copy_to_clipboard(self):
     def paste_from_clipboard(self):
         clipboard = QGuiApplication.clipboard()
         text = clipboard.text()
-        if text:
-            start_index = self.table_view.selectionModel().currentIndex()
-            if start_index.isValid():
-                self.table_view.model().setDataFromText(
-                    text, start_index.row(),
-                    start_index.column()
-                )
+        if not text:
+            return
+        start_index = self.table_view.selectionModel().currentIndex()
+        if not start_index.isValid():
+            return
+        model = self.table_view.model()
+        row_start, col_start = start_index.row(), start_index.column()
+        # identify which invalid cells are being pasted into
+        pasted_data = [line.split("\t") for line in text.split("\n") if line.strip()]
+        num_rows = len(pasted_data)
+        num_cols = max([len(line) for line in pasted_data])
+        overridden_cells = {
+            (row_start + r, col_start + c)
+            for r in range(num_rows)
+            for c in range(num_cols)
+            if model.index(row_start + r, col_start + c).isValid()
+        }
+        invalid_overridden_cells = overridden_cells.intersection(
+            model._invalid_cells
+        )
+        if invalid_overridden_cells:
+            for row_invalid, col_invalid in invalid_overridden_cells:
+                model.discard_invalid_cell(row_invalid, col_invalid)
+
+        model.setDataFromText(
+            text, start_index.row(),
+            start_index.column()
+        )
 
 
 class ComboBoxDelegate(QStyledItemDelegate):