src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -312,21 +312,19 @@ class BoundaryConditionAdisTS(SQLSubModel):
         status = data['status']
         nodes = data['nodes']
         scenario = data["scenario"]
-        pollutant = data.get("pollutant")
+        pollutant = data["pollutant"]
         loaded = data['loaded_pid']
 
         if scenario is None:
             return new
 
-        sql = (
+        table = execute(
-            "SELECT pamhyr_id, deleted, pollutant, type, node, scenario "
+            "SELECT pamhyr_id, deleted, pollutant, type, node, scenario " +
             "FROM boundary_condition_adists " +
-            f"WHERE scenario = {scenario.id} "
+            f"WHERE scenario = {scenario.id} " +
+            f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) " +
+            f"AND pollutant = {pollutant.id} "
         )
-        if pollutant is not None:
-            sql += f"AND pollutant = {pollutant.id} "
-
-        table = execute(sql)
 
         if table is not None:
             for row in table:
@@ -351,7 +349,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
                 bc.type = bc_type
 
                 bc.node = None
-                if node != -1:
+                if row[3] != -1:
                     tmp = next(
                         filter(
                             lambda n: n.id == node, nodes
@@ -515,10 +513,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
         return (new_0, new_1)
 
     def add(self, index: int):
-        value = Data(
+        value = (self._default_0, self._default_1)
-            self._default_0, self._default_1,
-            status=self._status
-        )
         self._data.insert(index, value)
         self._status.modified()
         return value
@@ -559,9 +554,9 @@ class BoundaryConditionAdisTS(SQLSubModel):
         return lst
 
     def _set_i_c_v(self, index, column, value):
-        v = self._data[index]
+        v = list(self._data[index])
         v[column] = self._types[column](value)
-        self._data[index] = v
+        self._data[index] = tuple(v)
         self._status.modified()
 
     def set_i_0(self, index: int, value):

src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py

@@ -38,13 +38,9 @@ class BoundaryConditionsAdisTSList(PamhyrModelList):
         if data is None:
             data = {}
 
-        previous_pollutant = data.get("pollutant")
+        new._lst = BoundaryConditionAdisTS._db_load(
-        data.pop("pollutant", None)
+            execute, data
-
+        )
-        new._lst = BoundaryConditionAdisTS._db_load(execute, data)
-
-        if previous_pollutant is not None:
-            data["pollutant"] = previous_pollutant
 
         return new
 

src/View/BoundaryCondition/Edit/Plot.py

@@ -54,7 +54,7 @@ class Plot(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     def custom_ticks(self):
         if self.data.header[0] != "time":

src/View/BoundaryConditionsAdisTS/Edit/Plot.py

@@ -55,7 +55,7 @@ class Plot(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     def custom_ticks(self):
         if self.data.header[0] != "time":

src/View/BoundaryConditionsAdisTS/Edit/UndoCommand.py

@@ -61,7 +61,9 @@ class AddCommand(QUndoCommand):
 
     def redo(self):
         if self._new is None:
-            self._new = self._data.add(self._index)
+            self._new = self._data.insert(self._index, (
+                self._data._types[0](0), self._data._types[1](0.0)
+            ))
         else:
             self._data.insert(self._index, self._new)
 

src/View/BoundaryConditionsAdisTS/Table.py

@@ -121,25 +121,9 @@ class TableModel(PamhyrTableModel):
         super(TableModel, self).__init__(trad=trad, **kwargs)
 
     def _setup_lst(self):
-        self._lst = list(
+        self._lst = self._pollutant_bc_list.boundary_conditions_adists
-            filter(
-                lambda bc: bc.pollutant == self._pollutant,
-                self._bc_list.lst
-            )
-        )
 
-    def get(self, row):
+    def rowCount(self, parent):
-        if row < 0 or row >= len(self._lst):
-            return None
-        return self._lst[row]
-
-    def _global_row(self, row):
-        bc = self.get(row)
-        if bc is None:
-            return None
-        return self._bc_list.index(bc)
-
-    def rowCount(self, parent=QModelIndex()):
         return len(self._lst)
 
     def data(self, index, role):
@@ -175,21 +159,15 @@ class TableModel(PamhyrTableModel):
 
         try:
             if self._headers[column] == "type":
-                global_row = self._global_row(row)
                 self._undo.push(
                     SetTypeCommand(
-                        self._bc_list, global_row, value
+                        self._bc_list, row, value
                     )
                 )
             elif self._headers[column] == "node":
-                global_row = self._global_row(row)
-                node = next(
-                    filter(lambda n: n.name == value, self._data.nodes()),
-                    None
-                )
                 self._undo.push(
                     SetNodeCommand(
-                        self._bc_list, global_row, node
+                        self._bc_list, row, self._data.node(value)
                     )
                 )
 
@@ -201,39 +179,33 @@ class TableModel(PamhyrTableModel):
         return True
 
     def add(self, row, parent=QModelIndex()):
-        row = len(self._lst)
+        self.beginInsertRows(parent, row, row - 1)
-        self.beginInsertRows(parent, row, row)
+
         self._undo.push(
             AddCommand(
-                self._pollutant, self._bc_list, len(self._bc_list)
+                self._pollutant, self._bc_list, row
             )
         )
-        self._setup_lst()
+
         self.endInsertRows()
         self.layoutChanged.emit()
 
     def delete(self, rows, parent=QModelIndex()):
         self.beginRemoveRows(parent, rows[0], rows[-1])
 
-        global_rows = list(
-            map(self._global_row, rows)
-        )
         self._undo.push(
             DelCommand(
-                self._bc_list, global_rows
+                self._bc_list, rows
             )
         )
 
-        self._setup_lst()
         self.endRemoveRows()
         self.layoutChanged.emit()
 
     def undo(self):
         self._undo.undo()
-        self._setup_lst()
         self.layoutChanged.emit()
 
     def redo(self):
         self._undo.redo()
-        self._setup_lst()
         self.layoutChanged.emit()

src/View/BoundaryConditionsAdisTS/UndoCommand.py

@@ -36,7 +36,7 @@ class SetNodeCommand(QUndoCommand):
         self._bcs = bcs
         self._index = index
         self._old = self._bcs.get(self._index).node
-        self._new = node.id if node is not None else None
+        self._new = node.id
 
     def undo(self):
         self._bcs.get(self._index).node = self._old

src/View/BoundaryConditionsAdisTS/Window.py

@@ -159,7 +159,7 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow):
         )
 
     def add(self):
-        self._table.add(self._table.rowCount())
+        self._table.add(len(self._data.boundary_conditions_adists))
 
     def delete(self):
         rows = self.index_selected_rows()
@@ -183,7 +183,7 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow):
     def edit(self):
         rows = self.index_selected_rows()
         for row in rows:
-            data = self._table.get(row)
+            data = self._bcs.get(row)
 
             if data.node is None:
                 continue

src/View/Frictions/PlotRKZ.py

@@ -43,7 +43,7 @@ class PlotRKZ(PlotRKC):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
         self.parent = parent
 
     def onpick(self, event):

src/View/Frictions/PlotStricklers.py

@@ -50,7 +50,7 @@ class PlotStricklers(PamhyrPlot):
 
         self._auto_relim = False
         self._auto_relim_update = False
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @timer
     def draw(self, highlight=None):

src/View/Geometry/PlotAC.py

@@ -38,7 +38,7 @@ class PlotAC(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
         self.label_x = self._trad["transverse_abscissa"]
         self.label_y = self._trad["unit_elevation"]

src/View/HydraulicStructures/PlotAC.py

@@ -42,7 +42,7 @@ class PlotAC(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @property
     def river(self):

src/View/HydraulicStructures/PlotRKC.py

@@ -50,7 +50,7 @@ class PlotRKC(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
         self.parent = parent
         self.anotate_lst = []
 

src/View/InitialConditions/PlotDRK.py

@@ -47,7 +47,7 @@ class PlotDRK(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @timer
     def draw(self, highlight=None):

src/View/InitialConditions/PlotDischarge.py

@@ -37,7 +37,7 @@ class PlotDischarge(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @timer
     def draw(self):

src/View/LateralContribution/Edit/Plot.py

@@ -54,7 +54,7 @@ class Plot(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     def custom_ticks(self):
         if self.data.header[0] != "time":

src/View/LateralContributionsAdisTS/Edit/Plot.py

@@ -54,7 +54,7 @@ class Plot(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     def custom_ticks(self):
         if self.data.header[0] != "time":

src/View/Network/GraphWidget.py

@@ -925,9 +925,6 @@ class GraphWidget(QGraphicsView):
         self.scale(scaleFactor, scaleFactor)
 
     def mousePressEvent(self, event):
-        if self._only_display or self.graph._status.is_read_only():
-            return
-
         pos = self.mapToScene(event.pos())
         self.clicked = True
 

src/View/PlotXY.py

@@ -68,7 +68,7 @@ class PlotXY(PamhyrPlot):
         self._isometric_axis = True
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @timer
     def draw(self):

src/View/Reservoir/Edit/Plot.py

@@ -55,7 +55,7 @@ class Plot(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @timer
     def draw(self):

src/View/Results/PlotAC.py

@@ -56,7 +56,7 @@ class PlotAC(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @property
     def results(self):

src/View/Results/PlotRKC.py

@@ -59,7 +59,7 @@ class PlotRKC(PamhyrPlot):
         self._isometric_axis = False
 
         self._auto_relim_update = True
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @property
     def results(self):

src/View/SedimentLayers/Edit/Plot.py

@@ -49,7 +49,7 @@ class Plot(PamhyrPlot):
 
         self._auto_relim = False
         self._auto_relim_update = False
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @timer
     def draw(self):

src/View/SedimentLayers/Reach/Plot.py

@@ -53,7 +53,7 @@ class Plot(PamhyrPlot):
 
         self._auto_relim = False
         self._auto_relim_update = False
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @timer
     def draw(self):

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

@@ -53,7 +53,7 @@ class Plot(PamhyrPlot):
 
         self._auto_relim = False
         self._auto_relim_update = False
-        self._autoscale_update = False
+        self._autoscale_update = True
 
     @timer
     def draw(self):