Skip to content
GitLab
Commit 12814f82 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

geometry: Rename graphic to plot.

parent 76e6c6c3
master 0.0.9 InitialConditions adists_new adists_num adists_release mesh results scenarios setup.py terraz_dev v1.2.0rc2 v1.0.2 v1.0.1 v1.0.0 v0.0.8 v0.0.8-patch-2 v0.0.8-patch-1 v0.0.7 v0.0.6 v0.0.5 v0.0.4 v0.0.3 v0.0.2 v0.0.1 v0.0.0 journees-modelisation-2024 journees-modelisation-2024-5 journees-modelisation-2024-4 journees-modelisation-2024-3 journees-modelisation-2024-2 journees-modelisation-2024-1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 49 additions and 49 deletions
+49 -49
src/View/Geometry/GeometryWindow.py
+ 49
− 49
View file @ 12814f82
...@@ -63,9 +63,9 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -63,9 +63,9 @@ class GeometryWindow(QMainWindow, WindowToolKit):
def setup_plots(self): def setup_plots(self):
if self._reach.number_profiles != 0: if self._reach.number_profiles != 0:
self.graphic_1() self.plot_xy()
self.graphic_2() self.plot_kpc()
self.graphic_3() self.plot_ac()
def setup_connections(self): def setup_connections(self):
self.ui.btn_open.clicked.connect(self.open_file_dialog) self.ui.btn_open.clicked.connect(self.open_file_dialog)
...@@ -89,14 +89,14 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -89,14 +89,14 @@ class GeometryWindow(QMainWindow, WindowToolKit):
.connect(self.select_current_profile) .connect(self.select_current_profile)
# Update plot when profile data change # Update plot when profile data change
# self._tablemodel.dataChanged.connect(self.update_graphic_1) # self._tablemodel.dataChanged.connect(self.update_plot_xy)
# self._tablemodel.dataChanged.connect(self.update_graphic_2) # self._tablemodel.dataChanged.connect(self.update_plot_kpc)
# self.tableView.selectionModel()\ # self.tableView.selectionModel()\
# .selectionChanged\ # .selectionChanged\
# .connect(self.update_graphic_1) # .connect(self.update_plot_xy)
# self.tableView.selectionModel()\ # self.tableView.selectionModel()\
# .selectionChanged\ # .selectionChanged\
# .connect(self.update_graphic_2) # .connect(self.update_plot_kpc)
def open_file_dialog(self): def open_file_dialog(self):
options = QFileDialog.Options() options = QFileDialog.Options()
...@@ -124,9 +124,9 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -124,9 +124,9 @@ class GeometryWindow(QMainWindow, WindowToolKit):
self._tablemodel.layoutChanged.emit() self._tablemodel.layoutChanged.emit()
self.update_profile_windows() self.update_profile_windows()
self.graphic_1() self.plot_xy()
self.graphic_2() self.plot_kpc()
self.graphic_3() self.plot_ac()
def messagebox_profile_editing(self): def messagebox_profile_editing(self):
msg_box = QtWidgets.QMessageBox() msg_box = QtWidgets.QMessageBox()
...@@ -223,56 +223,56 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -223,56 +223,56 @@ class GeometryWindow(QMainWindow, WindowToolKit):
self.list_second_window = [] self.list_second_window = []
self.list_row = [] self.list_row = []
def graphic_1(self): def plot_xy(self):
self.tableView.model().blockSignals(True) self.tableView.model().blockSignals(True)
self.plot_xy = PlotXY( self._plot_xy = PlotXY(
canvas = self.ui.canvas_1, canvas = self.ui.canvas_1,
data = self._reach, data = self._reach,
toolbar = self.ui.toolbar_1 toolbar = self.ui.toolbar_1
) )
self.plot_xy.draw() self._plot_xy.draw()
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
def update_graphic_1(self): def update_plot_xy(self):
self.tableView.model().blockSignals(True) self.tableView.model().blockSignals(True)
self.plot_xy.update() self._plot_xy.update()
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
def graphic_2(self): def plot_kpc(self):
self.tableView.model().blockSignals(True) self.tableView.model().blockSignals(True)
self.plot_kpc = PlotKPC( self._plot_kpc = PlotKPC(
canvas = self.ui.canvas_2, canvas = self.ui.canvas_2,
data = self._reach, data = self._reach,
toolbar = self.ui.toolbar_2 toolbar = self.ui.toolbar_2
) )
self.plot_kpc.draw() self._plot_kpc.draw()
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
def update_graphic_2(self): def update_plot_kpc(self):
self.tableView.model().blockSignals(True) self.tableView.model().blockSignals(True)
self.plot_kpc.update() self._plot_kpc.update()
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
def graphic_3(self): def plot_ac(self):
self.tableView.model().blockSignals(True) self.tableView.model().blockSignals(True)
self.plot_ac = PlotAC( self._plot_ac = PlotAC(
canvas = self.ui.canvas_3, canvas = self.ui.canvas_3,
data = self._reach, data = self._reach,
toolbar = self.ui.toolbar_3, toolbar = self.ui.toolbar_3,
plot_xy = self.plot_xy plot_xy = self._plot_xy
) )
self.plot_ac.draw() self._plot_ac.draw()
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
def update_graphic_3(self, ind: int): def update_plot_ac(self, ind: int):
self.tableView.model().blockSignals(True) self.tableView.model().blockSignals(True)
self.plot_ac.update(ind=ind) self._plot_ac.update(ind=ind)
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
def get_station(self, ind: int): def get_station(self, ind: int):
...@@ -281,14 +281,14 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -281,14 +281,14 @@ class GeometryWindow(QMainWindow, WindowToolKit):
def get_elevation(self, ind: int): def get_elevation(self, ind: int):
return self._reach.profile(ind).z() return self._reach.profile(ind).z()
def select_plot_graphic_1(self, ind: int): def select_plot_plot_xy(self, ind: int):
self.tableView.model().blockSignals(True) self.tableView.model().blockSignals(True)
self.plot_xy.update(ind=ind) self._plot_xy.update(ind=ind)
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
def select_plot_graphic_2(self, ind: int): def select_plot_plot_kpc(self, ind: int):
self.tableView.model().blockSignals(True) self.tableView.model().blockSignals(True)
self.plot_kpc.update(ind=ind) self._plot_kpc.update(ind=ind)
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
...@@ -313,14 +313,14 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -313,14 +313,14 @@ class GeometryWindow(QMainWindow, WindowToolKit):
row = self.index_selected_row() row = self.index_selected_row()
self.ui.verticalSlider.setValue(row) self.ui.verticalSlider.setValue(row)
self.select_plot_graphic_1(row) self.select_plot_plot_xy(row)
self.select_plot_graphic_2(row) self.select_plot_plot_kpc(row)
self.plot_xy.update(ind = row) self._plot_xy.update(ind = row)
self.plot_kpc.update(ind = row) self._plot_kpc.update(ind = row)
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
self.update_graphic_3(row) self.update_plot_ac(row)
self.ui.canvas_2.figure.canvas.draw_idle() self.ui.canvas_2.figure.canvas.draw_idle()
def changed_slider_value(self): def changed_slider_value(self):
...@@ -340,8 +340,8 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -340,8 +340,8 @@ class GeometryWindow(QMainWindow, WindowToolKit):
f"{slider_value + 1}" f"{slider_value + 1}"
) )
self.select_plot_graphic_1(slider_value) self.select_plot_plot_xy(slider_value)
self.select_plot_graphic_2(slider_value) self.select_plot_plot_kpc(slider_value)
self.select_row_profile_slider(slider_value) self.select_row_profile_slider(slider_value)
self.tableView.model().blockSignals(False) self.tableView.model().blockSignals(False)
...@@ -362,8 +362,8 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -362,8 +362,8 @@ class GeometryWindow(QMainWindow, WindowToolKit):
self._tablemodel.insertRows(row + 1, 1) self._tablemodel.insertRows(row + 1, 1)
if self.filename is not None: if self.filename is not None:
self.graphic_1() self.plot_xy()
self.graphic_2() self.plot_kpc()
self.select_current_profile() self.select_current_profile()
def delete_row(self): def delete_row(self):
...@@ -374,10 +374,10 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -374,10 +374,10 @@ class GeometryWindow(QMainWindow, WindowToolKit):
if len(rows) > 0: if len(rows) > 0:
self._tablemodel.remove_rows(rows) self._tablemodel.remove_rows(rows)
self.update_graphic_1() self.update_plot_xy()
self.select_current_profile() self.select_current_profile()
self.graphic_2() self.plot_kpc()
self.changed_slider_value() self.changed_slider_value()
...@@ -392,8 +392,8 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -392,8 +392,8 @@ class GeometryWindow(QMainWindow, WindowToolKit):
self.select_current_profile() self.select_current_profile()
self.changed_slider_value() self.changed_slider_value()
self.update_graphic_2() self.update_plot_kpc()
self.update_graphic_3(self.index_selected_row()) self.update_plot_ac(self.index_selected_row())
def sort_descending(self): def sort_descending(self):
self._tablemodel.sort_profiles(False) self._tablemodel.sort_profiles(False)
...@@ -401,15 +401,15 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -401,15 +401,15 @@ class GeometryWindow(QMainWindow, WindowToolKit):
self.select_current_profile() self.select_current_profile()
self.changed_slider_value() self.changed_slider_value()
self.update_graphic_2() self.update_plot_kpc()
self.update_graphic_3(self.index_selected_row()) self.update_plot_ac(self.index_selected_row())
def move_row_down(self): def move_row_down(self):
row = self.index_selected_row() row = self.index_selected_row()
if row < self._tablemodel.rowCount() - 1: if row < self._tablemodel.rowCount() - 1:
self._tablemodel.moveRowDown(row) self._tablemodel.moveRowDown(row)
self.update_graphic_3(row + 1) self.update_plot_ac(row + 1)
self.ui.canvas_3.axes.relim() self.ui.canvas_3.axes.relim()
self.ui.canvas_3.axes.autoscale_view() self.ui.canvas_3.axes.autoscale_view()
...@@ -425,7 +425,7 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -425,7 +425,7 @@ class GeometryWindow(QMainWindow, WindowToolKit):
self.select_before_plot_selected_2(self._tablemodel.rowCount() - 2) self.select_before_plot_selected_2(self._tablemodel.rowCount() - 2)
self.after_plot_selected_2.set_visible(False) self.after_plot_selected_2.set_visible(False)
self.update_graphic_2() self.update_plot_kpc()
def move_row_up(self): def move_row_up(self):
row = self.index_selected_row() row = self.index_selected_row()
...@@ -451,8 +451,8 @@ class GeometryWindow(QMainWindow, WindowToolKit): ...@@ -451,8 +451,8 @@ class GeometryWindow(QMainWindow, WindowToolKit):
self.select_before_plot_selected_2(row - 2) self.select_before_plot_selected_2(row - 2)
self.select_after_plot_selected_2(row) self.select_after_plot_selected_2(row)
self.update_graphic_2() self.update_plot_kpc()
self.update_graphic_3(row - 1) self.update_plot_ac(row - 1)
self.ui.canvas_3.axes.relim() self.ui.canvas_3.axes.relim()
self.ui.canvas_3.axes.autoscale_view() self.ui.canvas_3.axes.autoscale_view()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment