diff --git a/src/Model/HydraulicStructures/HydraulicStructures.py b/src/Model/HydraulicStructures/HydraulicStructures.py index 37be3a32..83e1012f 100644 --- a/src/Model/HydraulicStructures/HydraulicStructures.py +++ b/src/Model/HydraulicStructures/HydraulicStructures.py @@ -355,13 +355,15 @@ class HydraulicStructure(SQLSubModel): def input_rk(self): if self._input_section is None: return None - return self._input_section.rk + + return self._input_section @property def output_rk(self): if self._output_section is None: return None - return self._output_section.rk + + return self._output_section @property def input_section(self): diff --git a/src/View/Geometry/PlotRKZ.py b/src/View/Geometry/PlotRKZ.py index ca374772..c222fdda 100644 --- a/src/View/Geometry/PlotRKZ.py +++ b/src/View/Geometry/PlotRKZ.py @@ -299,7 +299,7 @@ class PlotRKZ(PamhyrPlot): for hs in lhs: if not hs.enabled: continue - x = hs.input_rk + x = hs.input_section.rk if x is not None: z_min = reach.get_z_min() z_max = reach.get_z_max() diff --git a/src/View/HydraulicStructures/PlotRKC.py b/src/View/HydraulicStructures/PlotRKC.py index 327a7344..8ccdf148 100644 --- a/src/View/HydraulicStructures/PlotRKC.py +++ b/src/View/HydraulicStructures/PlotRKC.py @@ -142,7 +142,7 @@ class PlotRKC(PamhyrPlot): hs_color.append("red") else: hs_color.append("darkgrey") - x = hs.input_rk + x = hs.input_section.rk if x is not None: a = self.canvas.axes.annotate( " > " + hs.name, diff --git a/src/View/HydraulicStructures/Table.py b/src/View/HydraulicStructures/Table.py index b58bd34d..99ce3176 100644 --- a/src/View/HydraulicStructures/Table.py +++ b/src/View/HydraulicStructures/Table.py @@ -103,7 +103,7 @@ class ComboBoxDelegate(QItemDelegate): ) ) - value = profiles[0].rk if len(profiles) > 0 else None + value = profiles[0] if len(profiles) > 0 else None else: value = text diff --git a/src/View/HydraulicStructures/Window.py b/src/View/HydraulicStructures/Window.py index 1bb57db5..c7bc0cf4 100644 --- a/src/View/HydraulicStructures/Window.py +++ b/src/View/HydraulicStructures/Window.py @@ -297,11 +297,11 @@ class HydraulicStructuresWindow(PamhyrWindow): self.plot_rkc.set_reach(reach) self.plot_ac.set_reach(reach) - profile_rk = self._hs_lst.get(rows[0]).input_rk - if profile_rk is not None: + profile = self._hs_lst.get(rows[0]).input_section + if profile is not None: profiles = reach.reach\ .get_profiles_from_rk( - float(profile_rk) + float(profile.rk) ) if len(profiles) != 0 and profiles is not None: