[fix] Better handle name of new components

src/main/python/pyes/commands/models.py

@@ -226,6 +226,7 @@ def undo(self) -> None:
                 self.position + self.number + 8,
                 self.number,
                 table,
+                self.comp_model._data["Name"].tolist(),
             )
         self.conc_model.removeRows(self.position + self.number, self.number)
         self.cleanup()
@@ -238,6 +239,7 @@ def redo(self) -> None:
                 self.position + 8,
                 self.number,
                 table,
+                self.comp_model._data["Name"].tolist(),
             )
 
         self.conc_model.insertRows(self.position, self.number)
@@ -293,6 +295,7 @@ def undo(self) -> None:
                 self.position - self.number + 8,
                 self.number,
                 table,
+                self.comp_model._data["Name"].tolist(),
             )
 
             model._data.iloc[
@@ -327,6 +330,7 @@ def redo(self) -> None:
                 self.position + 8,
                 self.number,
                 table,
+                self.comp_model._data["Name"].tolist(),
             )
 
         self.conc_model.removeRows(self.position, self.number)

src/main/python/pyes/utils_func.py

@@ -6,22 +6,21 @@
 from viewmodels.delegate import ComboBoxDelegate
 
 
-def addSpeciesComp(position: int, added_rows: int, view: QTableView):
+def addSpeciesComp(position: int, added_rows: int, view: QTableView, comp_names):
     view.setItemDelegateForColumn(view.model().columnCount() - 1, None)
     view.model().insertColumns(position, added_rows)
     view.setItemDelegateForColumn(
         view.model().columnCount() - 1,
-        ComboBoxDelegate(view, view.model()._data["Name"].tolist()),
+        ComboBoxDelegate(view, comp_names),
     )
 
 
-def removeSpeciesComp(position: int, removed_rows: int, view: QTableView):
-    model = view.model()
-    view.setItemDelegateForColumn(model.columnCount() - 1, None)
-    model.removeColumns(position, removed_rows)
+def removeSpeciesComp(position: int, removed_rows: int, view: QTableView, comp_names):
+    view.setItemDelegateForColumn(view.model().columnCount() - 1, None)
+    view.model().removeColumns(position, removed_rows)
     view.setItemDelegateForColumn(
-        model.columnCount() - 1,
-        ComboBoxDelegate(view, model._data["Name"].tolist()),
+        view.model().columnCount() - 1,
+        ComboBoxDelegate(view, comp_names),
     )
 
 
