src/Model/HydraulicStructures/HydraulicStructures.py

@@ -274,9 +274,6 @@ class HydraulicStructure(SQLSubModel):
         return hs
 
     def _db_save(self, execute, data=None):
-        if not self.must_be_saved():
-            return True
-
         execute(
             "DELETE FROM hydraulic_structures " +
             f"WHERE pamhyr_id = {self.pamhyr_id} " +

src/Model/InitialConditions/InitialConditions.py

@@ -225,8 +225,6 @@ class Data(SQLSubModel):
         return new
 
     def _db_save(self, execute, data=None):
-        if not self.must_be_saved():
-            return True
         ind = data["ind"]
 
         execute(
@@ -398,7 +396,7 @@ class InitialConditions(SQLSubModel):
 
     @reach.setter
     def reach(self, new):
-        self._reach = new
+        self._reach = reach
         self.modified()
 
     @property

src/Model/LateralContribution/LateralContribution.py

@@ -147,9 +147,9 @@ class Data(SQLSubModel):
             it = iter(v)
 
             pid = next(it)
-            deleted = next(it)
-            data0 = lc._types[0](next(it))
-            data1 = lc._types[1](next(it))
+            delete = next(it)
+            data0 = bc._types[0](next(it))
+            data1 = bc._types[1](next(it))
             owner_scenario = next(it)
 
             nd = cls(

src/Model/Pollutants/Pollutants.py

@@ -402,7 +402,7 @@ class Pollutants(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, name, scenario FROM pollutants " +
+            "SELECT pamhyr_id, deleted, name FROM pollutants " +
             f"WHERE scenario = {scenario.id} " +
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))})"
         )
@@ -414,12 +414,10 @@ class Pollutants(SQLSubModel):
                 pid = next(it)
                 deleted = (next(it) == 1)
                 name = next(it)
-                owner_scenario = next(it)
 
                 new_pollutant = cls(
                     id=pid, name=name,
-                    status=status,
-                    owner_scenario=owner_scenario
+                    status=status
                 )
                 if deleted:
                     new_pollutant.set_as_deleted()

src/Model/River.py

@@ -180,9 +180,6 @@ class RiverNode(Node):
         return nodes
 
     def _db_save(self, execute, data=None):
-        if not self.must_be_saved():
-            return True
-
         execute(
             "INSERT OR REPLACE INTO river_node(" +
             "pamhyr_id, deleted, name, x, y, scenario" +
@@ -364,7 +361,7 @@ class RiverReach(Edge):
             )
             new.enable(enable=enabled)
             if deleted:
-                new.set_as_deleted()
+                nd.set_as_deleted()
 
             data["reach"] = new
             new._reach = Reach._db_load(execute, data)
@@ -380,9 +377,6 @@ class RiverReach(Edge):
         return reachs
 
     def _db_save(self, execute, data=None):
-        if not self.must_be_saved():
-            return True
-
         execute(
             "INSERT OR REPLACE INTO " +
             "river_reach(" +
@@ -392,7 +386,7 @@ class RiverReach(Edge):
             "VALUES (" +
             f"{self.pamhyr_id}, {self._db_format(self.is_deleted())}, " +
             f"'{self._db_format(self._name)}', " +
-            f"{self._db_format(self.is_enable())}," +
+            f"{self._db_format(self.is_enable())},"
             f"{self.node1.pamhyr_id}, {self.node2.pamhyr_id}, " +
             f"{self._status.scenario_id}" +
             ")"
@@ -549,7 +543,7 @@ class River(Graph):
         new._nodes = RiverNode._db_load(
             execute, data
         )
-        data["nodes"] = new._nodes
+        data["nodes"] = new.nodes()
         data['loaded_pid'] = set()
 
         new._edges = RiverReach._db_load(

src/Model/Scenario.py

@@ -35,9 +35,8 @@ class Scenario(SQLSubModel):
         "output_rk_adists",
         "boundary_condition_adists", "boundary_condition_data_adists",
         "lateral_contribution_adists", "lateral_contribution_data_adists",
-        "initial_conditions_adists", "initial_conditions_adists_spec",
-        "d90_adists", "d90_adists_spec",
-        "dif_adists_spec",
+        "initial_conditions_adists",
+        "d90_adists",
         "pollutants", "pollutants_characteristics",
         # Hydraulic
         "additional_files",
@@ -52,14 +51,12 @@ class Scenario(SQLSubModel):
         "rep_lines",
         "geometry_pointXYZ", "geometry_profileXYZ",
         "river_reach", "river_node",
-        "geotiff", "reservoir", "reservoir_data",
     ]
 
     related_tables = tables_with_deleted_column + [
         "dif_adists",
         "solver_parameter",
         "hydraulic_structures_basic_value",
-        "results", "results_data", "results_add_data",
     ]
 
     def __init__(self,

src/View/InitialConditions/Table.py

@@ -173,7 +173,7 @@ class InitialConditionTableModel(PamhyrTableModel):
     def add(self, row, parent=QModelIndex()):
         self.beginInsertRows(parent, row, row - 1)
 
-        # row = self.get_true_data_row(row)
+        row = self.get_true_data_row(row)
 
         self._undo.push(
             AddCommand(

src/View/LateralContribution/UndoCommand.py

@@ -156,7 +156,7 @@ class DelCommand(QUndoCommand):
             el.set_as_not_deleted()
 
     def redo(self):
-        for el in self._lc:
+        for el in self._bc:
             el.set_as_deleted()