diff --git a/src/View/BoundaryCondition/Edit/Window.py b/src/View/BoundaryCondition/Edit/Window.py index e1e6a27f..b4a18119 100644 --- a/src/View/BoundaryCondition/Edit/Window.py +++ b/src/View/BoundaryCondition/Edit/Window.py @@ -42,7 +42,7 @@ from PyQt5.QtWidgets import ( ) from View.Plot.MplCanvas import MplCanvas -from View.Plot.navigation_toolbar_2qt import PamHyrNavigationToolbar2QT +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar from View.BoundaryCondition.translate import long_types from View.BoundaryCondition.Edit.translate import table_headers @@ -178,7 +178,7 @@ class EditBoundaryConditionWindow(ASubMainWindow, ListedSubWindow): def setup_plot(self): self.canvas = MplCanvas(width=5, height=4, dpi=100) self.canvas.setObjectName("canvas") - self.toolbar = PamHyrNavigationToolbar2QT( + self.toolbar = PamhyrPlotToolbar( self.canvas, self ) self.verticalLayout.addWidget(self.toolbar) diff --git a/src/View/Geometry/Profile/mainwindow_ui_profile.py b/src/View/Geometry/Profile/mainwindow_ui_profile.py index 0b9443f8..a6844e55 100644 --- a/src/View/Geometry/Profile/mainwindow_ui_profile.py +++ b/src/View/Geometry/Profile/mainwindow_ui_profile.py @@ -25,7 +25,8 @@ from PyQt5.QtWidgets import ( QToolBar, ) -from View.Plot import MplCanvas, navigation_toolbar_2qt +from View.Plot import MplCanvas +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar file_path = os.path.abspath(os.path.dirname(__file__)) icon_path = f"{os.path.dirname(os.path.dirname(file_path))}/../View/ui/ressources/" @@ -197,7 +198,7 @@ class Ui_MainWindow(object): self.canvas = MplCanvas.MplCanvas(width=5, height=4, dpi=100) self.canvas.setObjectName("canvas") - self.my_toolbar = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT( + self.my_toolbar = PamhyrPlotToolbar( self.canvas, self.widget1 ) diff --git a/src/View/Geometry/mainwindow_ui_reach.py b/src/View/Geometry/mainwindow_ui_reach.py index 897b6987..f3bf0018 100644 --- a/src/View/Geometry/mainwindow_ui_reach.py +++ b/src/View/Geometry/mainwindow_ui_reach.py @@ -25,9 +25,9 @@ from PyQt5.QtWidgets import ( QAbstractItemView, QHeaderView, QToolBar, ) -from View.Plot import ( - MplCanvas, navigation_toolbar_2qt -) +from View.Plot import MplCanvas +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar + file_path = os.path.abspath(os.path.dirname(__file__)) icon_path = f"{os.path.dirname(os.path.dirname(file_path))}/View/ui/ressources/" @@ -190,7 +190,7 @@ class Ui_MainWindow(object): self.canvas_1 = MplCanvas.MplCanvas(width=5, height=4, dpi=100) self.canvas_1.setObjectName("canvas_1") - self.toolbar_1 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT( + self.toolbar_1 = PamhyrPlotToolbar( self.canvas_1, self.centralwidget, items = ["home", "zoom", "save", "iso", "back/forward", "move"] ) @@ -207,7 +207,7 @@ class Ui_MainWindow(object): self.canvas_2 = MplCanvas.MplCanvas(width=5, height=4, dpi=100) self.canvas_2.setObjectName("canvas_2") - self.toolbar_2 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT( + self.toolbar_2 = PamhyrPlotToolbar( self.canvas_2, self.centralwidget, items = ["home", "zoom", "save", "iso", "back/forward", "move"] ) @@ -223,7 +223,7 @@ class Ui_MainWindow(object): self.canvas_3 = MplCanvas.MplCanvas(width=5, height=4, dpi=100) self.canvas_3.setObjectName("canvas_3") - self.toolbar_3 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT( + self.toolbar_3 = PamhyrPlotToolbar( self.canvas_3, self.centralwidget, items = ["home", "zoom", "save", "iso", "back/forward", "move"] ) diff --git a/src/View/InitialConditions/Window.py b/src/View/InitialConditions/Window.py index 2d4e8077..2b1d6b54 100644 --- a/src/View/InitialConditions/Window.py +++ b/src/View/InitialConditions/Window.py @@ -49,7 +49,7 @@ from View.InitialConditions.UndoCommand import ( from View.InitialConditions.Table import TableModel, ComboBoxDelegate from View.Plot.MplCanvas import MplCanvas -from View.Plot.navigation_toolbar_2qt import PamHyrNavigationToolbar2QT +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar from View.InitialConditions.PlotDKP import PlotDKP from View.InitialConditions.PlotDischarge import PlotDischarge @@ -122,7 +122,7 @@ class InitialConditionsWindow(ASubMainWindow, ListedSubWindow): def setup_graph(self): self.canvas_1 = MplCanvas(width=5, height=4, dpi=100) self.canvas_1.setObjectName("canvas_1") - self.toolbar_1 = PamHyrNavigationToolbar2QT( + self.toolbar_1 = PamhyrPlotToolbar( self.canvas_1, self ) self.plot_layout_1 = self.find(QVBoxLayout, "verticalLayout_1") @@ -138,7 +138,7 @@ class InitialConditionsWindow(ASubMainWindow, ListedSubWindow): self.canvas_2 = MplCanvas(width=5, height=4, dpi=100) self.canvas_2.setObjectName("canvas_2") - self.toolbar_2 = PamHyrNavigationToolbar2QT( + self.toolbar_2 = PamhyrPlotToolbar( self.canvas_2, self ) self.plot_layout_2 = self.find(QVBoxLayout, "verticalLayout_2") diff --git a/src/View/LateralContribution/Edit/Window.py b/src/View/LateralContribution/Edit/Window.py index f91f99a3..4c6617b2 100644 --- a/src/View/LateralContribution/Edit/Window.py +++ b/src/View/LateralContribution/Edit/Window.py @@ -38,7 +38,7 @@ from PyQt5.QtWidgets import ( ) from View.Plot.MplCanvas import MplCanvas -from View.Plot.navigation_toolbar_2qt import PamHyrNavigationToolbar2QT +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar from View.LateralContribution.translate import long_types from View.LateralContribution.Edit.translate import table_headers @@ -118,7 +118,7 @@ class EditLateralContributionWindow(ASubMainWindow, ListedSubWindow): def setup_plot(self): self.canvas = MplCanvas(width=5, height=4, dpi=100) self.canvas.setObjectName("canvas") - self.toolbar = PamHyrNavigationToolbar2QT( + self.toolbar = PamhyrPlotToolbar( self.canvas, self ) self.verticalLayout.addWidget(self.toolbar) diff --git a/src/View/Plot/navigation_toolbar_2qt.py b/src/View/Plot/PamhyrToolbar.py similarity index 90% rename from src/View/Plot/navigation_toolbar_2qt.py rename to src/View/Plot/PamhyrToolbar.py index ec57078d..82ba57a2 100644 --- a/src/View/Plot/navigation_toolbar_2qt.py +++ b/src/View/Plot/PamhyrToolbar.py @@ -19,10 +19,12 @@ import os import logging import matplotlib as mpl + from matplotlib.backends import qt_compat +from matplotlib.backends.backend_qt5 import NavigationToolbar2QT + from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5.QtWidgets import QAction -from matplotlib.backends.backend_qt5 import NavigationToolbar2QT from PyQt5.QtCore import pyqtSignal, QSize _translate = QtCore.QCoreApplication.translate @@ -31,21 +33,21 @@ logger = logging.getLogger() file_path = os.path.abspath(os.path.dirname(__file__)) -class PamHyrNavigationToolbar2QT(NavigationToolbar2QT): +class PamhyrPlotToolbar(NavigationToolbar2QT): """ - Cette classe est une personnalisation de la toolbar (NavigationToolbar2QT). Elle permet l'internationnalisation et - l'ajout d'autres boutons à la toolbar initiale + MatPlotLib plot toolbar for Pamhyr """ isometric_signal = pyqtSignal(str) def __init__(self, canvas, parent, items = ["home", "move", "zoom", "save"]): - """ - Args: - canvas: canvas de matplotlib - parent: parent du canvas - """ - self.my_canvas = canvas + """PamhyrPlotToolbar + Args: + canvas: MatPlotLib canvas + parent: parent Qt object + items: Enables items (default: "home", "move", "zoom", "save") + """ + self._canvas = canvas self._items = items self.toolitems = [ (None, None, None, None), @@ -118,7 +120,7 @@ class PamHyrNavigationToolbar2QT(NavigationToolbar2QT): self.toolitems.append((None, None, None, None)) NavigationToolbar2QT.__init__(self, canvas, parent) - btn_size = QSize(30, 30) + btn_size = QSize(40, 28) actions = self.findChildren(QAction) for a, i in icons: @@ -161,18 +163,15 @@ class PamHyrNavigationToolbar2QT(NavigationToolbar2QT): QtWidgets.QMessageBox.Ok, QtWidgets.QMessageBox.NoButton ) - def cursor1(self): - logger.info("TODO: cursor1") - def isometric_view(self): - self.my_canvas.axes.axis("equal") - self.my_canvas.figure.canvas.draw_idle() + self._canvas.axes.axis("equal") + self._canvas.figure.canvas.draw_idle() self.isometric_signal[str].emit("vue iso") def non_isometric_view(self): - self.my_canvas.axes.axis("tight") - self.my_canvas.toolbar.update() - self.my_canvas.figure.canvas.draw_idle() + self._canvas.axes.axis("tight") + self._canvas.toolbar.update() + self._canvas.figure.canvas.draw_idle() def toolitems_translation(self): self._actions['home'].setToolTip(_translate("Toolbar", "Default view")) diff --git a/src/View/Results/Window.py b/src/View/Results/Window.py index e788a65f..aca81c00 100644 --- a/src/View/Results/Window.py +++ b/src/View/Results/Window.py @@ -43,7 +43,7 @@ from PyQt5.QtWidgets import ( ) from View.Plot.MplCanvas import MplCanvas -from View.Plot.navigation_toolbar_2qt import PamHyrNavigationToolbar2QT +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar from View.Results.PlotXY import PlotXY from View.Results.PlotAC import PlotAC @@ -131,7 +131,7 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): def setup_graph(self): self.canvas = MplCanvas(width=5, height=4, dpi=100) self.canvas.setObjectName("canvas") - self.toolbar = PamHyrNavigationToolbar2QT( + self.toolbar = PamhyrPlotToolbar( self.canvas, self ) self.plot_layout = self.find(QVBoxLayout, "verticalLayout") @@ -150,7 +150,7 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): self.canvas_2 = MplCanvas(width=5, height=4, dpi=100) self.canvas_2.setObjectName("canvas_2") - self.toolbar_2 = PamHyrNavigationToolbar2QT( + self.toolbar_2 = PamhyrPlotToolbar( self.canvas_2, self ) self.plot_layout_2 = self.find(QVBoxLayout, "verticalLayout_2") @@ -168,7 +168,7 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): self.canvas_3 = MplCanvas(width=5, height=4, dpi=100) self.canvas_3.setObjectName("canvas_3") - self.toolbar_3 = PamHyrNavigationToolbar2QT( + self.toolbar_3 = PamhyrPlotToolbar( self.canvas_3, self ) self.plot_layout_3 = self.find(QVBoxLayout, "verticalLayout_3") @@ -186,7 +186,7 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): self.canvas_4 = MplCanvas(width=5, height=4, dpi=100) self.canvas_4.setObjectName("canvas_4") - self.toolbar_4 = PamHyrNavigationToolbar2QT( + self.toolbar_4 = PamhyrPlotToolbar( self.canvas_4, self ) self.plot_layout_4 = self.find(QVBoxLayout, "verticalLayout_hydrograph") @@ -204,7 +204,7 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): self.canvas_5 = MplCanvas(width=5, height=4, dpi=100) self.canvas_5.setObjectName("canvas_5") - self.toolbar_5 = PamHyrNavigationToolbar2QT( + self.toolbar_5 = PamhyrPlotToolbar( self.canvas_5, self ) self.plot_layout_5 = self.find(QVBoxLayout, "verticalLayout_sed_reach") @@ -224,7 +224,7 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow): self.canvas_6 = MplCanvas(width=5, height=4, dpi=100) self.canvas_6.setObjectName("canvas_6") - self.toolbar_6 = PamHyrNavigationToolbar2QT( + self.toolbar_6 = PamhyrPlotToolbar( self.canvas_6, self ) self.plot_layout_6 = self.find(QVBoxLayout, "verticalLayout_sed_profile") diff --git a/src/View/SedimentLayers/Edit/Window.py b/src/View/SedimentLayers/Edit/Window.py index ac141ce7..fb7b92ef 100644 --- a/src/View/SedimentLayers/Edit/Window.py +++ b/src/View/SedimentLayers/Edit/Window.py @@ -41,7 +41,7 @@ from PyQt5.QtWidgets import ( ) from View.Plot.MplCanvas import MplCanvas -from View.Plot.navigation_toolbar_2qt import PamHyrNavigationToolbar2QT +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar from View.SedimentLayers.Edit.UndoCommand import * from View.SedimentLayers.Edit.Table import * @@ -106,7 +106,7 @@ class EditSedimentLayersWindow(ASubMainWindow, ListedSubWindow): def setup_graph(self): self.canvas = MplCanvas(width=5, height=4, dpi=100) self.canvas.setObjectName("canvas") - self.toolbar = PamHyrNavigationToolbar2QT( + self.toolbar = PamhyrPlotToolbar( self.canvas, self ) self.plot_layout = self.find(QVBoxLayout, "verticalLayout") diff --git a/src/View/SedimentLayers/Reach/Profile/Window.py b/src/View/SedimentLayers/Reach/Profile/Window.py index aafd719b..83695fa1 100644 --- a/src/View/SedimentLayers/Reach/Profile/Window.py +++ b/src/View/SedimentLayers/Reach/Profile/Window.py @@ -29,7 +29,7 @@ from View.SedimentLayers.Reach.Profile.Table import * from View.SedimentLayers.Reach.Profile.Plot import Plot from View.Plot.MplCanvas import MplCanvas -from View.Plot.navigation_toolbar_2qt import PamHyrNavigationToolbar2QT +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar from View.SedimentLayers.Reach.Profile.translate import * from View.SedimentLayers.Window import SedimentLayersWindow @@ -110,7 +110,7 @@ class ProfileSedimentLayersWindow(ASubMainWindow, ListedSubWindow): def setup_graph(self): self.canvas = MplCanvas(width=5, height=4, dpi=100) self.canvas.setObjectName("canvas") - self.toolbar = PamHyrNavigationToolbar2QT( + self.toolbar = PamhyrPlotToolbar( self.canvas, self ) self.plot_layout = self.find(QVBoxLayout, "verticalLayout") diff --git a/src/View/SedimentLayers/Reach/Window.py b/src/View/SedimentLayers/Reach/Window.py index f70049ae..d54ea054 100644 --- a/src/View/SedimentLayers/Reach/Window.py +++ b/src/View/SedimentLayers/Reach/Window.py @@ -30,7 +30,7 @@ from View.SedimentLayers.Reach.Plot import Plot from View.SedimentLayers.Reach.SLDialog import SLDialog from View.Plot.MplCanvas import MplCanvas -from View.Plot.navigation_toolbar_2qt import PamHyrNavigationToolbar2QT +from View.Plot.PamhyrToolbar import PamhyrPlotToolbar from View.SedimentLayers.Reach.translate import * from View.SedimentLayers.Window import SedimentLayersWindow @@ -98,7 +98,7 @@ class ReachSedimentLayersWindow(ASubMainWindow, ListedSubWindow): def setup_graph(self): self.canvas = MplCanvas(width=5, height=4, dpi=100) self.canvas.setObjectName("canvas") - self.toolbar = PamHyrNavigationToolbar2QT( + self.toolbar = PamhyrPlotToolbar( self.canvas, self ) self.plot_layout = self.find(QVBoxLayout, "verticalLayout_2") diff --git a/src/lang/fr.ts b/src/lang/fr.ts index 8034809f..68aec0c3 100644 --- a/src/lang/fr.ts +++ b/src/lang/fr.ts @@ -11,7 +11,7 @@ BoundaryCondition - + Not associate Non associer @@ -607,7 +607,7 @@ Commentaire - + Not associate Non associer @@ -1558,17 +1558,17 @@ - + MainWindowProfile - + Trier les points par ordre croissant de X - + Trier les points par ordre croissant de Y @@ -1635,67 +1635,67 @@ - + Insérer un point - + Supprimer le/les point(s) sélectionnés - + Trier les points par ordre décroissant de X - + Trier les points par ordre décroissant de Y - + Décaler le point sélectionné vers le haut - + Décaler le point sélectionné vers le bas - + Exporter (dans un fichier) les points du profil au format tabulé - + Copier la sélection au format tabulé - + Coller la sélection depuis le presse-papier au format tabulé - + Vérifier la validité de la saisie et garder ou pas les modifications apportées - + Annuler toutes les modifications depuis la dernière validation - + Annuler toutes les modifications et revenir à l'état initial - + Ligne d'eau : Z : Cote (m) A : Aire mouillée (mu00B2) @@ -1704,7 +1704,7 @@ - + 'Maj + Clic' : Ligne d'eau & 'Ctrl + Clic' : Sélectionner des points @@ -1965,7 +1965,7 @@ Seuls les 5 premiers seront édités. Hauteur (m) - + Select destination file @@ -2007,6 +2007,26 @@ Seuls les 5 premiers seront édités. Reverse the reach orientation Inverser l'orientation du bief + + + Name + Nom + + + + Type + Type + + + + Source node + + + + + Destination node + + Results @@ -2324,42 +2344,42 @@ Seuls les 5 premiers seront édités. Toolbar - + Zoom - + Default view - + Back to previous view - + Return to next view - + Axes panoramic - + Isometric view (Shift+W) - + Auto scale view (Shift+X) - + Save the figure