From af4832a13446f9d048a4b79738b730492013b406 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 12 Apr 2023 17:14:54 +0200
Subject: [PATCH] geometry: Working table display.
---
src/Model/Geometry/Reach.py | 15 +--------------
src/View/Geometry/GeometryWindow.py | 12 ++++++------
2 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/Model/Geometry/Reach.py b/src/Model/Geometry/Reach.py
index 5177d041..3b696314 100644
--- a/src/Model/Geometry/Reach.py
+++ b/src/Model/Geometry/Reach.py
@@ -34,7 +34,7 @@ class Reach:
Returns:
The profile at index i
"""
- if i in self._profiles:
+ if i < len(self._profiles):
return self._profiles[i]
return None
@@ -62,19 +62,6 @@ class Reach:
"""
return self._profiles
- def get_profile_i(self, i: int) -> Profile:
- """
- Args:
- i: Index
-
- Returns:
- The profile at index i.
- """
- try:
- return self._profiles[i]
- except IndexError:
- raise IndexError(f"Invalid profile index: {i}")
-
def add_profile(self, index):
"""Add a new profile at the end of profiles list
diff --git a/src/View/Geometry/GeometryWindow.py b/src/View/Geometry/GeometryWindow.py
index 3e428591..ad225f07 100644
--- a/src/View/Geometry/GeometryWindow.py
+++ b/src/View/Geometry/GeometryWindow.py
@@ -249,16 +249,16 @@ class GeometryWindow(QMainWindow, WindowToolKit):
)
self.plot_selected_1, = self.ui.canvas_1.axes.plot(
- self._reach.get_profile_i(0).x(),
- self._reach.get_profile_i(0).y(),
+ self._reach.profile(0).x(),
+ self._reach.profile(0).y(),
lw=1., markersize=3,
marker='+', color="b"
)
self.plot_selected_1.set_visible(False)
self.before_plot_selected_1, = self.ui.canvas_1.axes.plot(
- self._reach.get_profile_i(0).x(),
- self._reach.get_profile_i(0).y(),
+ self._reach.profile(0).x(),
+ self._reach.profile(0).y(),
lw=1., markersize=3,
marker='+', color="k", linestyle="--"
)
@@ -266,8 +266,8 @@ class GeometryWindow(QMainWindow, WindowToolKit):
self.before_plot_selected_1.set_visible(False)
self.after_plot_selected_1, = self.ui.canvas_1.axes.plot(
- self._reach.get_profile_i(0).x(),
- self._reach.get_profile_i(0).y(),
+ self._reach.profile(0).x(),
+ self._reach.profile(0).y(),
lw=1., markersize=3,
marker='+', color="m", linestyle='--'
)
--
GitLab