Translation: back to old fr.ts version which broke translation*

src/Model/Friction/Friction.py

@@ -228,9 +228,10 @@ class Friction(SQLSubModel):
         ssi = self._status.scenario_id
 
         return (
-            self._begin_strickler._owner_scenario == ssi
+            self._begin_strickler is not None
+            and (self._begin_strickler._owner_scenario == ssi
                  # or self._end_strickler._owner_scenario == ssi
-            or super(Friction, self).must_be_saved()
+                 or super(Friction, self).must_be_saved())
         )
 
     def _db_save(self, execute, data=None):

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -193,7 +193,7 @@ class OutputRKAdists(SQLSubModel):
             "output_rk_adists(pamhyr_id, deleted, " +
             "reach, rk, title, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}" +
+            f"{self.id}, {self._db_format(self.is_deleted())}, " +
             f"{self._reach}, {self._rk}, " +
             f"'{self._db_format(self._title)}', " +
             f"{self._status.scenario_id}" +

src/Model/Pollutants/Pollutants.py

@@ -34,6 +34,18 @@ from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import (
 
 logger = logging.getLogger()
 
+# Types de polluants: indice -> nom du type
+POLLUTANT_TYPES = {
+    0: "Soluté",
+    1: "Particules sphériques",
+    2: "Galets lisses",
+    3: "Sable naturel",
+    4: "Sable concassé",
+    5: "Cylindres longs",
+    6: "Limon, particules cohésives",
+    7: "Flocs"
+}
+
 
 class PollutantCharacteristics(SQLSubModel):
     _sub_classes = []

src/Model/Results/Results.py

@@ -351,7 +351,7 @@ class Results(SQLSubModel):
 
     def _db_save(self, execute, data=None):
         if self._status.scenario.id != self._owner_scenario:
-            return
+            return True
 
         pid = self._pamhyr_id
         if self._solver is None:

src/Model/Status.py

@@ -34,6 +34,7 @@ class StudyStatus(object):
         self._status = Status.EDIT
         self._scenario = scenario
         self._saved = True
+        self._loading = False
 
     @property
     def scenario_id(self):
@@ -86,6 +87,15 @@ class StudyStatus(object):
     def is_saved(self):
         return self._saved
 
+    def is_loading(self):
+        return self._loading
+
+    def start_loading(self):
+        self._loading = True
+
+    def stop_loading(self):
+        self._loading = False
+
     def save(self):
         logger.debug("model status set as saved")
         self._saved = True
@@ -97,6 +107,9 @@ class StudyStatus(object):
         self._saved = True
 
     def modified(self):
+        if self._loading:
+            return
+
         if self._saved:
             self.version += 1
 

src/Model/Study.py

@@ -546,7 +546,8 @@ class Study(SQLModel):
         self.status.scenario = scenario
 
         if reduce(
-                lambda a, s: a or (s.parent is scenario and not s.is_deleted()),
+                lambda a, s: a or (s.parent is scenario
+                                   and not s.is_deleted()),
                 self.scenarios.lst,
                 False
         ):
@@ -572,16 +573,20 @@ class Study(SQLModel):
             "scenario": scenario
         }
 
+        self.status.start_loading()
+        try:
             # Load river data
             river = River._db_load(
                 sql_exec, data=data
             )
             data["study"] = self
             river._db_load_results(sql_exec, data=data)
+        finally:
+            self.status.stop_loading()
+            self.status.scenario = old_scenario
 
         # FIXME: Disable scenario cache to save memory usage
         # self._river_scenario_cache[scenario] = river
-        self.status.scenario = old_scenario
 
         return river
 

src/Model/Tools/PamhyrDB.py

@@ -202,6 +202,8 @@ class SQLSubModel(PamhyrID):
         """
         if self._status is None:
             return
+        if self._status.is_loading():
+            return
 
         self._owner_scenario = self._status.scenario_id
         self._status.modified()
@@ -218,6 +220,8 @@ class SQLSubModel(PamhyrID):
         """
         if self._status is None:
             return
+        if self._status.is_loading():
+            return
 
         self._owner_scenario = self._status.scenario_id
         self._status.modified()

src/Model/Tools/PamhyrListExt.py

@@ -171,7 +171,7 @@ class PamhyrModelList(SQLSubModel):
                 lambda x: x[1],
                 filter(
                     lambda x: x[0] in indexes,
-                    enumerate(self._lst)
+                    enumerate(self.lst)
                 )
             )
         )

