src/Model/Friction/Friction.py

@@ -228,10 +228,9 @@ class Friction(SQLSubModel):
         ssi = self._status.scenario_id
 
         return (
-            self._begin_strickler is not None
+            self._begin_strickler._owner_scenario == ssi
-            and (self._begin_strickler._owner_scenario == ssi
+            # or self._end_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,18 +34,6 @@ 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 True
+            return
 
         pid = self._pamhyr_id
         if self._solver is None:

src/Model/Status.py

@@ -34,7 +34,6 @@ class StudyStatus(object):
         self._status = Status.EDIT
         self._scenario = scenario
         self._saved = True
-        self._loading = False
 
     @property
     def scenario_id(self):
@@ -87,15 +86,6 @@ 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
@@ -107,9 +97,6 @@ class StudyStatus(object):
         self._saved = True
 
     def modified(self):
-        if self._loading:
-            return
-
         if self._saved:
             self.version += 1
 

src/Model/Study.py

@@ -546,8 +546,7 @@ class Study(SQLModel):
         self.status.scenario = scenario
 
         if reduce(
-                lambda a, s: a or (s.parent is scenario
+                lambda a, s: a or (s.parent is scenario and not s.is_deleted()),
-                                   and not s.is_deleted()),
                 self.scenarios.lst,
                 False
         ):
@@ -573,20 +572,16 @@ class Study(SQLModel):
             "scenario": scenario
         }
 
-        self.status.start_loading()
+        # Load river data
-        try:
+        river = River._db_load(
-            # Load river data
+            sql_exec, data=data
-            river = River._db_load(
+        )
-                sql_exec, data=data
+        data["study"] = self
-            )
+        river._db_load_results(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,8 +202,6 @@ 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()
@@ -220,8 +218,6 @@ 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,9 +107,6 @@ 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,9 +167,6 @@ 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,9 +97,6 @@ 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,9 +170,6 @@ 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,9 +174,6 @@ 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,9 +186,6 @@ 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,9 +134,6 @@ 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,9 +114,6 @@ 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,9 +95,6 @@ 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,9 +138,6 @@ 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()
 
@@ -291,9 +288,6 @@ 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,9 +169,6 @@ 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,9 +153,6 @@ 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,9 +188,6 @@ 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,9 +86,6 @@ 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,9 +197,6 @@ 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,9 +100,6 @@ 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,9 +162,6 @@ 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/GraphWidget.py

@@ -965,7 +965,7 @@ class GraphWidget(QGraphicsView):
                     if self.selected_new_edge_src_node() is None:
                         self.set_selected_new_edge_src_node(nodes[0])
                     else:
-                        self.add_edge(self.selected_new_edge_src_node(),
+                        self.add_edge(self.selected_new_edge_src_node(), 
                                       nodes[0])
 
             # Delete nodes and edges

src/View/Network/Table.py

@@ -105,9 +105,6 @@ class NodeTableModel(PamhyrTableModel):
             return False
 
         if role == Qt.EditRole:
-            if self.is_same_data(index, value):
-                return False
-
             try:
                 self._undo.push(
                     SetCommand(
@@ -158,9 +155,6 @@ 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,9 +149,6 @@ 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,68 +33,17 @@ 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:
@@ -109,21 +58,12 @@ class TableModel(PamhyrTableModel):
         if len(self._data.data) == 0 or len(self._data.data[row]) == 0:
             return QVariant()
 
-        value = self._data.data[row][column]
+        return 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, ComboBoxDelegate
+from View.Pollutants.Edit.Table import TableModel
 
 _translate = QCoreApplication.translate
 
@@ -78,11 +78,6 @@ 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:
@@ -93,7 +88,7 @@ class EditPolluantWindow(PamhyrWindow):
             table_view=table,
             table_headers=table_headers,
             editable_headers=editable_headers,
-            delegates={"type": self._delegate_type},
+            delegates={},
             data=self._data,
             undo=self._undo_stack,
             opt_data=self._study.time_system

src/View/Pollutants/Table.py

@@ -74,9 +74,6 @@ 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,9 +68,6 @@ 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,9 +140,6 @@ 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,9 +74,6 @@ 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,9 +65,6 @@ 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,9 +121,6 @@ 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,9 +116,6 @@ 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,9 +55,6 @@ 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,9 +79,6 @@ 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,9 +84,6 @@ 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,30 +142,6 @@ 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)