.gitlab-ci.yml

@@ -332,7 +332,7 @@ build-linux:
     - pip3 install -r ../requirements.txt
     - pip3 install -U -r ../requirements.txt
     # Run Pyinstaller
-    - pyinstaller -y $HIDDEN_IMPORTS --paths linux-venv/lib/python3.10/site-packages ../src/pamhyr.py
+    - pyinstaller -y $HIDDEN_IMPORTS --paths linux-venv/lib/python3.8/site-packages ../src/pamhyr.py
     # Create directory
     - mkdir -p pamhyr
     - mkdir -p pamhyr/_internal

full-requirements.txt

@@ -1,10 +1,10 @@
-PyQt5==5.15.11
+PyQt5==5.15.4
 PyQt5-Qt5==5.15.2
-PyQt5-sip==12.18.0
+PyQt5-sip==12.12.2
 PyQtWebEngine==5.15.6
 QScintilla>=2.14.1
 pyqtgraph>=0.12.1
-matplotlib>=3.7.1, < 3.10.0
+matplotlib>=3.7.1
 numpy>=1.24.2
 colorama>=0.4.3
 pyinstaller>=5.11.0

requirements.txt

@@ -1,10 +1,10 @@
-PyQt5==5.15.11
+PyQt5==5.15.4
 PyQt5-Qt5==5.15.2
-PyQt5-sip==12.18.0
+PyQt5-sip==12.12.2
 #PyQtWebEngine==5.15.6
 QScintilla>=2.14.1
 pyqtgraph>=0.12.1
-matplotlib==3.10.0
+matplotlib>=3.7.1
 numpy>=1.24.2
 colorama>=0.4.3
 pyinstaller>=5.11.0

src/Model/Geometry/Profile.py

@@ -80,9 +80,6 @@ class Profile(object):
             return self.points[0]
         elif name == "np":
             return self.points[-1]
-        elif name == "talweg":
-            zm = self.z_min()
-            return next((p for p in self.points if p.z == zm), None)
         else:
             return next((p for p in self.points if p.name == name), None)
 
@@ -91,12 +88,6 @@ class Profile(object):
             return 0
         elif name == "np":
             return len(self.points) - 1
-        elif name == "talweg":
-            zm = self.z_min()
-            return next(
-                (p for p in enumerate(self.points) if p[1].z == zm),
-                None
-            )[0]
         else:
             return next(
                 (p for p in enumerate(self.points) if p[1].name == name),

src/Model/Geometry/Reach.py

@@ -197,10 +197,8 @@ class Reach(SQLSubModel):
             self.undelete([profile])
             profile.num = index
         else:
-            gi = self.get_global_profil_index(index)
+            profile.num = index
-            profile.num = gi
+            self._profiles.insert(index, profile)
-            print(f"gi = {gi}")
-            self._profiles.insert(gi, profile)
 
         self.modified()
 
@@ -213,12 +211,11 @@ class Reach(SQLSubModel):
         Returns:
             Nothing.
         """
-        gi = [self.get_global_profil_index(i) for i in indexes]
         list(
             map(
                 lambda p: p[1].set_as_deleted(),
                 filter(
-                    lambda e: e[0] in gi,
+                    lambda e: e[0] in indexes,
                     enumerate(self._profiles)
                 )
             )
@@ -234,12 +231,11 @@ class Reach(SQLSubModel):
         Returns:
             Nothing.
         """
-        gi = [self.get_global_profil_index(i) for i in indexes]
         self._profiles = list(
             map(
                 lambda p: p[1],
                 filter(
-                    lambda e: e[0] not in gi,
+                    lambda e: e[0] not in indexes,
                     enumerate(self._profiles)
                 )
             )
@@ -935,24 +931,3 @@ class Reach(SQLSubModel):
         nr2._profiles = list(map(lambda p: p.cloned_for(nr2), nr2_profiles))
 
         return nr1, nr2
-
-    def get_local_profil_index(self, index):
-        local_index = -1
-        for i, p in enumerate(self._profiles):
-            if not p.is_deleted():
-                local_index += 1
-            if i == index:
-                break
-
-        return local_index
-
-    def get_global_profil_index(self, index):
-        local_index = -1
-        for i, p in enumerate(self._profiles):
-            if not p.is_deleted():
-                local_index += 1
-            if local_index == index:
-                global_index = i
-                break
-
-        return global_index

src/View/D90AdisTS/TableDefault.py

@@ -55,9 +55,9 @@ class D90TableDefaultModel(PamhyrTableModel):
         row = index.row()
         column = index.column()
 
-        if self._headers[column] == "name":
+        if self._headers[column] is "name":
             return self._data[row].name
-        elif self._headers[column] == "d90":
+        elif self._headers[column] is "d90":
             n = self._data[row].d90
             if n is None:
                 return self._trad['not_associated']

src/View/Geometry/UpdateRKDialog.py

@@ -130,8 +130,8 @@ class UpdateRKDialog(PamhyrDialog):
         return name
 
     def _init_default_values_guidelines(self):
-        bgl = ['un'] + self._gl + ['np', 'talweg']
+        bgl = ['un'] + self._gl + ['np']
-        egl = ['un'] + self._gl + ['np', 'talweg']
+        egl = ['un'] + self._gl + ['np']
 
         self.combobox_add_items("comboBox_begin_gl", bgl)
         self.combobox_add_items("comboBox_end_gl", egl)

src/View/MainWindow.py

@@ -26,6 +26,7 @@ from queue import Queue
 from functools import reduce
 from time import process_time_ns
 
+from numpy.core.multiarray import where
 from platformdirs import user_cache_dir
 
 from Solver.AdisTS import AdisTS
@@ -1809,10 +1810,10 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
 
         if dialog.exec_():
             file_name = dialog.selectedFiles()
-            logger.info(f"Select results: {file_name[0]}")
+            logger.info(f"Select results: {file_name}")
 
             solver = None
-            if ".BIN" in file_name[0]:
+            if ".BIN" in file_name:
                 solver = Mage8("Mage8")
             else:
                 solver = Rubar3("Rubar3")

src/View/Results/CustomPlot/Plot.py

@@ -62,9 +62,9 @@ class CustomPlot(PamhyrPlot):
         self._x = x
         self._y = y
         self._envelop = envelop
-        self._current_reach = reach
+        self._reach = reach
-        self._current_profile_id = profile
+        self._profile = profile
-        self._current_timestamp = timestamp
+        self._timestamp = timestamp
         self._current_res_id = res_id[0]
         self._parent = parent
 
@@ -144,14 +144,14 @@ class CustomPlot(PamhyrPlot):
         Get SL list for profile p at current time
         """
         return map(
-            lambda p: p.get_ts_key(self._current_timestamp, "sl")[0],
+            lambda p: p.get_ts_key(self._timestamp, "sl")[0],
             reach.profiles
         )
 
     def get_ts_zmin(self, profile, res_id):
         results = self.data[res_id]
         nt = len(list(results.get("timestamps")))
-        reach = results.river.reach(self._current_reach)
+        reach = results.river.reach(self._reach)
         berdrock = self.sl_compute_bedrock(reach)
         sl = reach.profile(profile).get_key("sl")
 
@@ -171,10 +171,10 @@ class CustomPlot(PamhyrPlot):
 
     def _draw_rk(self):
         results = self.data[self._current_res_id]
-        reach = results.river.reach(self._current_reach)
+        reach = results.river.reach(self._reach)
         if self._current_res_id == 2:  # compare results
-            reach1 = self.data[0].river.reach(self._current_reach)
+            reach1 = self.data[0].river.reach(self._reach)
-            reach2 = self.data[1].river.reach(self._current_reach)
+            reach2 = self.data[1].river.reach(self._reach)
         rk = reach.geometry.get_rk()
         if reach.has_sediment():
             z_min = self.draw_bottom_with_bedload(reach)
@@ -183,19 +183,19 @@ class CustomPlot(PamhyrPlot):
 
         q = list(
             map(
-                lambda p: p.get_ts_key(self._current_timestamp, "Q"),
+                lambda p: p.get_ts_key(self._timestamp, "Q"),
                 reach.profiles
             )
         )
         z = list(
             map(
-                lambda p: p.get_ts_key(self._current_timestamp, "Z"),
+                lambda p: p.get_ts_key(self._timestamp, "Z"),
                 reach.profiles
             )
         )
         v = list(
             map(
-                lambda p: p.get_ts_key(self._current_timestamp, "V"),
+                lambda p: p.get_ts_key(self._timestamp, "V"),
                 reach.profiles
             )
         )
@@ -402,7 +402,7 @@ class CustomPlot(PamhyrPlot):
                 d = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach.profiles
                     )
                 )
@@ -410,14 +410,14 @@ class CustomPlot(PamhyrPlot):
                 d1 = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach1.profiles
                     )
                 )
                 d2 = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach2.profiles
                     )
                 )
@@ -471,7 +471,7 @@ class CustomPlot(PamhyrPlot):
                 d = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach.profiles
                     )
                 )
@@ -479,14 +479,14 @@ class CustomPlot(PamhyrPlot):
                 d1 = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach1.profiles
                     )
                 )
                 d2 = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach2.profiles
                     )
                 )
@@ -510,12 +510,12 @@ class CustomPlot(PamhyrPlot):
                 fr = list(
                     map(
                         lambda p:
-                            p.get_ts_key(self._current_timestamp, "V") /
+                            p.get_ts_key(self._timestamp, "V") /
                             sqrt(9.81 * (
-                                p.geometry.wet_area(p.get_ts_key(
+                                p.geometry.wet_area(
-                                    self._current_timestamp, "Z")) /
+                                    p.get_ts_key(self._timestamp, "Z")) /
-                                p.geometry.wet_width(p.get_ts_key(
+                                p.geometry.wet_width(
-                                    self._current_timestamp, "Z"))
+                                    p.get_ts_key(self._timestamp, "Z"))
                                 )),
                         reach.profiles
                     )
@@ -524,12 +524,12 @@ class CustomPlot(PamhyrPlot):
                 fr1 = list(
                     map(
                         lambda p:
-                            p.get_ts_key(self._current_timestamp, "V") /
+                            p.get_ts_key(self._timestamp, "V") /
                             sqrt(9.81 * (
-                                p.geometry.wet_area(p.get_ts_key(
+                                p.geometry.wet_area(
-                                    self._current_timestamp, "Z")) /
+                                    p.get_ts_key(self._timestamp, "Z")) /
-                                p.geometry.wet_width(p.get_ts_key(
+                                p.geometry.wet_width(
-                                    self._current_timestamp, "Z"))
+                                    p.get_ts_key(self._timestamp, "Z"))
                                 )),
                         reach1.profiles
                     )
@@ -537,12 +537,12 @@ class CustomPlot(PamhyrPlot):
                 fr2 = list(
                     map(
                         lambda p:
-                            p.get_ts_key(self._current_timestamp, "V") /
+                            p.get_ts_key(self._timestamp, "V") /
                             sqrt(9.81 * (
-                                p.geometry.wet_area(p.get_ts_key(
+                                p.geometry.wet_area(
-                                    self._current_timestamp, "Z")) /
+                                    p.get_ts_key(self._timestamp, "Z")) /
-                                p.geometry.wet_width(p.get_ts_key(
+                                p.geometry.wet_width(
-                                    self._current_timestamp, "Z"))
+                                    p.get_ts_key(self._timestamp, "Z"))
                                 )),
                         reach2.profiles
                     )
@@ -566,7 +566,7 @@ class CustomPlot(PamhyrPlot):
                 d = list(
                     map(
                         lambda p: p.geometry.wet_area(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach.profiles
                     )
                 )
@@ -574,14 +574,14 @@ class CustomPlot(PamhyrPlot):
                 d1 = list(
                     map(
                         lambda p: p.geometry.wet_area(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach1.profiles
                     )
                 )
                 d2 = list(
                     map(
                         lambda p: p.geometry.wet_area(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach2.profiles
                     )
                 )
@@ -603,10 +603,10 @@ class CustomPlot(PamhyrPlot):
 
     def _redraw_rk(self):
         results = self.data[self._current_res_id]
-        reach = results.river.reach(self._current_reach)
+        reach = results.river.reach(self._reach)
         if self._current_res_id == 2:  # compare results
-            reach1 = self.data[0].river.reach(self._current_reach)
+            reach1 = self.data[0].river.reach(self._reach)
-            reach2 = self.data[1].river.reach(self._current_reach)
+            reach2 = self.data[1].river.reach(self._reach)
 
         rk = reach.geometry.get_rk()
         z_min = reach.geometry.get_z_min()
@@ -617,19 +617,19 @@ class CustomPlot(PamhyrPlot):
 
         q = list(
             map(
-                lambda p: p.get_ts_key(self._current_timestamp, "Q"),
+                lambda p: p.get_ts_key(self._timestamp, "Q"),
                 reach.profiles
             )
         )
         z = list(
             map(
-                lambda p: p.get_ts_key(self._current_timestamp, "Z"),
+                lambda p: p.get_ts_key(self._timestamp, "Z"),
                 reach.profiles
             )
         )
         v = list(
             map(
-                lambda p: p.get_ts_key(self._current_timestamp, "V"),
+                lambda p: p.get_ts_key(self._timestamp, "V"),
                 reach.profiles
             )
         )
@@ -673,7 +673,7 @@ class CustomPlot(PamhyrPlot):
                 d = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach.profiles
                     )
                 )
@@ -681,14 +681,14 @@ class CustomPlot(PamhyrPlot):
                 d1 = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach1.profiles
                     )
                 )
                 d2 = list(
                     map(
                         lambda p: p.geometry.max_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach2.profiles
                     )
                 )
@@ -706,7 +706,7 @@ class CustomPlot(PamhyrPlot):
                 d = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach.profiles
                     )
                 )
@@ -714,14 +714,14 @@ class CustomPlot(PamhyrPlot):
                 d1 = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach1.profiles
                     )
                 )
                 d2 = list(
                     map(
                         lambda p: p.geometry.mean_water_depth(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach2.profiles
                     )
                 )
@@ -739,12 +739,12 @@ class CustomPlot(PamhyrPlot):
                 fr = list(
                     map(
                         lambda p:
-                            p.get_ts_key(self._current_timestamp, "V") /
+                            p.get_ts_key(self._timestamp, "V") /
                             sqrt(9.81 * (
-                                p.geometry.wet_area(p.get_ts_key(
+                                p.geometry.wet_area(
-                                    self._current_timestamp, "Z")) /
+                                    p.get_ts_key(self._timestamp, "Z")) /
-                                p.geometry.wet_width(p.get_ts_key(
+                                p.geometry.wet_width(
-                                    self._current_timestamp, "Z"))
+                                    p.get_ts_key(self._timestamp, "Z"))
                                 )),
                         reach.profiles
                     )
@@ -753,12 +753,12 @@ class CustomPlot(PamhyrPlot):
                 fr1 = list(
                     map(
                         lambda p:
-                            p.get_ts_key(self._current_timestamp, "V") /
+                            p.get_ts_key(self._timestamp, "V") /
                             sqrt(9.81 * (
-                                p.geometry.wet_area(p.get_ts_key(
+                                p.geometry.wet_area(
-                                    self._current_timestamp, "Z")) /
+                                    p.get_ts_key(self._timestamp, "Z")) /
-                                p.geometry.wet_width(p.get_ts_key(
+                                p.geometry.wet_width(
-                                    self._current_timestamp, "Z"))
+                                    p.get_ts_key(self._timestamp, "Z"))
                                 )),
                         reach1.profiles
                     )
@@ -766,12 +766,12 @@ class CustomPlot(PamhyrPlot):
                 fr2 = list(
                     map(
                         lambda p:
-                            p.get_ts_key(self._current_timestamp, "V") /
+                            p.get_ts_key(self._timestamp, "V") /
                             sqrt(9.81 * (
-                                p.geometry.wet_area(p.get_ts_key(
+                                p.geometry.wet_area(
-                                    self._current_timestamp, "Z")) /
+                                    p.get_ts_key(self._timestamp, "Z")) /
-                                p.geometry.wet_width(p.get_ts_key(
+                                p.geometry.wet_width(
-                                    self._current_timestamp, "Z"))
+                                    p.get_ts_key(self._timestamp, "Z"))
                                 )),
                         reach2.profiles
                     )
@@ -790,7 +790,7 @@ class CustomPlot(PamhyrPlot):
                 d = list(
                     map(
                         lambda p: p.geometry.wet_area(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach.profiles
                     )
                 )
@@ -798,14 +798,14 @@ class CustomPlot(PamhyrPlot):
                 d1 = list(
                     map(
                         lambda p: p.geometry.wet_area(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach1.profiles
                     )
                 )
                 d2 = list(
                     map(
                         lambda p: p.geometry.wet_area(
-                            p.get_ts_key(self._current_timestamp, "Z")),
+                            p.get_ts_key(self._timestamp, "Z")),
                         reach2.profiles
                     )
                 )
@@ -862,8 +862,8 @@ class CustomPlot(PamhyrPlot):
 
     def _draw_time(self):
         results = self.data[self._current_res_id]
-        reach = results.river.reach(self._current_reach)
+        reach = results.river.reach(self._reach)
-        profile = reach.profile(self._current_profile_id)
+        profile = reach.profile(self._profile)
 
         shift = 0
         compt = 0
@@ -878,10 +878,10 @@ class CustomPlot(PamhyrPlot):
         ts = self._parent._timestamps
 
         if self._current_res_id == 2:  # compare results
-            reach1 = self.data[0].river.reach(self._current_reach)
+            reach1 = self.data[0].river.reach(self._reach)
-            reach2 = self.data[1].river.reach(self._current_reach)
+            reach2 = self.data[1].river.reach(self._reach)
-            profile1 = reach1.profile(self._current_profile_id)
+            profile1 = reach1.profile(self._profile)
-            profile2 = reach2.profile(self._current_profile_id)
+            profile2 = reach2.profile(self._profile)
 
             q1 = profile1.get_key("Q")
             z1 = profile1.get_key("Z")
@@ -897,8 +897,7 @@ class CustomPlot(PamhyrPlot):
         z_min = profile.geometry.z_min()
         if self._current_res_id < 2:
             if reach.has_sediment():
-                ts_z_min = self.get_ts_zmin(
+                ts_z_min = self.get_ts_zmin(self._profile, res_id)
-                    self._current_profile_id, self._current_res_id)
             else:
                 ts_z_min = list(
                     map(
@@ -915,8 +914,8 @@ class CustomPlot(PamhyrPlot):
 
             if self._current_res_id == 2:
                 if reach.has_sediment():
-                    ts_z_min1 = self.get_ts_zmin(self._current_profile_id1, 0)
+                    ts_z_min1 = self.get_ts_zmin(self._profile1, 0)
-                    ts_z_min2 = self.get_ts_zmin(self._current_profile_id2, 1)
+                    ts_z_min2 = self.get_ts_zmin(self._profile2, 1)
                     ts_z_min = list(
                         map(
                             lambda x, y: x - y,
@@ -1103,16 +1102,16 @@ class CustomPlot(PamhyrPlot):
     def _redraw_time(self):
 
         results = self.data[self._current_res_id]
-        reach = results.river.reach(self._current_reach)
+        reach = results.river.reach(self._reach)
-        profile = reach.profile(self._current_profile_id)
+        profile = reach.profile(self._profile)
         ts = list(results.get("timestamps"))
         ts.sort()
 
         if self._current_res_id == 2:  # compare results
-            reach1 = self.data[0].river.reach(self._current_reach)
+            reach1 = self.data[0].river.reach(self._reach)
-            reach2 = self.data[1].river.reach(self._current_reach)
+            reach2 = self.data[1].river.reach(self._reach)
-            profile1 = reach1.profile(self._current_profile_id)
+            profile1 = reach1.profile(self._profile)
-            profile2 = reach2.profile(self._current_profile_id)
+            profile2 = reach2.profile(self._profile)
 
             q1 = profile1.get_key("Q")
             z1 = profile1.get_key("Z")
@@ -1127,8 +1126,7 @@ class CustomPlot(PamhyrPlot):
         v = profile.get_key("V")
         if self._current_res_id < 2:
             if reach.has_sediment():
-                ts_z_min = self.get_ts_zmin(
+                ts_z_min = self.get_ts_zmin(self._profile)
-                    self._current_profile_id, self._current_res_id)
             else:
                 z_min = profile.geometry.z_min()
                 ts_z_min = list(
@@ -1140,8 +1138,8 @@ class CustomPlot(PamhyrPlot):
         if "bed_elevation" in self._y:
             if self._current_res_id == 2:
                 if reach.has_sediment():
-                    ts_z_min1 = self.get_ts_zmin(self._current_profile_id1, 0)
+                    ts_z_min1 = self.get_ts_zmin(self._profile1, 0)
-                    ts_z_min2 = self.get_ts_zmin(self._current_profile_id2, 1)
+                    ts_z_min2 = self.get_ts_zmin(self._profile2, 1)
                     ts_z_min = list(
                         map(
                             lambda x, y: x - y,
@@ -1348,12 +1346,11 @@ class CustomPlot(PamhyrPlot):
         elif self._x == "time":
             self._draw_time()
         if self._x == "rk":
-            reach = self.data[self._current_res_id].river.reach(
+            reach = self.data[self._current_res_id].river.reach(self._reach)
-                self._current_reach)
+            profile = reach.profile(self._profile)
-            profile = reach.profile(self._current_profile_id)
             x = profile.rk
         elif self._x == "time":
-            x = self._current_timestamp
+            x = self._timestamp
 
         self._current, = self.canvas.axes.plot(
             [x, x],
@@ -1376,13 +1373,13 @@ class CustomPlot(PamhyrPlot):
         return
 
     def set_reach(self, reach_id):
-        self._current_reach = reach_id
+        self._reach = reach_id
-        self._current_profile_id = 0
+        self._profile = 0
 
         self.draw()
 
     def set_profile(self, profile_id):
-        self._current_profile_id = profile_id
+        self._profile = profile_id
 
         if self._x != "rk":
             self.update()
@@ -1394,28 +1391,20 @@ class CustomPlot(PamhyrPlot):
         self.draw()
 
     def set_timestamp(self, timestamp):
-        self._current_timestamp = timestamp
+        self._timestamp = timestamp
 
         if self._x != "time":
             self.update()
         else:
             self.draw_current()
 
-    def update_all(self):
-        self._current_reach_id = self._parent._get_current_reach()
-        self._current_profile_id = self._parent._get_current_profile()
-        self._current_res_id = self._parent._get_current_results()[0]
-        self._current_timestamp = self._parent._get_current_timestamp()
-        self.draw()
-
     def draw_current(self):
         if self._x == "rk":
-            reach = self.data[self._current_res_id].river.reach(
+            reach = self.data[self._current_res_id].river.reach(self._reach)
-                self._current_reach)
+            profile = reach.profile(self._profile)
-            profile = reach.profile(self._current_profile_id)
             x = profile.rk
         elif self._x == "time":
-            x = self._current_timestamp
+            x = self._timestamp
         self._current.set_data([x, x], self.canvas.axes.get_ylim())
         self.canvas.draw_idle()
 

src/View/Results/PlotAC.py

@@ -39,7 +39,6 @@ class PlotAC(PamhyrPlot):
             parent=parent
         )
 
-        self._parent = parent
         self._current_reach_id = reach_id
         self._current_profile_id = profile_id
         self._current_res_id = res_id[0]
@@ -243,14 +242,6 @@ class PlotAC(PamhyrPlot):
 
         self.update_idle()
 
-    def update_all(self):
-        self._current_reach_id = self._parent._get_current_reach()
-        self._current_profile_id = self._parent._get_current_profile()
-        self._current_res_id = self._parent._get_current_results()[0]
-        self._current_timestamp = self._parent._get_current_timestamp()
-        self._init = False
-        self.update()
-
     def update_gl(self):
         for a in self.annotation:
             a.remove()

src/View/Results/PlotH.py

@@ -47,7 +47,6 @@ class PlotH(PamhyrPlot):
 
         self._mode = "time"
 
-        self._parent = parent
         self._current_reach_id = reach_id
         self._current_profile_id = profile_id
         self._current_res_id = res_id
@@ -217,16 +216,20 @@ class PlotH(PamhyrPlot):
         if not self._init:
             self.draw()
 
+        self.update_data()
         self.update_current()
         self.update_idle()
 
-    def update_all(self):
+    def update_data(self):
-        self._current_reach_id = self._parent._get_current_reach()
+        for res, res_id in enumerate(self._current_res_id):
-        self._current_profile_id = self._parent._get_current_profiles_list()
+            results = self.results[res_id]
-        self._current_res_id = self._parent._get_current_results()
+            reach = results.river.reach(self._current_reach_id)
-        self._current_timestamp = self._parent._get_current_timestamp()
+            profile = reach.profile(self._current_profile_id)
-        self._init = False
+
-        self.update()
+            x = self._timestamps
+            y = profile.get_key("Q")
+
+            self._line[res].set_data(x, y)
 
     def update_current(self):
         y = self._current.get_ydata()

src/View/Results/PlotRKC.py

@@ -42,7 +42,6 @@ class PlotRKC(PamhyrPlot):
             parent=parent
         )
 
-        self._parent = parent
         self._current_reach_id = reach_id
         self._current_profile_id = profile_id
         self._current_res_id = res_id[0]
@@ -344,14 +343,6 @@ class PlotRKC(PamhyrPlot):
 
         self.update_idle()
 
-    def update_all(self):
-        self._current_reach_id = self._parent._get_current_reach()
-        self._current_profile_id = self._parent._get_current_profile()
-        self._current_res_id = self._parent._get_current_results()[0]
-        self._current_timestamp = self._parent._get_current_timestamp()
-        self._init = False
-        self.update()
-
     def update_water_elevation(self):
         results = self.results[self._current_res_id]
         reach = results.river.reach(self._current_reach_id)

src/View/Results/PlotXY.py

@@ -68,7 +68,6 @@ class PlotXY(PamhyrPlot):
 
         self._plot_img = {}
 
-        self._parent = parent
         self._timestamps = parent._timestamps
         self._current_timestamp = max(self._timestamps)
         self._current_reach_id = reach_id
@@ -387,14 +386,6 @@ class PlotXY(PamhyrPlot):
 
         self.update_idle()
 
-    def update_all(self):
-        self._current_reach_id = self._parent._get_current_reach()
-        self._current_profile_id = self._parent._get_current_profile()
-        self._current_res_id = self._parent._get_current_results()[0]
-        self._current_timestamp = self._parent._get_current_timestamp()
-        self._init = False
-        self.update()
-
     def update_profile(self):
         results = self.results[self._current_res_id]
         reach = results.river.reach(self._current_reach_id)

src/View/Results/Window.py

@@ -457,69 +457,49 @@ class ResultsWindow(PamhyrWindow):
                solver_id=None,
                timestamp=None):
 
-        tab_widget = self.find(QTabWidget, f"tabWidget")
-        tab_index = tab_widget.currentIndex()
-        name = tab_widget.tabText(tab_index)
-
         if reach_id is not None:
-            if tab_index == 1:
+            self.plot_xy.set_reach(reach_id)
-                self.plot_xy.set_reach(reach_id)
+            self.plot_ac.set_reach(reach_id)
-                self.plot_ac.set_reach(reach_id)
+            self.plot_rkc.set_reach(reach_id)
-                self.plot_rkc.set_reach(reach_id)
+            self.plot_h.set_reach(reach_id)
-            elif tab_index == 2:
-                self.plot_h.set_reach(reach_id)
-            elif tab_index > 2:
-                self._additional_plot[name].set_reach(reach_id)
 
-            # for plot in self._additional_plot:
+            for plot in self._additional_plot:
-                # self._additional_plot[plot].set_reach(reach_id)
+                self._additional_plot[plot].set_reach(reach_id)
 
             self.update_table_selection_reach(reach_id)
             self.update_table_selection_profile(0)
 
         if profile_id is not None:
-            if tab_index == 1:
+            self.plot_xy.set_profile(profile_id[0])
-                self.plot_xy.set_profile(profile_id[0])
+            self.plot_ac.set_profile(profile_id[0])
-                self.plot_ac.set_profile(profile_id[0])
+            self.plot_rkc.set_profile(profile_id[0])
-                self.plot_rkc.set_profile(profile_id[0])
+            self.plot_h.set_profile(profile_id)
-            elif tab_index == 2:
-                self.plot_h.set_profile(profile_id)
-            elif tab_widget.currentIndex() > 2:
-                self._additional_plot[name].set_profile(profile_id[0])
 
-            # for plot in self._additional_plot:
+            for plot in self._additional_plot:
-                # self._additional_plot[plot].set_profile(profile_id[0])
+                self._additional_plot[plot].set_profile(profile_id[0])
 
             tab_widget = self.find(QTabWidget, f"tabWidget")
             if tab_widget.currentIndex() != 2:
                 self.update_table_selection_profile(profile_id[0])
 
         if solver_id is not None:
-            if tab_index == 1:
+            self._current_results = solver_id
-                self._current_results = solver_id
+            self.plot_xy.set_result(solver_id)
-                self.plot_xy.set_result(solver_id)
+            self.plot_ac.set_result(solver_id)
-                self.plot_ac.set_result(solver_id)
+            self.plot_rkc.set_result(solver_id)
-                self.plot_rkc.set_result(solver_id)
+            self.plot_h.set_result(solver_id)
-            elif tab_index == 2:
-                self.plot_h.set_result(solver_id)
-            elif tab_widget.currentIndex() > 2:
-                self._additional_plot[name].set_result(solver_id)
 
-            # for plot in self._additional_plot:
+            for plot in self._additional_plot:
-                # self._additional_plot[plot].set_result(solver_id)
+                self._additional_plot[plot].set_result(solver_id)
 
         if timestamp is not None:
             self.plot_xy.set_timestamp(timestamp)
             self.plot_ac.set_timestamp(timestamp)
             self.plot_rkc.set_timestamp(timestamp)
-            if tab_index == 2:
+            self.plot_h.set_timestamp(timestamp)
-                self.plot_h.set_timestamp(timestamp)
 
-            if tab_widget.currentIndex() > 2:
+            for plot in self._additional_plot:
-                self._additional_plot[name].set_timestamp(timestamp)
+                self._additional_plot[plot].set_timestamp(timestamp)
-
-            # for plot in self._additional_plot:
-                # self._additional_plot[plot].set_timestamp(timestamp)
 
             self._table["raw_data"].timestamp = timestamp
 
@@ -554,14 +534,6 @@ class ResultsWindow(PamhyrWindow):
             self._slider_time.value()
         ]
 
-    def _get_current_results(self):
-        table = self.find(QTableView, f"tableView_solver")
-        indexes = table.selectedIndexes()
-        if len(indexes) == 0:
-            return
-
-        return [i.row() for i in indexes]
-
     def _set_current_reach(self):
         table = self.find(QTableView, f"tableView_reach")
         indexes = table.selectedIndexes()
@@ -1223,17 +1195,6 @@ class ResultsWindow(PamhyrWindow):
                 # unselect all profiles but the first one
                 profile_id = self._get_current_profile()
                 self.update_table_selection_profile(profile_id)
-        tab_widget = self.find(QTabWidget, f"tabWidget")
-        tab_index = tab_widget.currentIndex()
-        name = tab_widget.tabText(tab_index)
-        if tab_index == 1:
-            self.plot_xy.update_all()
-            self.plot_ac.update_all()
-            self.plot_rkc.update_all()
-        elif tab_index == 2:
-            self.plot_h.update_all()
-        elif tab_index > 2:
-            self._additional_plot[name].update_all()
 
     def import_geotiff(self):
         options = QFileDialog.Options()