From f745dce04ee811fe6adef7b9a25a9c4eb4462112 Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Tue, 14 May 2024 15:14:29 +0200 Subject: [PATCH 1/3] debug --- src/View/Geometry/MeshingDialog.py | 14 -------------- src/View/Geometry/Window.py | 2 -- 2 files changed, 16 deletions(-) diff --git a/src/View/Geometry/MeshingDialog.py b/src/View/Geometry/MeshingDialog.py index 974aa187..852c272a 100644 --- a/src/View/Geometry/MeshingDialog.py +++ b/src/View/Geometry/MeshingDialog.py @@ -125,14 +125,6 @@ class MeshingDialog(PamhyrDialog): def lplan(self): return self._lplan - @property - def origin(self): - return self._origin - - @property - def lm(self): - return int(self._lm) - @property def linear(self): return self._linear @@ -165,15 +157,9 @@ class MeshingDialog(PamhyrDialog): self._begin_cs = self.profiles.index(p1) self._end_cs = self.profiles.index(p2) - origin = self.get_combobox_text("comboBox_origin") - self._origin = self.profiles.index(origin) - self._begin_dir = self.get_combobox_text("comboBox_begin_gl") self._end_dir = self.get_combobox_text("comboBox_end_gl") - r_lm_dict = self._trad.get_dict("r_lm_dict") - self._lm = r_lm_dict[self.get_combobox_text("comboBox_lm")] - super().accept() def reject(self): diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py index 5e13a1dc..bf9079f2 100644 --- a/src/View/Geometry/Window.py +++ b/src/View/Geometry/Window.py @@ -298,10 +298,8 @@ class GeometryWindow(PamhyrWindow): data = { "step": dlg.space_step, "limites": [dlg.begin_cs, dlg.end_cs], - "origin": dlg.origin, "directrices": [dlg.begin_dir, dlg.end_dir], "lplan": dlg.lplan, - "lm": dlg.lm, "linear": dlg.linear, } self._edit_meshing(data) From 78e361d48691dcbb11c1eea3ffc3c1da2b5d3a61 Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Thu, 16 May 2024 13:01:03 +0200 Subject: [PATCH 2/3] debug issue #57 --- src/View/Geometry/PlotAC.py | 19 +++++++++++++++++++ src/View/Geometry/Window.py | 23 ++++++++++++++--------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/View/Geometry/PlotAC.py b/src/View/Geometry/PlotAC.py index cccffe24..a8892814 100644 --- a/src/View/Geometry/PlotAC.py +++ b/src/View/Geometry/PlotAC.py @@ -82,12 +82,14 @@ class PlotAC(PamhyrPlot): label=self.label_previous_plot_selected, lw=1.5, linestyle='--', color=self.color_plot_previous ) + #self.previous_plot_selected.set_visible(False) self.plot_selected, = self.canvas.axes.plot( station, elevation, label=self.label_plot_selected, color=self.color_plot_current, lw=1.5 ) + #self.plot_selected.set_visible(False) next_id = profile_id + 1 station_next = self.data.profile(next_id).get_station() @@ -98,6 +100,8 @@ class PlotAC(PamhyrPlot): label=self.label_next_plot_selected, color=self.color_plot_next, lw=1.6, linestyle='--' ) + #self.next_plot_selected.set_visible(False) + self.canvas.axes.set_visible(False) def draw_gl(self): if self._current_data_update: @@ -106,6 +110,7 @@ class PlotAC(PamhyrPlot): profile_id = 0 profile = self.data.profile(profile_id) + if profile == None: return station = profile.get_station() elevation = profile.z() gl = profile.names() @@ -160,6 +165,9 @@ class PlotAC(PamhyrPlot): self.draw() return + if self.data is None: + return + self.update_current() self.update_gl() @@ -171,6 +179,10 @@ class PlotAC(PamhyrPlot): previous_id = profile_id - 1 next_id = profile_id + 1 + self.previous_plot_selected.set_visible(False) + self.plot_selected.set_visible(False) + self.next_plot_selected.set_visible(False) + self.previous_plot_selected.set_data([], []) self.plot_selected.set_data([], []) self.next_plot_selected.set_data([], []) @@ -180,18 +192,25 @@ class PlotAC(PamhyrPlot): self.data.profile(previous_id).get_station(), self.data.profile(previous_id).z() ) + self.previous_plot_selected.set_visible(True) + #self.canvas.axes.legend() if 0 <= profile_id < self.data.number_profiles: self.plot_selected.set_data( self.data.profile(profile_id).get_station(), self.data.profile(profile_id).z() ) + self.plot_selected.set_visible(True) + #self.canvas.axes.legend() if 0 <= next_id < self.data.number_profiles: self.next_plot_selected.set_data( self.data.profile(next_id).get_station(), self.data.profile(next_id).z() ) + self.next_plot_selected.set_visible(True) + #self.canvas.axes.legend() + self.canvas.axes.set_visible(True) def update_full(self): self.draw() diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py index bf9079f2..b624aa1c 100644 --- a/src/View/Geometry/Window.py +++ b/src/View/Geometry/Window.py @@ -157,6 +157,7 @@ class GeometryWindow(PamhyrWindow): def _compute_status_label(self): row = self.index_selected_row() + if row == None: return profile = self._reach.profile(row) name = profile.name + " " + str(profile.kp) @@ -402,7 +403,7 @@ class GeometryWindow(PamhyrWindow): def update_plot_ac(self, ind: int): self.tableView.model().blockSignals(True) - self._plot_ac.current = ind + #self._plot_ac.current = ind self._plot_ac.update() self.tableView.model().blockSignals(False) @@ -446,10 +447,8 @@ class GeometryWindow(PamhyrWindow): def select_current_profile(self): self.tableView.model().blockSignals(True) - - if len(self.tableView.selectedIndexes()) > 0: - row = self.index_selected_row() - + row = self.index_selected_row() + if row != None: self.find(QSlider, "verticalSlider").setValue(row) self.select_plot_xy(row) self.select_plot_kpc(row) @@ -508,10 +507,14 @@ class GeometryWindow(PamhyrWindow): self._table.delete(rows) def index_selected_row(self): - return self.tableView\ - .selectionModel()\ - .selectedRows()[0]\ - .row() + r = self.tableView\ + .selectionModel()\ + .selectedRows() + + if len(r) > 0: + return r[0].row() + else: + return None def sort_ascending(self): self._table.sort_profiles(False) @@ -526,11 +529,13 @@ class GeometryWindow(PamhyrWindow): def move_up(self): row = self.index_selected_row() + if row == None: return self._table.move_up(row) self.select_current_profile() def move_down(self): row = self.index_selected_row() + if row == None: return self._table.move_down(row) self.select_current_profile() From c366a1a4e76700985cfe9f428558450480304144 Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Thu, 16 May 2024 18:06:53 +0200 Subject: [PATCH 3/3] increase precision of input sediment diameter --- src/View/ui/Widgets/d50sigma.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/View/ui/Widgets/d50sigma.ui b/src/View/ui/Widgets/d50sigma.ui index d1af908b..5518cbcd 100644 --- a/src/View/ui/Widgets/d50sigma.ui +++ b/src/View/ui/Widgets/d50sigma.ui @@ -22,7 +22,7 @@ Qt::Horizontal - + @@ -37,13 +37,13 @@ - 4 + 8 - +