src/View/BoundaryCondition/Edit/Table.py

@@ -107,6 +107,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/BoundaryCondition/Table.py

@@ -167,6 +167,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/BoundaryConditionsAdisTS/Edit/Table.py

@@ -97,6 +97,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/BoundaryConditionsAdisTS/Table.py

@@ -170,6 +170,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/D90AdisTS/Table.py

@@ -174,6 +174,9 @@ class D90TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/DIFAdisTS/Table.py

@@ -186,6 +186,9 @@ class DIFTableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Frictions/Table.py

@@ -134,6 +134,9 @@ class FrictionTableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Geometry/Profile/Table.py

@@ -114,6 +114,9 @@ class GeometryProfileTableModel(PamhyrTableModel):
         column = index.column()
 
         if role == Qt.EditRole:
+            if self.is_same_data(index, value):
+                return False
+
             try:
                 if column == 0:
                     self._undo.push(

src/View/Geometry/Table.py

@@ -95,6 +95,9 @@ class GeometryReachTableModel(PamhyrTableModel):
         column = index.column()
 
         if role == Qt.EditRole and index.column() != 2:
+            if self.is_same_data(index, value):
+                return False
+
             try:
                 if index.column() == 0:
                     self._undo.push(

src/View/HydraulicStructures/BasicHydraulicStructures/Table.py

@@ -138,6 +138,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 
@@ -288,6 +291,9 @@ class ParametersTableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         if self._hs_index is None:
             return QVariant()
 

src/View/HydraulicStructures/Table.py

@@ -169,6 +169,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
         na = self._trad['not_associated']

src/View/InitialConditions/Table.py

@@ -153,6 +153,9 @@ class InitialConditionTableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/InitialConditionsAdisTS/Table.py

@@ -188,6 +188,9 @@ class InitialConditionTableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/LateralContribution/Edit/Table.py

@@ -86,6 +86,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/LateralContribution/Table.py

@@ -197,6 +197,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/LateralContributionsAdisTS/Edit/Table.py

@@ -100,6 +100,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/LateralContributionsAdisTS/Table.py

@@ -162,6 +162,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Network/Table.py

@@ -105,6 +105,9 @@ class NodeTableModel(PamhyrTableModel):
             return False
 
         if role == Qt.EditRole:
+            if self.is_same_data(index, value):
+                return False
+
             try:
                 self._undo.push(
                     SetCommand(
@@ -155,6 +158,9 @@ class EdgeTableModel(PamhyrTableModel):
         if role != Qt.EditRole:
             return QVariant()
 
+        if self.is_same_data(index, value):
+            return False
+
         try:
             if (self._headers[index.column()] == "node1" or
                     self._headers[index.column()] == "node2"):

src/View/OutputRKAdisTS/Table.py

@@ -149,6 +149,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
         na = self._trad['not_associated']

src/View/Pollutants/Edit/Table.py

@@ -33,17 +33,68 @@ from PyQt5.QtCore import (
 
 from PyQt5.QtWidgets import (
     QTableView, QAbstractItemView, QSpinBox, QItemDelegate,
+    QComboBox,
 )
 
 from View.Pollutants.Edit.UndoCommand import (
     SetDataCommand, PasteCommand,
 )
 
+from Model.Pollutants.Pollutants import POLLUTANT_TYPES
+
 _translate = QCoreApplication.translate
 
 logger = logging.getLogger()
 
 
+class ComboBoxDelegate(QItemDelegate):
+    def __init__(self, type_dict=None, trad=None, parent=None):
+        super(ComboBoxDelegate, self).__init__(parent)
+
+        self._type_dict = type_dict if type_dict else POLLUTANT_TYPES
+        self._trad = trad
+        self.editor = None
+
+    def createEditor(self, parent, option, index):
+        self.editor = QComboBox(parent)
+
+        # Ajouter les items du dictionnaire
+        for key in sorted(self._type_dict.keys()):
+            display_text = self._type_dict[key]
+            self.editor.addItem(display_text, userData=key)
+
+        self.editor.currentTextChanged.connect(self.currentItemChanged)
+        return self.editor
+
+    def setEditorData(self, editor, index):
+        """Affiche la valeur courante"""
+        current_value = index.data(Qt.DisplayRole)  # C'est la string
+
+        # Trouve l'index du combobox qui correspond au texte affiché
+        current_index = editor.findText(current_value)
+        if current_index >= 0:
+            editor.setCurrentIndex(current_index)
+
+    def setModelData(self, editor, model, index):
+        """Récupère l'index (la clé) et le stocke dans le modèle"""
+        # Récupère la clé (userData) du combobox
+        selected_index = editor.currentData()
+        model.setData(index, selected_index)
+        editor.close()
+        editor.deleteLater()
+
+    def updateEditorGeometry(self, editor, option, index):
+        r = QRect(option.rect)
+        if self.editor and self.editor.windowFlags() & Qt.Popup:
+            if editor.parent() is not None:
+                r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
+        editor.setGeometry(r)
+
+    @pyqtSlot()
+    def currentItemChanged(self):
+        self.commitData.emit(self.sender())
+
+
 class TableModel(PamhyrTableModel):
     def data(self, index, role):
         if role == Qt.TextAlignmentRole:
@@ -58,12 +109,21 @@ class TableModel(PamhyrTableModel):
         if len(self._data.data) == 0 or len(self._data.data[row]) == 0:
             return QVariant()
 
-        return self._data.data[row][column]
+        value = self._data.data[row][column]
+
+        # Si c'est la colonne "type", convertir l'indice en string
+        if self._headers[column] == "type":
+            return POLLUTANT_TYPES.get(int(value), str(value))
+
+        return value
 
     def setData(self, index, value, role=Qt.EditRole):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Pollutants/Edit/Window.py

@@ -41,7 +41,7 @@ from PyQt5.QtWidgets import (
 )
 
 from View.Pollutants.Edit.Translate import EditPollutantTranslate
-from View.Pollutants.Edit.Table import TableModel
+from View.Pollutants.Edit.Table import TableModel, ComboBoxDelegate
 
 _translate = QCoreApplication.translate
 
@@ -78,6 +78,11 @@ class EditPolluantWindow(PamhyrWindow):
     def setup_table(self):
         table_headers = self._trad.get_dict("table_headers")
 
+        self._delegate_type = ComboBoxDelegate(
+            trad=self._trad,
+            parent=self
+        )
+
         if self._study.is_editable():
             editable_headers = self._trad.get_dict("table_headers")
         else:
@@ -88,7 +93,7 @@ class EditPolluantWindow(PamhyrWindow):
             table_view=table,
             table_headers=table_headers,
             editable_headers=editable_headers,
-            delegates={},
+            delegates={"type": self._delegate_type},
             data=self._data,
             undo=self._undo_stack,
             opt_data=self._study.time_system

src/View/Pollutants/Table.py

@@ -74,6 +74,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Reservoir/Edit/Table.py

@@ -68,6 +68,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Reservoir/Table.py

@@ -140,6 +140,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Scenarios/Table.py

@@ -74,6 +74,9 @@ class ScenariosTableModel(PamhyrTableModel):
             return False
 
         if role == Qt.EditRole:
+            if self.is_same_data(index, value):
+                return False
+
             try:
                 self._undo.push(
                     SetCommand(

src/View/SedimentLayers/Edit/Table.py

@@ -65,6 +65,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/SedimentLayers/Reach/Profile/Table.py

@@ -121,6 +121,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/SedimentLayers/Reach/Table.py

@@ -116,6 +116,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/SedimentLayers/Table.py

@@ -55,6 +55,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/SolverParameters/Table.py

@@ -79,6 +79,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Stricklers/Table.py

@@ -84,6 +84,9 @@ class TableModel(PamhyrTableModel):
         if not index.isValid() or role != Qt.EditRole:
             return False
 
+        if self.is_same_data(index, value):
+            return False
+
         row = index.row()
         column = index.column()
 

src/View/Tools/PamhyrTable.py

@@ -142,6 +142,30 @@ class PamhyrTableModel(QAbstractTableModel):
 
         return QVariant()
 
+    def is_same_data(self, index, value):
+        current = self.data(index, Qt.ItemDataRole.DisplayRole)
+        if isinstance(current, QVariant):
+            current = current.value()
+
+        if str(current) == str(value):
+            return True
+
+        if hasattr(value, "display_name"):
+            if str(current) == str(value.display_name()):
+                return True
+
+        if hasattr(value, "name"):
+            if str(current) == str(value.name):
+                return True
+
+        try:
+            return (
+                float(str(current).replace(",", ".")) ==
+                float(str(value).replace(",", "."))
+            )
+        except (TypeError, ValueError):
+            return False
+
     def data(self, index, role):
         raise NotImplementedMethodeError(self, self.data)