@@ -117,13 +116,17 @@ def updateIndComponent(comp_model: QAbstractItemModel, components_combobox: QCom
     old_selected = components_combobox.currentIndex()
     if old_selected < 0:
         old_selected = 0
+
+    components_combobox.blockSignals(True)
     components_combobox.clear()
     components_combobox.addItems(comp_model._data["Name"])
+    components_combobox.blockSignals(False)
+
     num_elements = components_combobox.count()
-    if num_elements >= old_selected:
+    if num_elements > old_selected:
         components_combobox.setCurrentIndex(old_selected)
     else:
-        components_combobox.setCurrentIndex(num_elements)
+        components_combobox.setCurrentIndex(num_elements - 1)
 
 
 def cleanData():
@@ -135,17 +138,17 @@ def cleanData():
     conc_data = pd.DataFrame(
         [[0.0 for x in range(4)]],
         columns=["C0", "CT", "Sigma C0", "Sigma CT"],
-        index=["COMP1"],
+        index=["A"],
     )
     comp_data = pd.DataFrame(
-        [["COMP1", 0]],
+        [["A", 0]],
         columns=[
             "Name",
             "Charge",
         ],
     )
     species_data = pd.DataFrame(
-        [[False] + [""] + [0.0 for x in range(6)] + [int(0)] + ["COMP1"]],
+        [[False] + [""] + [0.0 for x in range(6)] + [int(0)] + ["A"]],
         columns=[
             "Ignored",
             "Name",
@@ -155,12 +158,12 @@ def cleanData():
             "CG",
             "DG",
             "EG",
-            "COMP1",
+            "A",
             "Ref. Comp.",
         ],
     )
     solid_species_data = pd.DataFrame(
-        [[False] + [""] + [0.0 for x in range(6)] + [int(0)] + ["COMP1"]],
+        [[False] + [""] + [0.0 for x in range(6)] + [int(0)] + ["A"]],
         columns=[
             "Ignored",
             "Name",
@@ -170,7 +173,7 @@ def cleanData():
             "CG",
             "DG",
             "EG",
-            "COMP1",
+            "A",
             "Ref. Comp.",
         ],
     ).drop(0)

src/main/python/pyes/viewmodels/models.py

@@ -2,6 +2,8 @@
 # to display tabular data
 
 import re
+import string
+from itertools import permutations
 
 import pandas as pd
 from commands import ComponentsCellEdit, SpeciesCellEdit
@@ -33,7 +35,6 @@ def insertRows(
                 ignore_index=True,
             )
         else:
-            # for row in range(rows):
             self._data = pd.concat(
                 [self._data[:position], empty_rows, self._data[position:]],
                 ignore_index=True,
@@ -176,6 +177,13 @@ def setPreviousIndependentComponent(self, index: int):
 
 class ComponentsModel(GenericModel):
     def __init__(self, data: pd.DataFrame, undo_stack: QUndoStack):
+        self.default_names = set(
+            "".join(x) for x in permutations(string.ascii_uppercase, 2)
+        )
+        self.default_names.update(
+            set("".join(x) for x in permutations(string.ascii_uppercase, 3))
+        )
+        self.default_names.update(set(string.ascii_uppercase))
         super().__init__(data, undo_stack)
 
     def data(self, index, role: Qt.ItemDataRole = Qt.ItemDataRole.DisplayRole):
@@ -215,8 +223,19 @@ def setData(self, index, value, role):
 
     def insertRows(self, position, rows=1, index=QModelIndex()) -> bool:
         """Insert a row into the model."""
+        new_names = sorted(
+            self.default_names.difference(self._data["Name"].to_list()),
+            key=lambda item: (len(item), item),
+        )[:rows]
+
         empty_rows = pd.DataFrame(
-            [["COMP" + str(position + row + 1)] + [0] for row in range(rows)],
+            [
+                [
+                    new_names[i],
+                    0,
+                ]
+                for i in range(rows)
+            ],
             columns=self._data.columns,
         )
 
@@ -344,10 +363,18 @@ def insertColumns(self, position, columns=1, index=QModelIndex()):
         """Add columns to the model"""
         self.beginInsertColumns(index, position, position + columns - 1)
 
-        for column in range(columns):
-            self._data.insert(
-                position + column, "COMP" + str(position + column), int(0)
-            )
+        empty_columns = pd.DataFrame(
+            [[0 for column in range(columns)]], index=self._data.index
+        )
+        self._data = pd.concat(
+            [
+                self._data.iloc[:, :position],
+                empty_columns,
+                self._data.iloc[:, position:],
+            ],
+            axis=1,
+            ignore_index=True,
+        )
 
         self.endInsertColumns()
         self.layoutChanged.emit()

src/main/python/pyes/windows/window.py

@@ -1083,20 +1083,6 @@ def plotDist(self, data):
             self.PlotWindow = PlotWindow(self)
         self.PlotWindow.show()
 
-    def relErrorsUpdater(self, checked):
-        """
-        If relative errors aren't requested
-        gray out the corresponding columns in tableviews.
-        """
-        if checked:
-            self.speciesView.model().setColumnReadOnly([3], False)
-            self.solidSpeciesView.model().setColumnReadOnly([3], False)
-            self.concView.model().setColumnReadOnly([2, 3], False)
-        else:
-            self.speciesView.model().setColumnReadOnly([3], True)
-            self.solidSpeciesView.model().setColumnReadOnly([3], True)
-            self.concView.model().setColumnReadOnly([2, 3], True)
-
     def v0Updater(self, value):
         self.initv.setMinimum(value)