Adists: LC: Rename some 'edge' to 'reach' and fix plotXY error.

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -277,7 +277,7 @@ class LateralContributionAdisTS(SQLSubModel):
             "lateral_contribution_adists(id, " +
             "pollutant, reach, begin_rk, end_rk, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._pollutant}, {self.edge}, " +
+            f"{self.id}, {self._pollutant}, {self.reach}, " +
             f"{self._begin_rk}, {self._end_rk}" +
             f"{self._status.scenario_id}" +
             ")"
@@ -316,13 +316,13 @@ class LateralContributionAdisTS(SQLSubModel):
         return int(data)
 
     @property
-    def edge(self):
+    def reach(self):
-        return self._edge
+        return self._reach
 
-    @edge.setter
+    @reach.setter
-    def edge(self, edge):
+    def reach(self, reach):
-        self._edge = edge
+        self._reach = reach
-        self._status.modified()
+        self.modified()
 
     @property
     def header(self):
@@ -331,7 +331,7 @@ class LateralContributionAdisTS(SQLSubModel):
     @header.setter
     def header(self, header):
         self._header = header
-        self._status.modified()
+        self.modified()
 
     @property
     def pollutant(self):
@@ -348,7 +348,7 @@ class LateralContributionAdisTS(SQLSubModel):
     @begin_rk.setter
     def begin_rk(self, begin_rk):
         self._begin_rk = begin_rk
-        self._status.modified()
+        self.modified()
 
     @property
     def end_rk(self):
@@ -357,4 +357,4 @@ class LateralContributionAdisTS(SQLSubModel):
     @end_rk.setter
     def end_rk(self, end_rk):
         self._end_rk = end_rk
-        self._status.modified()
+        self.modified()

src/Model/Network/Graph.py

@@ -121,6 +121,9 @@ class Graph(SQLSubModel):
 
         return edge[0]
 
+    def reach(self, reach_name: str):
+        return self.edge(reach_name)
+
     def _create_node(self, x: float, y: float):
         node = self._node_ctor(
             id=-1, name="", x=x, y=y,

src/Model/River.py

@@ -664,6 +664,9 @@ execution...
 
 Last export at: @date."""
 
+    def reachs(self):
+        return self.edges()
+
     @property
     def boundary_condition(self):
         return self._boundary_condition

src/View/LateralContributionsAdisTS/Table.py

@@ -35,7 +35,7 @@ from PyQt5.QtWidgets import (
 )
 
 from View.LateralContributionsAdisTS.UndoCommand import (
-    SetEdgeCommand,
+    SetReachCommand,
     SetBeginCommand, SetEndCommand,
     AddCommand, DelCommand,
 )
@@ -48,7 +48,7 @@ _translate = QCoreApplication.translate
 
 
 class ComboBoxDelegate(QItemDelegate):
-    def __init__(self, data=None, mode="edge",
+    def __init__(self, data=None, mode="reach",
                  trad=None, parent=None):
         super(ComboBoxDelegate, self).__init__(parent)
 
@@ -132,12 +132,12 @@ class TableModel(PamhyrTableModel):
         row = index.row()
         column = index.column()
 
-        if self._headers[column] == "edge":
+        if self._headers[column] == "reach":
-            n = self._lst[row].edge
+            n = self._lst[row].reach
             if n is None:
                 return self._trad['not_associated']
             return next(filter(
-                lambda edge: edge.id == n, self._data.edges()
+                lambda r: r.id == n, self._data.reachs()
             )).name
         elif self._headers[column] == "begin_rk":
             return str(self._lst[row].begin_rk)
@@ -154,12 +154,12 @@ class TableModel(PamhyrTableModel):
         column = index.column()
 
         try:
-            if self._headers[column] == "edge":
+            if self._headers[column] == "reach":
                 self._undo.push(
-                    SetEdgeCommand(
+                    SetReachCommand(
                         self._lcs_list, self._lst,
                         row,
-                        self._data.edge(value).id
+                        self._data.reach(value).id
                     )
                 )
             elif self._headers[column] == "begin_rk":

src/View/LateralContributionsAdisTS/UndoCommand.py

@@ -63,21 +63,21 @@ class SetEndCommand(QUndoCommand):
         self._lcs_lst[self._index].end_rk = float(self._new)
 
 
-class SetEdgeCommand(QUndoCommand):
+class SetReachCommand(QUndoCommand):
-    def __init__(self, lcs, lcs_lst, index, edge):
+    def __init__(self, lcs, lcs_lst, index, reach):
         QUndoCommand.__init__(self)
 
         self._lcs = lcs
         self._lcs_lst = lcs_lst
         self._index = index
-        self._old = self._lcs_lst[self._index].edge
+        self._old = self._lcs_lst[self._index].reach
-        self._new = edge
+        self._new = reach
 
     def undo(self):
-        self._lcs_lst[self._index].edge = self._old
+        self._lcs_lst[self._index].reach = self._old
 
     def redo(self):
-        self._lcs_lst[self._index].edge = self._new
+        self._lcs_lst[self._index].reach = self._new
 
 
 class AddCommand(QUndoCommand):

src/View/LateralContributionsAdisTS/Window.py

@@ -90,9 +90,9 @@ class LateralContributionAdisTSWindow(PamhyrWindow):
         )
         self._delegate_rk.append(delegate_rk)
 
-        self._delegate_edge = ComboBoxDelegate(
+        self._delegate_reach = ComboBoxDelegate(
             data=self._study.river,
-            mode="edge",
+            mode="reach",
             trad=self._trad,
             parent=self
         )
@@ -103,7 +103,7 @@ class LateralContributionAdisTSWindow(PamhyrWindow):
             table_headers=self._trad.get_dict("table_headers"),
             editable_headers=self._trad.get_dict("table_headers"),
             delegates={
-                "edge": self._delegate_edge,
+                "reach": self._delegate_reach,
                 "begin_rk": delegate_rk,
                 "end_rk": delegate_rk,
             },
@@ -171,25 +171,26 @@ class LateralContributionAdisTSWindow(PamhyrWindow):
         tab = "liquid"
 
         if len(rows) > 0:
-            edge_id = self._study.river\
+            reach_id = self._study.river\
                        .lateral_contributions_adists.lst[rows[0]]\
-                       .edge
+                       .reach
 
-            if edge_id:
+            if reach_id:
-                edge = next(filter(lambda e: e.id == edge_id,
+                reach = next(filter(lambda e: e.id == reach_id,
-                                   self._study.river.edges()))
+                                   self._study.river.reachs()))
-                data = edge.reach
+                data = reach.reach
                 lc = self._lcs.lst[rows[0]]
                 highlight = (lc.begin_rk, lc.end_rk)
 
                 for delegate in self._delegate_rk:
-                    delegate.data = edge
+                    delegate.data = reach
 
         self.plot = PlotXY(
             canvas=self.canvas,
             data=data,
             trad=self._trad,
             toolbar=None,
+            parent=self,
         )
         self.plot.highlight = highlight
         self.plot.update()

src/View/LateralContributionsAdisTS/translate.py

@@ -43,7 +43,7 @@ class LCTranslate(MainTranslate):
         self._dict["z"] = _translate("Geometry", "Z (m)")
 
         self._sub_dict["table_headers"] = {
-            "edge": self._dict["reach"],
+            "reach": self._dict["reach"],
             "begin_rk": _translate("LateralContribution", "Begin rk (m)"),
             "end_rk": _translate("LateralContribution", "End rk (m)")
         }