diff --git a/src/View/Geometry/mainwindow_ui_profile.py b/src/View/Geometry/mainwindow_ui_profile.py
index 7aeb1bd160f47576ba5e6e00fa5550b5f832debe..01dfe631575315b48201935103cd6f25cae79b4b 100644
--- a/src/View/Geometry/mainwindow_ui_profile.py
+++ b/src/View/Geometry/mainwindow_ui_profile.py
@@ -11,7 +11,7 @@ from PyQt5.QtWidgets import (
from View.Plot import MplCanvas, navigation_toolbar_2qt
file_path = os.path.abspath(os.path.dirname(__file__))
-icon_path = f"{os.path.dirname(os.path.dirname(file_path))}/../../ui/ressources/"
+icon_path = f"{os.path.dirname(os.path.dirname(file_path))}/View/ui/ressources/"
class Ui_MainWindow(object):
def setupUi(self, MainWindowProfile):
@@ -189,41 +189,35 @@ class Ui_MainWindow(object):
self.btn_reset.setIconSize(btn_size)
self.horizontalLayout.addWidget(self.btn_reset)
- spacerItem = QtWidgets.QSpacerItem(30, 30, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+ spacerItem = QtWidgets.QSpacerItem(
+ 30, 30,
+ QtWidgets.QSizePolicy.Expanding,
+ QtWidgets.QSizePolicy.Minimum
+ )
self.horizontalLayout.addItem(spacerItem)
self.verticalLayout_left.addLayout(self.horizontalLayout)
self.tableView = QTableView(self.widget)
- self.tableView.setStyleSheet(" QTableView { border: 1px solid black;\n"
- " gridline-color: blue;\n"
- " border-radius: 2px;\n"
- " border-style: solid;\n"
- " background-color: #EEF6FC; \n"
- " selection-background-color: #218ede;\n"
- " font-size: 11.5px;\n"
- " font-family: Helvetica\n"
- "\n"
- " }")
- # self.tableView.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
- # self.tableView.setGridStyle(Qt.SolidLine)
+ self.tableView.setStyleSheet(
+ " QTableView { border: 1px solid black;\n"
+ " gridline-color: blue;\n"
+ " border-radius: 2px;\n"
+ " border-style: solid;\n"
+ " background-color: #EEF6FC; \n"
+ " selection-background-color: #218ede;\n"
+ " font-size: 11.5px;\n"
+ " font-family: Helvetica\n"
+ "\n"
+ " }"
+ )
self.tableView.setObjectName("tableView")
- self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows) # permet de sélectionner une ligne entière
- # self.tableView.verticalHeader().hide() # hide vertical/row headers
+ self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows)
self.tableView.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.AdjustToContents)
- # self.tableView.setSelectionMode(QAbstractItemView.MultiSelection)
- # self.tableView.horizontalHeader().setStretchLastSection(True)
- # self.tableView.setVisible(False)
self.tableView.resizeColumnsToContents()
self.tableView.resizeRowsToContents()
- # self.tableView.setVisible(True)
- # self.tableView.verticalHeader().setSectionResizeMode(QHeaderView.Stretch) # pour que le tableau occupe
- # toute la zone
- self.tableView.setAlternatingRowColors(True) # colorie une ligne sur 2
- self.tableView.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch) # ajuster la largeur du tableau
- # self.tableView.setEditTriggers(QAbstractItemView.DoubleClicked) # met en mode édition en cliquant sur une
- # ligne https://doc.qt.io/qt-5/qabstractitemview.html#EditTrigger-enum NoEditTriggers, DoubleClicked,
- # SelectedClicked, CurrentChanged
+ self.tableView.setAlternatingRowColors(True)
+ self.tableView.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
self.verticalLayout_left.addWidget(self.tableView)
self.widget1 = QtWidgets.QWidget(self.splitter)
@@ -250,15 +244,12 @@ class Ui_MainWindow(object):
self.label_graphic_help.setObjectName("label_graphic_help")
self.verticalLayout_right.addWidget(self.label_graphic_help)
- # self.graphicsView = QtWidgets.QGraphicsView(self.widget1)
- # self.graphicsView.setObjectName("graphicsView")
- # self.verticalLayout_right.addWidget(self.graphicsView)
-
- self.my_canvas = MplCanvas.MplCanvas(width=5, height=4,
- dpi=100)
+ self.my_canvas = MplCanvas.MplCanvas(width=5, height=4, dpi=100)
self.my_canvas.setObjectName("my_canvas")
- self.my_toolbar = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT(self.my_canvas, self.widget1)
+ self.my_toolbar = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT(
+ self.my_canvas, self.widget1
+ )
self.my_toolbar.setStyleSheet(
"QToolBar{ border: 1px solid darkGray;\n"
" gridline-color: blue;\n"
diff --git a/src/View/Geometry/mainwindow_ui_reach.py b/src/View/Geometry/mainwindow_ui_reach.py
index dfecd2d9620c79ffc498b723ef400e4ec3faf051..2aa392f732cee5eb10864cc0b780dfa44d311789 100644
--- a/src/View/Geometry/mainwindow_ui_reach.py
+++ b/src/View/Geometry/mainwindow_ui_reach.py
@@ -14,7 +14,7 @@ from View.Plot import (
)
file_path = os.path.abspath(os.path.dirname(__file__))
-icon_path = f"{os.path.dirname(os.path.dirname(file_path))}/../../ui/resources/"
+icon_path = f"{os.path.dirname(os.path.dirname(file_path))}/View/ui/ressources/"
class Ui_MainWindow(object):
def setupUi(self, MainWindow_reach):
@@ -218,34 +218,36 @@ class Ui_MainWindow(object):
self.verticalLayout_canvas_1 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_3)
self.verticalLayout_canvas_1.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_canvas_1.setObjectName("verticalLayout_canvas_1")
- self.canvas_1 = MplCanvas.MplCanvas(width=5, height=4,
- dpi=100) # QtWidgets.QGraphicsView(self.verticalLayoutWidget_3)
+ 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.canvas_1, self.centralwidget)
- self.toolbar_1.setStyleSheet("QToolBar{ border: 1px solid darkGray;\n"
- " gridline-color: blue;\n"
- " border-radius: 4px;\n"
- " border-style: solid;\n"
- " background-color: #EEF6FC; \n"
- " selection-background-color: #218ede;\n"
- " font-size: 12px;\n"
- " font-family: Helvetica\n"
- "\n"
- " }")
+ self.toolbar_1 = navigation_toolbar_2qt.PamHyrNavigationToolbar2QT(
+ self.canvas_1, self.centralwidget
+ )
+ self.toolbar_1.setStyleSheet(
+ "QToolBar{ border: 1px solid darkGray;\n"
+ " gridline-color: blue;\n"
+ " border-radius: 4px;\n"
+ " border-style: solid;\n"
+ " background-color: #EEF6FC; \n"
+ " selection-background-color: #218ede;\n"
+ " font-size: 12px;\n"
+ " font-family: Helvetica\n"
+ "\n"
+ " }"
+ )
self.verticalLayout_canvas_1.addWidget(self.toolbar_1)
-
self.verticalLayout_canvas_1.addWidget(self.canvas_1)
+
self.verticalLayoutWidget_2 = QtWidgets.QWidget(self.splitter)
self.verticalLayoutWidget_2.setObjectName("verticalLayoutWidget_2")
self.verticalLayout_canvas_2 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget_2)
self.verticalLayout_canvas_2.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_canvas_2.setObjectName("verticalLayout_canvas_2")
- self.canvas_2 = MplCanvas.MplCanvas(width=5, height=4,
- dpi=100) # QtWidgets.QGraphicsView(self.verticalLayoutWidget_2)
- # self.canvas_2.setMouseTracking(False)
+
+ 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.canvas_2, self.centralwidget)
@@ -261,7 +263,7 @@ class Ui_MainWindow(object):
"\n"
" }"
)
- # self.frame_toolbar.addWidget(self.toolbar)
+
self.verticalLayout_canvas_2.addWidget(self.toolbar_2)
self.verticalLayout_canvas_2.addWidget(self.canvas_2)
self.verticalLayoutWidget = QtWidgets.QWidget(self.splitter_2)
@@ -269,8 +271,8 @@ class Ui_MainWindow(object):
self.verticalLayout_canvas_3 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
self.verticalLayout_canvas_3.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_canvas_3.setObjectName("verticalLayout_canvas_3")
- self.canvas_3 = MplCanvas.MplCanvas(width=5, height=4,
- dpi=100) # QtWidgets.QGraphicsView(self.verticalLayoutWidget)
+
+ 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.canvas_3, self.centralwidget)
@@ -286,13 +288,8 @@ class Ui_MainWindow(object):
"\n"
" }"
)
- # self.frame_toolbar.addWidget(self.toolbar)
+
self.verticalLayout_canvas_3.addWidget(self.toolbar_3)
- # self.verticalLayout_canvas_3.addWidget(self.canvas_3)
- # from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
- # import matplotlib.pyplot as plt
- # self.figure = plt.figure()
- # self.canvas_3 = FigureCanvas(self.figure)
self.verticalLayout_canvas_3.addWidget(self.canvas_3)
self.gridLayout.addWidget(self.splitter_2, 0, 0, 3, 3)